diff --git a/.env b/.env
index f77f64682..797e5fc5c 100644
--- a/.env
+++ b/.env
@@ -21,3 +21,5 @@ ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP=10.121.122.92
 #ESHOP_AZURE_STORAGE_CATALOG_KEY=<YourAzureStorageCatalogKey>
 #ESHOP_AZURE_STORAGE_MARKETING_NAME=<YourAzureStorageMarketingName>
 #ESHOP_AZURE_STORAGE_MARKETING_KEY=<YourAzureStorageMarketingKey>
+#ESHOP_SERVICE_BUS_USERNAME=<ServiceBusUserName-OnlyUsedIfUsingRabbitMQUnderwindows>
+#ESHOP_SERVICE_BUS_PASSWORD=<ServiceBusUserPassword-OnlyUsedIfUsingRabbitMQUnderwindows>
diff --git a/cli-windows/start-windows-containers.ps1 b/cli-windows/start-windows-containers.ps1
index 56b7a34e9..91d8eb7f7 100644
--- a/cli-windows/start-windows-containers.ps1
+++ b/cli-windows/start-windows-containers.ps1
@@ -1,5 +1,10 @@
+# rootPath: Root path of the repo (where docker-compose*.yml are). If not passed ../cli-windows/ is assumed
+# buildBits: If the projects must be built before. Default value: $true
+# customEventBusLoginPassword: If a custom RabbitMQ image is used that do not use the default user login/pwd. Default: $false (means assume use default spring2/rabbitmq image)
+
 Param(
     [parameter(Mandatory=$false)][string] $rootPath,
+    [parameter(Mandatory=$false)][bool] $customEventBusLoginPassword=$false,
     [parameter(Mandatory=$false)][bool]$buildBits=$true
 )
 
@@ -13,4 +18,15 @@ Write-Host "Root path used is $rootPath" -ForegroundColor Yellow
 if ($buildBits) {
     & $scriptPath\build-bits.ps1 -rootPath $rootPath
 }
-docker-compose -f "$rootPath\docker-compose-windows.yml" -f "$rootPath\docker-compose.override.yml"  up
+
+
+$env:ESHOP_EXTERNAL_DNS_NAME_OR_IP = "10.0.75.1"
+$env:ESHOP_AZURE_STORAGE_CATALOG_URL ="http://10.0.75.1:5101/api/v1/catalog/items/[0]/pic/"
+$env:ESHOP_AZURE_STORAGE_MARKETING_URL ="http://10.0.75.1:5110/api/v1/campaigns/[0]/pic/"
+
+if (-Not $customEventBusLoginPassword) {
+    docker-compose -f "$rootPath\docker-compose-windows.yml" -f "$rootPath\docker-compose.override.yml" -f "$rootPath\docker-compose.override.windows.yml" up
+}
+else {
+    docker-compose -f "$rootPath\docker-compose-windows.yml" -f "$rootPath\docker-compose.override.yml"  up
+}
diff --git a/docker-compose-windows.yml b/docker-compose-windows.yml
index 1a71968ba..294d5f7f5 100644
--- a/docker-compose-windows.yml
+++ b/docker-compose-windows.yml
@@ -38,7 +38,7 @@ services:
       - rabbitmq
 
   marketing.api:
-    image: eshop/marketing.api:${TAG:-latest}
+    image: eshop/marketing.api-win:${TAG:-latest}
     build:
       context: ./src/Services/Marketing/Marketing.API
       dockerfile: Dockerfile    
@@ -73,13 +73,13 @@ services:
       - marketing.api
   
   webstatus:
-    image: eshop/webstatus:${TAG:-latest}
+    image: eshop/webstatus-win:${TAG:-latest}
     build:
       context: ./src/Web/WebStatus
       dockerfile: Dockerfile
 
   payment.api:
-    image: eshop/payment.api:${TAG:-latest}
+    image: eshop/payment.api-win:${TAG:-latest}
     build:
       context: ./src/Services/Payment/Payment.API
       dockerfile: Dockerfile
@@ -87,7 +87,7 @@ services:
       - rabbitmq         
 
   locations.api:
-    image: eshop/locations.api:${TAG:-latest}
+    image: eshop/locations.api-win:${TAG:-latest}
     build:
       context: ./src/Services/Location/Locations.API
       dockerfile: Dockerfile
@@ -103,17 +103,11 @@ services:
 
   basket.data:
     image: redis:nanoserver
-#    build:
-#      context: ./_docker/redis
-#      dockerfile: Dockerfile
     ports:
         - "6379:6379"
 
   rabbitmq:
     image: spring2/rabbitmq
-#    build:
-#      context: ./_docker/rabbitmq
-#      dockerfile: Dockerfile  
     ports:
       - "15672:15672"    
       - "5672:5672"
diff --git a/docker-compose.override.windows.yml b/docker-compose.override.windows.yml
new file mode 100644
index 000000000..130405d3b
--- /dev/null
+++ b/docker-compose.override.windows.yml
@@ -0,0 +1,53 @@
+version: '2.1'
+
+# ONLY NEEDED WHEN RUNNING WINDOWS CONTAINERS
+#
+# This file sets the containers' environment variables:
+#
+#  - EventBusUerName
+#  - EventBusPassword
+#
+# To the default username & password used in the spring2/rabbitmq image.
+#
+# If you are using any other rabbitmq image with any other username/pwd then you can:
+#
+#  Set your shell environment variables:
+#   - ESHOP_SERVICE_BUS_USERNAME
+#   - ESHOP_SERVICE_BUS_PASSWORD
+#
+# With the appropiate values (note that you can use .env file also) AND DO NOT USE THIS FILE when launching windows container:
+#
+# docker-compose -f docker-compose-windows.yml -f docker-compose.override.yml up
+# INSTEAD OF
+# docker-compose -f docker-compose-windows.yml -f docker-compose.override.yml -f docker-compose.override.windows.yml up
+
+services:      
+  basket.api:
+    environment:
+      - EventBusUserName=admin
+      - EventBusPassword=password
+
+  catalog.api:
+    environment:
+      - EventBusUserName=admin
+      - EventBusPassword=password
+
+  ordering.api:
+    environment:
+      - EventBusUserName=admin
+      - EventBusPassword=password
+
+  marketing.api:
+    environment:
+      - EventBusUserName=admin
+      - EventBusPassword=password
+
+  payment.api:
+    environment:
+      - EventBusUserName=admin
+      - EventBusPassword=password
+
+  locations.api:
+    environment:
+      - EventBusUserName=admin
+      - EventBusPassword=password
\ No newline at end of file
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 6870b617f..8757c8f83 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -16,6 +16,8 @@ services:
       - identityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
       - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
+      - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
+      - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}      
       - AzureServiceBusEnabled=False
     ports:
       - "5103:80"
@@ -27,6 +29,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_URL:-http://localhost:5101/api/v1/catalog/items/[0]/pic/}   #Local: You need to open your local dev-machine firewall at range 5100-5110.  
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
+      - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
+      - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}         
       - AzureStorageAccountName=${ESHOP_AZURE_STORAGE_CATALOG_NAME}
       - AzureStorageAccountKey=${ESHOP_AZURE_STORAGE_CATALOG_KEY}
       - UseCustomizationData=True
@@ -47,7 +51,7 @@ services:
       - MarketingApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5110
       - BasketApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5103
       - OrderingApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5102
-      - UseCustomizationData=True
+      - UseCustomizationData=True    
     ports:
       - "5105:80"
 
@@ -59,6 +63,8 @@ services:
       - identityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
       - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
+      - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
+      - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}          
       - UseCustomizationData=True
       - AzureServiceBusEnabled=False
       - GracePeriodTime=1
@@ -74,6 +80,8 @@ services:
       - MongoConnectionString=${ESHOP_AZURE_COSMOSDB:-mongodb://nosql.data}
       - MongoDatabase=MarketingDb
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
+      - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
+      - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}          
       - identityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
       - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
       - CampaignDetailFunctionUri=${ESHOP_AZUREFUNC_CAMPAIGN_DETAILS_URI}
@@ -137,6 +145,8 @@ services:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
+      - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
+      - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}          
       - AzureServiceBusEnabled=False
     ports:
       - "5108:80"
@@ -150,6 +160,8 @@ services:
       - identityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110. 
       - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
+      - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
+      - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}          
       - AzureServiceBusEnabled=False
     ports:
       - "5109:80"
diff --git a/src/Services/Basket/Basket.API/Startup.cs b/src/Services/Basket/Basket.API/Startup.cs
index 6a432b290..1f62e44cb 100644
--- a/src/Services/Basket/Basket.API/Startup.cs
+++ b/src/Services/Basket/Basket.API/Startup.cs
@@ -103,6 +103,15 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API
                         HostName = Configuration["EventBusConnection"]
                     };
 
+                    if (!string.IsNullOrEmpty(Configuration["EventBusUserName"])) {
+                        factory.UserName = Configuration["EventBusUserName"];
+                    }
+
+                    if (!string.IsNullOrEmpty(Configuration["EventBusPassword"]))
+                    {
+                        factory.Password = Configuration["EventBusPassword"];
+                    }
+
                     return new DefaultRabbitMQPersistentConnection(factory, logger);
                 });
             }
diff --git a/src/Services/Catalog/Catalog.API/Startup.cs b/src/Services/Catalog/Catalog.API/Startup.cs
index 64754c3ab..354d0643e 100644
--- a/src/Services/Catalog/Catalog.API/Startup.cs
+++ b/src/Services/Catalog/Catalog.API/Startup.cs
@@ -132,11 +132,22 @@
                 {
                     var settings = sp.GetRequiredService<IOptions<CatalogSettings>>().Value;
                     var logger = sp.GetRequiredService<ILogger<DefaultRabbitMQPersistentConnection>>();
+
                     var factory = new ConnectionFactory()
                     {
-                        HostName = settings.EventBusConnection
+                        HostName = Configuration["EventBusConnection"]
                     };
 
+                    if (!string.IsNullOrEmpty(Configuration["EventBusUserName"]))
+                    {
+                        factory.UserName = Configuration["EventBusUserName"];
+                    }
+
+                    if (!string.IsNullOrEmpty(Configuration["EventBusPassword"]))
+                    {
+                        factory.Password = Configuration["EventBusPassword"];
+                    }
+
                     return new DefaultRabbitMQPersistentConnection(factory, logger);
                 });
             }
diff --git a/src/Services/Location/Locations.API/Startup.cs b/src/Services/Location/Locations.API/Startup.cs
index eb2077c8c..4b92afa02 100644
--- a/src/Services/Location/Locations.API/Startup.cs
+++ b/src/Services/Location/Locations.API/Startup.cs
@@ -62,12 +62,22 @@ namespace Microsoft.eShopOnContainers.Services.Locations.API
                 services.AddSingleton<IRabbitMQPersistentConnection>(sp =>
                 {
                     var logger = sp.GetRequiredService<ILogger<DefaultRabbitMQPersistentConnection>>();
-          
-                    var factory = new ConnectionFactory
+
+                    var factory = new ConnectionFactory()
                     {
                         HostName = Configuration["EventBusConnection"]
                     };
 
+                    if (!string.IsNullOrEmpty(Configuration["EventBusUserName"]))
+                    {
+                        factory.UserName = Configuration["EventBusUserName"];
+                    }
+
+                    if (!string.IsNullOrEmpty(Configuration["EventBusPassword"]))
+                    {
+                        factory.Password = Configuration["EventBusPassword"];
+                    }
+
                     return new DefaultRabbitMQPersistentConnection(factory, logger);
                 });
             }
diff --git a/src/Services/Marketing/Marketing.API/Startup.cs b/src/Services/Marketing/Marketing.API/Startup.cs
index 89f8482f9..37d6911c1 100644
--- a/src/Services/Marketing/Marketing.API/Startup.cs
+++ b/src/Services/Marketing/Marketing.API/Startup.cs
@@ -106,6 +106,15 @@
                         HostName = Configuration["EventBusConnection"]
                     };
 
+                    if (!string.IsNullOrEmpty(Configuration["EventBusUserName"]))
+                    {
+                        factory.UserName = Configuration["EventBusUserName"];
+                    }
+
+                    if (!string.IsNullOrEmpty(Configuration["EventBusPassword"]))
+                    {
+                        factory.Password = Configuration["EventBusPassword"];
+                    }
                     return new DefaultRabbitMQPersistentConnection(factory, logger);
                 });
             }            
diff --git a/src/Services/Ordering/Ordering.API/Startup.cs b/src/Services/Ordering/Ordering.API/Startup.cs
index 7f22540fa..2d2f94423 100644
--- a/src/Services/Ordering/Ordering.API/Startup.cs
+++ b/src/Services/Ordering/Ordering.API/Startup.cs
@@ -148,11 +148,22 @@
                 {
                     var logger = sp.GetRequiredService<ILogger<DefaultRabbitMQPersistentConnection>>();
 
+
                     var factory = new ConnectionFactory()
                     {
                         HostName = Configuration["EventBusConnection"]
                     };
 
+                    if (!string.IsNullOrEmpty(Configuration["EventBusUserName"]))
+                    {
+                        factory.UserName = Configuration["EventBusUserName"];
+                    }
+
+                    if (!string.IsNullOrEmpty(Configuration["EventBusPassword"]))
+                    {
+                        factory.Password = Configuration["EventBusPassword"];
+                    }
+
                     return new DefaultRabbitMQPersistentConnection(factory, logger);
                 });
             }
diff --git a/src/Services/Payment/Payment.API/Startup.cs b/src/Services/Payment/Payment.API/Startup.cs
index 5e87c4e19..c4ab2c322 100644
--- a/src/Services/Payment/Payment.API/Startup.cs
+++ b/src/Services/Payment/Payment.API/Startup.cs
@@ -51,12 +51,21 @@ namespace Payment.API
                 services.AddSingleton<IRabbitMQPersistentConnection>(sp =>
                 {
                     var logger = sp.GetRequiredService<ILogger<DefaultRabbitMQPersistentConnection>>();
-
                     var factory = new ConnectionFactory()
                     {
                         HostName = Configuration["EventBusConnection"]
                     };
 
+                    if (!string.IsNullOrEmpty(Configuration["EventBusUserName"]))
+                    {
+                        factory.UserName = Configuration["EventBusUserName"];
+                    }
+
+                    if (!string.IsNullOrEmpty(Configuration["EventBusPassword"]))
+                    {
+                        factory.Password = Configuration["EventBusPassword"];
+                    }
+
                     return new DefaultRabbitMQPersistentConnection(factory, logger);
                 });
             }