diff --git a/.github/workflows/package-ai-service.yaml b/.github/workflows/package-ai-service.yaml
index 7613b7e3..9d475792 100644
--- a/.github/workflows/package-ai-service.yaml
+++ b/.github/workflows/package-ai-service.yaml
@@ -1,6 +1,12 @@
 name: package-ai-service
 
 on:
+  push:
+    branches:
+      - 'main'
+    paths:
+      - 'ai-service/**'
+
   workflow_dispatch:
 
 jobs:
@@ -21,6 +27,7 @@ jobs:
           echo ::set-output name=project::ai-service
           echo ::set-output name=image::ai-service
           echo ::set-output name=repository::ghcr.io/azure-samples/aks-store-demo
+          echo "{project}={ai-service}" >> $GITHUB_STATE
 
   package-service:
     name: Package Service
diff --git a/.github/workflows/package-makeline-service.yaml b/.github/workflows/package-makeline-service.yaml
index 49d24c12..0d6750b1 100644
--- a/.github/workflows/package-makeline-service.yaml
+++ b/.github/workflows/package-makeline-service.yaml
@@ -1,6 +1,12 @@
 name: package-makeline-service
 
 on:
+  push:
+    branches:
+      - 'main'
+    paths:
+      - 'makeline-service/**'
+
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/package-order-service.yaml b/.github/workflows/package-order-service.yaml
index d7aa38c8..4544b780 100644
--- a/.github/workflows/package-order-service.yaml
+++ b/.github/workflows/package-order-service.yaml
@@ -1,6 +1,12 @@
 name: package-order-service
 
 on:
+  push:
+    branches:
+      - 'main'
+    paths:
+      - 'order-service/**'
+
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/package-product-service.yaml b/.github/workflows/package-product-service.yaml
index 040f222c..7229cebc 100644
--- a/.github/workflows/package-product-service.yaml
+++ b/.github/workflows/package-product-service.yaml
@@ -1,6 +1,12 @@
 name: package-product-service
 
 on:
+  push:
+    branches:
+      - 'main'
+    paths:
+      - 'product-service/**'
+
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/package-store-back-service.yaml b/.github/workflows/package-store-back-service.yaml
index e359133b..2ae28291 100644
--- a/.github/workflows/package-store-back-service.yaml
+++ b/.github/workflows/package-store-back-service.yaml
@@ -1,6 +1,12 @@
 name: package-store-admin
 
 on:
+  push:
+    branches:
+      - 'main'
+    paths:
+      - 'store-admin/**'
+
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/package-store-front-service.yaml b/.github/workflows/package-store-front-service.yaml
index 914ec27b..2f8ddca3 100644
--- a/.github/workflows/package-store-front-service.yaml
+++ b/.github/workflows/package-store-front-service.yaml
@@ -1,6 +1,12 @@
 name: package-store-front
 
 on:
+  push:
+    branches:
+      - 'main'
+    paths:
+      - 'store-front/**'
+
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/package-virtual-customer-service.yaml b/.github/workflows/package-virtual-customer-service.yaml
index 2565002f..4cf7291e 100644
--- a/.github/workflows/package-virtual-customer-service.yaml
+++ b/.github/workflows/package-virtual-customer-service.yaml
@@ -1,6 +1,12 @@
 name: package-virtual-customer
 
 on:
+  push:
+    branches:
+      - 'main'
+    paths:
+      - 'virtual-customer/**'
+
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/package-virtual-worker-service.yaml b/.github/workflows/package-virtual-worker-service.yaml
index 4e978c31..45582471 100644
--- a/.github/workflows/package-virtual-worker-service.yaml
+++ b/.github/workflows/package-virtual-worker-service.yaml
@@ -1,6 +1,12 @@
 name: package-virtual-worker
 
 on:
+  push:
+    branches:
+      - 'main'
+    paths:
+      - 'virtual-worker/**'
+
   workflow_dispatch:
 
 jobs:
diff --git a/aks-store-all-in-one.yaml b/aks-store-all-in-one.yaml
index 98b329bc..0c2be870 100644
--- a/aks-store-all-in-one.yaml
+++ b/aks-store-all-in-one.yaml
@@ -115,6 +115,10 @@ spec:
         - name: FASTIFY_ADDRESS
           value: "0.0.0.0"
         resources: {}
+      initContainers:
+      - name: wait-for-rabbitmq
+        image: busybox
+        command: ['sh', '-c', 'until nc -zv rabbitmq 5672; do echo waiting for rabbitmq; sleep 2; done;']        
 ---
 apiVersion: v1
 kind: Service
@@ -234,10 +238,10 @@ spec:
         ports:
         - containerPort: 8080
           name: store-front
-        env:
+        env:aks-store-all-in-one.yaml
         - name: VUE_APP_ORDER_SERVICE_URL
           value: "http://order-service:3000/"
-        - name: PRODUCT_SERVICE_URL
+        - name: VUE_APP_PRODUCT_SERVICE_URL
           value: "http://product-service:3002/"
         resources: {}
 ---