diff --git a/deployments/examples/ocis_oc10_backend/docker-compose.yml b/deployments/examples/ocis_oc10_backend/docker-compose.yml
index caeab1466..a2e58f25a 100644
--- a/deployments/examples/ocis_oc10_backend/docker-compose.yml
+++ b/deployments/examples/ocis_oc10_backend/docker-compose.yml
@@ -140,8 +140,8 @@ services:
       STORAGE_OIDC_ISSUER: https://${OCIS_DOMAIN}
       STORAGE_OIDC_INSECURE: "${INSECURE}"
       STORAGE_TRANSFER_EXPIRES: 86400
-      STORAGE_FRONTEND_URL: https://${OCIS_DOMAIN}
-      STORAGE_DATAGATEWAY_URL: https://${OCIS_DOMAIN}/data
+      STORAGE_FRONTEND_PUBLIC_URL: https://${OCIS_DOMAIN}
+      STORAGE_DATAGATEWAY_PUBLIC_URL: https://${OCIS_DOMAIN}/data
       STORAGE_LDAP_IDP: https://${OCIS_DOMAIN}
     volumes:
       - ./ocis/config/proxy-config.json:/etc/ocis/proxy.json
diff --git a/deployments/examples/ocis_traefik/docker-compose.yml b/deployments/examples/ocis_traefik/docker-compose.yml
index 1415dc5af..b75bb28e4 100644
--- a/deployments/examples/ocis_traefik/docker-compose.yml
+++ b/deployments/examples/ocis_traefik/docker-compose.yml
@@ -51,8 +51,8 @@ services:
       PHOENIX_WEB_CONFIG_SERVER: https://${OCIS_DOMAIN}
       STORAGE_OIDC_ISSUER: https://${OCIS_DOMAIN}
       STORAGE_TRANSFER_EXPIRES: 86400
-      STORAGE_FRONTEND_URL: https://${OCIS_DOMAIN}
-      STORAGE_DATAGATEWAY_URL: https://${OCIS_DOMAIN}/data
+      STORAGE_FRONTEND_PUBLIC_URL: https://${OCIS_DOMAIN}
+      STORAGE_DATAGATEWAY_PUBLIC_URL: https://${OCIS_DOMAIN}/data
       STORAGE_LDAP_IDP: https://${OCIS_DOMAIN}
     labels:
       - "traefik.enable=true"
diff --git a/ocis/docker-compose-eos-test.yml b/ocis/docker-compose-eos-test.yml
index dec600f40..2d1c2a3c2 100644
--- a/ocis/docker-compose-eos-test.yml
+++ b/ocis/docker-compose-eos-test.yml
@@ -43,8 +43,8 @@ services:
       ACCOUNTS_STORAGE_DISK_PATH: /var/tmp/ocis-accounts
       # TODO make id the default in ocis-storage
       STORAGE_DRIVER_EOS_LAYOUT: "{{substr 0 1 .Id.OpaqueId}}/{{.Id.OpaqueId}}"
-      STORAGE_FRONTEND_URL: https://${OCIS_DOMAIN:-localhost}:9200
-      STORAGE_DATAGATEWAY_URL: https://${OCIS_DOMAIN:-localhost}:9200/data
+      STORAGE_FRONTEND_PUBLIC_URL: https://${OCIS_DOMAIN:-localhost}:9200
+      STORAGE_DATAGATEWAY_PUBLIC_URL: https://${OCIS_DOMAIN:-localhost}:9200/data
       # common eos settings used for both drivers: eos and eoshome
       STORAGE_DRIVER_EOS_MASTER_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094}
       STORAGE_DRIVER_EOS_SLAVE_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094}
diff --git a/ocis/docker-compose.yml b/ocis/docker-compose.yml
index 385b3253e..88fae6e1a 100644
--- a/ocis/docker-compose.yml
+++ b/ocis/docker-compose.yml
@@ -48,8 +48,8 @@ services:
       STORAGE_LDAP_IDP: https://${OCIS_DOMAIN:-localhost}:9200
       # TODO make id the default in ocis-storage
       STORAGE_DRIVER_EOS_LAYOUT: "{{substr 0 1 .Id.OpaqueId}}/{{.Id.OpaqueId}}"
-      STORAGE_FRONTEND_URL: https://${OCIS_DOMAIN:-localhost}:9200
-      STORAGE_DATAGATEWAY_URL: https://${OCIS_DOMAIN:-localhost}:9200/data
+      STORAGE_FRONTEND_PUBLIC_URL: https://${OCIS_DOMAIN:-localhost}:9200
+      STORAGE_DATAGATEWAY_PUBLIC_URL: https://${OCIS_DOMAIN:-localhost}:9200/data
       # common eos settings used for both drivers: eos and eoshome
       STORAGE_DRIVER_EOS_MASTER_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094}
       STORAGE_DRIVER_EOS_SLAVE_URL: ${EOS_MGM_URL:-root://mgm-master.testnet:1094}