diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 11cf0ff68..ca962be9b 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -31,8 +31,8 @@ services:
       - ConnectionString=${ESHOP_AZURE_CATALOG_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word}
       - PicBaseUrl=${ESHOP_AZURE_STORAGE_CATALOG:-http://localhost:5101/api/v1/pic/}   #Local: You need to open your local dev-machine firewall at range 5100-5110.  
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
-      - AzureStorageAccountName=${ESHOP_AZURE_STORAGE_ACCOUNT_NAME}
-      - AzureStorageAccountKey=${ESHOP_AZURE_STORAGE_ACCOUNT_KEY}
+      - AzureStorageAccountName=${ESHOP_AZURE_STORAGE_CATALOG_NAME}
+      - AzureStorageAccountKey=${ESHOP_AZURE_STORAGE_CATALOG_KEY}
       - UseCustomizationData=True
     ports:
       - "5101:80"
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 974dee651..c5a27fea1 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -36,8 +36,8 @@ services:
       - ConnectionString=${ESHOP_AZURE_CATALOG_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word}
       - PicBaseUrl=${ESHOP_AZURE_STORAGE_CATALOG:-http://localhost:5101/api/v1/pic/}   #Local: You need to open your local dev-machine firewall at range 5100-5110.  
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
-      - AzureStorageAccountName=${ESHOP_AZURE_STORAGE_ACCOUNT_NAME}
-      - AzureStorageAccountKey=${ESHOP_AZURE_STORAGE_ACCOUNT_KEY}
+      - AzureStorageAccountName=${ESHOP_AZURE_STORAGE_CATALOG_NAME}
+      - AzureStorageAccountKey=${ESHOP_AZURE_STORAGE_CATALOG_KEY}
       - UseCustomizationData=True
     ports:
       - "5101:80"