diff --git a/src/Web/Catalog.WebForms/docker-compose.override.yml b/src/Web/Catalog.WebForms/docker-compose.override.yml
index 18b660fc0..d5de40ba3 100644
--- a/src/Web/Catalog.WebForms/docker-compose.override.yml
+++ b/src/Web/Catalog.WebForms/docker-compose.override.yml
@@ -15,7 +15,7 @@ services:
       - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word
       - ExternalCatalogBaseUrl=http://localhost:5101    #Local: You need to open your local dev-machine firewall at range 5100-5105.  at range 5100-5105.
       #- ExternalCatalogBaseUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5101    #Local: You need to open your local dev-machine firewall at range 5100-5105.  at range 5100-5105.	  
-      - EventBusConnection=rabbitmq
+      - EventBusConnection=172.21.4.39  # rabbitmq
     ports:
       - "5101:5101"
 
diff --git a/src/Web/Catalog.WebForms/docker-compose.yml b/src/Web/Catalog.WebForms/docker-compose.yml
index d1f0c7679..edbf34bfe 100644
--- a/src/Web/Catalog.WebForms/docker-compose.yml
+++ b/src/Web/Catalog.WebForms/docker-compose.yml
@@ -20,11 +20,11 @@ services:
 
   rabbitmq:
     image: eshop/rabbitmq-win
-    build:
-      context: ../../../_docker/rabbitmq
-      dockerfile: Dockerfile.nanowin  
     ports:
         - "5672:5672"
+    networks:
+     default:
+      ipv4_address: 172.21.4.39
 
   sql.data:
     image: microsoft/mssql-server-windows