diff --git a/docker/docker-compose-superset.yaml b/docker/docker-compose-superset.yaml
index ea91d2e..d3faf90 100644
--- a/docker/docker-compose-superset.yaml
+++ b/docker/docker-compose-superset.yaml
@@ -8,6 +8,7 @@ services:
       - SUPERSET_PUBLIC_URL=https://${SUPERSET_HOSTNAME}
       - KEYCLOAK_URL=https://${KEYCLOAK_HOSTNAME}
       - KEYCLOAK_AUTH_SERVER_URL=https://${KEYCLOAK_HOSTNAME}
+      - SUPERSET_CLIENT_SECRET=${SUPERSET_CLIENT_SECRET}
     volumes:
        - "${DISTRO_PATH}:/opt/env-substitution/files"
   superset:
@@ -18,6 +19,8 @@ services:
         condition: service_started
       superset-init:
         condition: service_completed_successfully
+      env-substitution:
+        condition: service_completed_successfully
     environment: &superset-env
       - DATABASE_HOST=${POSTGRES_DB_HOST}
       - DATABASE_DB=${SUPERSET_DB}