diff --git a/ccp/modules/dashboard-compose.yml b/ccp/modules/dashboard-compose.yml
index e2756d4..a84ff24 100644
--- a/ccp/modules/dashboard-compose.yml
+++ b/ccp/modules/dashboard-compose.yml
@@ -4,10 +4,11 @@ services:
   fhir2sql:
     depends_on:
       - "dashboard-db"
+      - [ blaze ]
     image: docker.verbis.dkfz.de/cache/samply/fhir2sql:latest
     container_name: bridgehead-ccp-dashboard-fhir2sql
     environment:
-      BLAZE_BASE_URL: "http://blaze:8080/fhir/"
+      BLAZE_BASE_URL: "http://bridgehead-ccp-blaze:8080"
       PG_HOST: "dashboard-db"
       PG_USERNAME: "dashboard"
       PG_PASSWORD: "${DASHBOARD_DB_PASSWORD}" # Set in dashboard-setup.sh
diff --git a/ccp/modules/dashboard-setup.sh b/ccp/modules/dashboard-setup.sh
index aee79fa..e1a33af 100644
--- a/ccp/modules/dashboard-setup.sh
+++ b/ccp/modules/dashboard-setup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-if [ "$ENABLE_DASHBOARD" == true ]; then
+if [ "$ENABLE_FHIR2SQL" == true ]; then
   log INFO "Dashboard setup detected -- will start Dashboard backend and FHIR2SQL service."
   OVERRIDE+=" -f ./$PROJECT/modules/dashboard-compose.yml"
   DASHBOARD_DB_PASSWORD="$(echo \"This is a salt string to generate one consistent password for the Dashboard database. It is not required to be secret.\" | sha1sum | openssl pkeyutl -sign -inkey /etc/bridgehead/pki/${SITE_ID}.priv.pem | base64 | head -c 30)"
diff --git a/ccp/modules/dashboard.md b/ccp/modules/dashboard.md
index defdf39..deea710 100644
--- a/ccp/modules/dashboard.md
+++ b/ccp/modules/dashboard.md
@@ -33,4 +33,4 @@ The volume used by dashboard-db can be removed safely and should be restored to
 
 
 ### Setup
-To enable the Dashboard module, set the ENABLE_DASHBOARD environment variable to true. The dashboard-setup.sh script will then start the fhir2sql and dashboard-db services, using the environment variables and volumes defined above.
\ No newline at end of file
+To enable the Dashboard module, set the ENABLE_FHIR2SQL environment variable to true. The dashboard-setup.sh script will then start the fhir2sql and dashboard-db services, using the environment variables and volumes defined above.
\ No newline at end of file