diff --git a/docker-compose-keycloak.yml b/docker-compose-keycloak.yml
index 79353b0..2de3928 100644
--- a/docker-compose-keycloak.yml
+++ b/docker-compose-keycloak.yml
@@ -67,9 +67,18 @@ services:
       - KEYCLOAK_INTERNAL_HOST_URL=${KEYCLOAK_INTERNAL_HOST_URL}
       - KEYCLOAK_ADMIN_SA_CLIENT_SECRET=${KEYCLOAK_ADMIN_SA_CLIENT_SECRET}
       - EIP_CLIENT_SECRET=${EIP_CLIENT_SECRET}
-      - SUPERSET_CLIENT_SECRET=${SUPERSET_CLIENT_SECRET}
-      - SUPERSET_CLIENT_UUID=${SUPERSET_CLIENT_UUID}
+      - OPENMRS_PUBLIC_URL=${SERVER_SCHEME}://${O3_HOSTNAME}
+      - OPENMRS_CLIENT_UUID=${OPENMRS_CLIENT_UUID}
+      - OPENMRS_CLIENT_SECRET=${OPENMRS_CLIENT_SECRET}
+      - ODOO_PUBLIC_URL=${SERVER_SCHEME}://${ODOO_HOSTNAME}
+      - ODOO_CLIENT_UUID=${ODOO_CLIENT_UUID}
+      - ODOO_CLIENT_SECRET=${ODOO_CLIENT_SECRET}
+      - SENAITE_PUBLIC_URL=${SERVER_SCHEME}://${SENAITE_HOSTNAME}
+      - SENAITE_CLIENT_UUID=${SENAITE_CLIENT_UUID}
+      - SENAITE_CLIENT_SECRET=${SENAITE_CLIENT_SECRET}
       - SUPERSET_PUBLIC_URL=${SERVER_SCHEME}://${SUPERSET_HOSTNAME}
+      - SUPERSET_CLIENT_UUID=${SUPERSET_CLIENT_UUID}
+      - SUPERSET_CLIENT_SECRET=${SUPERSET_CLIENT_SECRET}
 
 volumes:
   keycloak-realm: ~
diff --git a/docker-compose-odoo-sso.yml b/docker-compose-odoo-sso.yml
index 21ec8ac..0f42c71 100644
--- a/docker-compose-odoo-sso.yml
+++ b/docker-compose-odoo-sso.yml
@@ -3,11 +3,6 @@ services:
     environment:
       - ADDONS=sale_management,stock,account_account,purchase,mrp,mrp_product_expiry,product_expiry,l10n_generic_coa,odoo_initializer,ozone_settings,server_environment,auth_oidc_environment,auth_oidc
 
-  env-substitution:
-    environment:
-      - ODOO_CLIENT_SECRET=${ODOO_CLIENT_SECRET}
-      - ODOO_CLIENT_UUID=${ODOO_CLIENT_UUID}
-
   eip-odoo-openmrs:
     environment:
       OAUTH_ACCESS_TOKEN_URL: ${OAUTH_ACCESS_TOKEN_URL}
diff --git a/docker-compose-openmrs-sso.yml b/docker-compose-openmrs-sso.yml
index 36aa7e0..176b5de 100644
--- a/docker-compose-openmrs-sso.yml
+++ b/docker-compose-openmrs-sso.yml
@@ -17,5 +17,3 @@ services:
       - OAUTH2_ENABLED=${ENABLE_SSO}
       - HOST_URL=${SERVER_SCHEME}://${O3_HOSTNAME}
       - KEYCLOAK_AUTH_SERVER_URL=${SERVER_SCHEME}://${KEYCLOAK_HOSTNAME}
-      - OPENMRS_CLIENT_SECRET=${OPENMRS_CLIENT_SECRET}
-      - OPENMRS_CLIENT_UUID=${OPENMRS_CLIENT_UUID}
diff --git a/docker-compose-senaite-sso.yml b/docker-compose-senaite-sso.yml
index 6dec447..423f5f8 100644
--- a/docker-compose-senaite-sso.yml
+++ b/docker-compose-senaite-sso.yml
@@ -8,11 +8,6 @@ services:
     volumes:
       - ${SENAITE_OIDC_CONFIG_PATH}/:/data/oidc
 
-  env-substitution:
-    environment:
-      - SENAITE_CLIENT_SECRET=${SENAITE_CLIENT_SECRET}
-      - SENAITE_CLIENT_UUID=${SENAITE_CLIENT_UUID}
-
   eip-openmrs-senaite:
     environment:
       OAUTH_ACCESS_TOKEN_URL: ${OAUTH_ACCESS_TOKEN_URL}