diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index de3b29e391d4c53ddc868a982055d73ea04cdc32..24c360bd0abd3d0a10d5c66bc290f6f50e949e97 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -18,6 +18,7 @@ echo "RESPONSE_FORMAT     : "$RESPONSE_FORMAT
 echo "URL_CUTOUTS         : "$URL_CUTOUTS
 echo "RESOLVER_DB_*       : "$RESOLVER_DB_URI" ["$RESOLVER_DB_SCHEMA"] "$RESOLVER_DB_USERNAME" / "$RESOLVER_DB_PASSWORD
 echo "VLKBOBSCORE_PG_URI  : "$VLKBOBSCORE_PG_URI
+echo "AMQP_QUEUE_NAME     : "$AMQP_QUEUE_NAME
 
 echo "build-time config'd (Dockefile):"
 echo "INST_DIR   : "$INST_DIR
@@ -51,17 +52,23 @@ echo "fits_path_surveys=/srv/surveys" > $WEBAPP_DIR/WEB-INF/classes/cutout.prope
       "application/fits;createfile=yes")
          echo "default_response_format=$RESPONSE_FORMAT"
          echo "fits_path_cutouts=/srv/cutouts"
-         QUEUE_NAME=dockervlkb$ACCESS_CONTEXT_ROOT
+         if test -n "$AMQP_QUEUE_NAME"
+         then
+            QUEUE_NAME=dockervlkb$AMQP_QUEUE_NAME
+         fi
          ;;
       application/x-vlkb*)
          echo "default_response_format=$RESPONSE_FORMAT"
          echo "fits_path_cutouts=/srv/cutouts"
          echo "fits_url_cutouts=$URL_CUTOUTS"
          echo "surveys_metadata_abs_pathname=/srv/surveys/survey_populate.csv"
-         QUEUE_NAME=dockervlkb$ACCESS_CONTEXT_ROOT
          echo "default_sky_system=GALACTIC"
          echo "default_spec_system=VELO_LSRK"
          echo "show_duration=yes"
+         if test -n "$AMQP_QUEUE_NAME"
+         then
+            QUEUE_NAME=dockervlkb$AMQP_QUEUE_NAME
+         fi
          ;;
    esac
 
diff --git a/docker/example-compose-vlkb.yaml b/docker/example-compose-vlkb.yaml
index 5e979843c7ffffb545d0d57bce77922d2b686d7e..46c34f68598e6af733dc490b6e564f7c9c609c9a 100644
--- a/docker/example-compose-vlkb.yaml
+++ b/docker/example-compose-vlkb.yaml
@@ -35,6 +35,7 @@ services:
       - RESPONSE_FORMAT=application/x-vlkb+xml
       #- RESPONSE_FORMAT=application/fits
       #- RESPONSE_FORMAT=application/fits;createfile=yes
+      #- AMQP_QUEUE_NAME=vlkb#datasets
     volumes:
       - /srv/vlkb/surveys:/srv/surveys:z,ro
       - /srv/vlkb/cutouts:/srv/cutouts:z,rw