diff --git a/k8s/deployments.yaml b/k8s/deployments.yaml
index b5ebd8c2f..c89e4b7e3 100644
--- a/k8s/deployments.yaml
+++ b/k8s/deployments.yaml
@@ -15,12 +15,12 @@ spec:
         image: eshop/basket.api
         imagePullPolicy: Always
         env:
-        - name: ASPNETCORE_ENVIRONMENT
-          value: Development
         - name: ASPNETCORE_URLS
           value: http://0.0.0.0:80/basket-api
         - name: ConnectionString
           value: 127.0.0.1
+        - name: EventBusConnection
+          value: rabbitmq
         - name: IdentityUrl
           valueFrom:
            configMapKeyRef:
@@ -52,12 +52,12 @@ spec:
         image: eshop/catalog.api
         imagePullPolicy: Always
         env:
-        - name: ASPNETCORE_ENVIRONMENT
-          value: Development
         - name: ASPNETCORE_URLS
           value: http://0.0.0.0:80/catalog-api
         - name: ConnectionString
           value: "Server=sql-data;Initial Catalog=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word"
+        - name: EventBusConnection
+          value: rabbitmq
         - name: ExternalCatalogBaseUrl
           valueFrom:
            configMapKeyRef:
@@ -85,8 +85,6 @@ spec:
         image: eshop/identity.api
         imagePullPolicy: Always
         env:
-        - name: ASPNETCORE_ENVIRONMENT
-          value: Development
         - name: ASPNETCORE_URLS
           value: http://0.0.0.0:80/identity
         - name: ConnectionStrings__DefaultConnection
@@ -123,12 +121,12 @@ spec:
         image: eshop/ordering.api
         imagePullPolicy: Always
         env:
-        - name: ASPNETCORE_ENVIRONMENT
-          value: Development
         - name: ASPNETCORE_URLS
           value: http://0.0.0.0:80/ordering-api
         - name: ConnectionString
           value: "Server=sql-data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;"
+        - name: EventBusConnection
+          value: rabbitmq
         - name: IdentityUrl
           valueFrom:
            configMapKeyRef:
@@ -156,8 +154,6 @@ spec:
         image: eshop/webmvc
         imagePullPolicy: Always
         env:
-        - name: ASPNETCORE_ENVIRONMENT
-          value: Development
         - name: ASPNETCORE_URLS
           value: http://0.0.0.0:80/webmvc
         - name: BasketUrl
@@ -207,8 +203,6 @@ spec:
         image: eshop/webspa
         imagePullPolicy: Always
         env:
-        - name: ASPNETCORE_ENVIRONMENT
-          value: Development
         - name: ASPNETCORE_URLS
           value: http://0.0.0.0:80
         - name: BasketUrl
diff --git a/k8s/rabbitmq.yaml b/k8s/rabbitmq.yaml
new file mode 100644
index 000000000..a0d87549c
--- /dev/null
+++ b/k8s/rabbitmq.yaml
@@ -0,0 +1,30 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: eshop
+    component: rabbitmq
+  name: rabbitmq
+spec:
+  ports:
+  - port: 5672
+  selector:
+    app: eshop
+    component: rabbitmq
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: rabbitmq
+spec:
+  template:
+    metadata:
+      labels:
+        app: eshop
+        component: rabbitmq
+    spec:
+      containers:
+      - name: rabbitmq
+        image: rabbitmq:3.6.9-alpine
+        ports:
+        - containerPort: 5672