diff --git a/.env b/.env
index 62c73fc..35d1a2a 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
 # environment file for docker-compose
-REPO=steveww
-TAG=0.1.2
+REPO=robotshop
+TAG=0.2.0
diff --git a/K8s/cart-deployment.yaml b/K8s/cart-deployment.yaml
index 60a405c..0ac1c2a 100644
--- a/K8s/cart-deployment.yaml
+++ b/K8s/cart-deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   annotations:
     kompose.cmd: kompose convert -f ../docker-compose.yaml
-    kompose.version: 1.7.0 (767ab4b)
+    kompose.version: 1.8.0 (0c0c027)
   creationTimestamp: null
   labels:
     io.kompose.service: cart
@@ -18,7 +18,7 @@ spec:
         io.kompose.service: cart
     spec:
       containers:
-      - image: steveww/rs-cart
+      - image: robotshop/rs-cart:0.2.0
         name: cart
         ports:
         - containerPort: 8080
diff --git a/K8s/cart-service.yaml b/K8s/cart-service.yaml
index ac812a1..d60e15c 100644
--- a/K8s/cart-service.yaml
+++ b/K8s/cart-service.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   annotations:
     kompose.cmd: kompose convert -f ../docker-compose.yaml
-    kompose.version: 1.7.0 (767ab4b)
+    kompose.version: 1.8.0 (0c0c027)
   creationTimestamp: null
   labels:
     io.kompose.service: cart
diff --git a/K8s/catalogue-deployment.yaml b/K8s/catalogue-deployment.yaml
index 2b21589..d80225d 100644
--- a/K8s/catalogue-deployment.yaml
+++ b/K8s/catalogue-deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   annotations:
     kompose.cmd: kompose convert -f ../docker-compose.yaml
-    kompose.version: 1.7.0 (767ab4b)
+    kompose.version: 1.8.0 (0c0c027)
   creationTimestamp: null
   labels:
     io.kompose.service: catalogue
@@ -18,7 +18,7 @@ spec:
         io.kompose.service: catalogue
     spec:
       containers:
-      - image: steveww/rs-catalogue
+      - image: robotshop/rs-catalogue:0.2.0
         name: catalogue
         ports:
         - containerPort: 8080
diff --git a/K8s/catalogue-service.yaml b/K8s/catalogue-service.yaml
index 0656745..40e0833 100644
--- a/K8s/catalogue-service.yaml
+++ b/K8s/catalogue-service.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   annotations:
     kompose.cmd: kompose convert -f ../docker-compose.yaml
-    kompose.version: 1.7.0 (767ab4b)
+    kompose.version: 1.8.0 (0c0c027)
   creationTimestamp: null
   labels:
     io.kompose.service: catalogue
diff --git a/K8s/dispatch-deployment.yaml b/K8s/dispatch-deployment.yaml
index b4f53fb..dd00079 100644
--- a/K8s/dispatch-deployment.yaml
+++ b/K8s/dispatch-deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   annotations:
     kompose.cmd: kompose convert -f ../docker-compose.yaml
-    kompose.version: 1.7.0 (767ab4b)
+    kompose.version: 1.8.0 (0c0c027)
   creationTimestamp: null
   labels:
     io.kompose.service: dispatch
@@ -18,7 +18,7 @@ spec:
         io.kompose.service: dispatch
     spec:
       containers:
-      - image: steveww/rs-dispatch
+      - image: robotshop/rs-dispatch:0.2.0
         name: dispatch
         resources: {}
       restartPolicy: Always
diff --git a/K8s/dispatch-service.yaml b/K8s/dispatch-service.yaml
index 99ab817..03ab4f5 100644
--- a/K8s/dispatch-service.yaml
+++ b/K8s/dispatch-service.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   annotations:
     kompose.cmd: kompose convert -f ../docker-compose.yaml
-    kompose.version: 1.7.0 (767ab4b)
+    kompose.version: 1.8.0 (0c0c027)
   creationTimestamp: null
   labels:
     io.kompose.service: dispatch
diff --git a/K8s/mongodb-deployment.yaml b/K8s/mongodb-deployment.yaml
index 346b793..c26a996 100644
--- a/K8s/mongodb-deployment.yaml
+++ b/K8s/mongodb-deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   annotations:
     kompose.cmd: kompose convert -f ../docker-compose.yaml
-    kompose.version: 1.7.0 (767ab4b)
+    kompose.version: 1.8.0 (0c0c027)
   creationTimestamp: null
   labels:
     io.kompose.service: mongodb
@@ -18,7 +18,7 @@ spec:
         io.kompose.service: mongodb
     spec:
       containers:
-      - image: steveww/rs-mongodb
+      - image: robotshop/rs-mongodb:0.2.0
         name: mongodb
         ports:
         - containerPort: 27017
diff --git a/K8s/mongodb-service.yaml b/K8s/mongodb-service.yaml
index 973c6f7..de7e72d 100644
--- a/K8s/mongodb-service.yaml
+++ b/K8s/mongodb-service.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   annotations:
     kompose.cmd: kompose convert -f ../docker-compose.yaml
-    kompose.version: 1.7.0 (767ab4b)
+    kompose.version: 1.8.0 (0c0c027)
   creationTimestamp: null
   labels:
     io.kompose.service: mongodb
diff --git a/K8s/mysql-deployment.yaml b/K8s/mysql-deployment.yaml
index 74fa7ca..ac7d104 100644
--- a/K8s/mysql-deployment.yaml
+++ b/K8s/mysql-deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   annotations:
     kompose.cmd: kompose convert -f ../docker-compose.yaml
-    kompose.version: 1.7.0 (767ab4b)
+    kompose.version: 1.8.0 (0c0c027)
   creationTimestamp: null
   labels:
     io.kompose.service: mysql
@@ -18,7 +18,7 @@ spec:
         io.kompose.service: mysql
     spec:
       containers:
-      - image: steveww/rs-shipping-db
+      - image: robotshop/rs-shipping-db:0.2.0
         name: mysql
         ports:
         - containerPort: 3306
diff --git a/K8s/mysql-service.yaml b/K8s/mysql-service.yaml
index 0b0642d..d3f2be6 100644
--- a/K8s/mysql-service.yaml
+++ b/K8s/mysql-service.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   annotations:
     kompose.cmd: kompose convert -f ../docker-compose.yaml
-    kompose.version: 1.7.0 (767ab4b)
+    kompose.version: 1.8.0 (0c0c027)
   creationTimestamp: null
   labels:
     io.kompose.service: mysql
diff --git a/K8s/payment-deployment.yaml b/K8s/payment-deployment.yaml
index b0ba5ab..e07aed7 100644
--- a/K8s/payment-deployment.yaml
+++ b/K8s/payment-deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   annotations:
     kompose.cmd: kompose convert -f ../docker-compose.yaml
-    kompose.version: 1.7.0 (767ab4b)
+    kompose.version: 1.8.0 (0c0c027)
   creationTimestamp: null
   labels:
     io.kompose.service: payment
@@ -21,7 +21,7 @@ spec:
       - env:
         - name: AUTOWRAPT_BOOTSTRAP
           value: flask
-        image: steveww/rs-payment
+        image: robotshop/rs-payment:0.2.0
         name: payment
         ports:
         - containerPort: 8080
diff --git a/K8s/payment-service.yaml b/K8s/payment-service.yaml
index 84fb0a5..f477c5c 100644
--- a/K8s/payment-service.yaml
+++ b/K8s/payment-service.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   annotations:
     kompose.cmd: kompose convert -f ../docker-compose.yaml
-    kompose.version: 1.7.0 (767ab4b)
+    kompose.version: 1.8.0 (0c0c027)
   creationTimestamp: null
   labels:
     io.kompose.service: payment
diff --git a/K8s/rabbitmq-deployment.yaml b/K8s/rabbitmq-deployment.yaml
index 908497a..1d9975b 100644
--- a/K8s/rabbitmq-deployment.yaml
+++ b/K8s/rabbitmq-deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   annotations:
     kompose.cmd: kompose convert -f ../docker-compose.yaml
-    kompose.version: 1.7.0 (767ab4b)
+    kompose.version: 1.8.0 (0c0c027)
   creationTimestamp: null
   labels:
     io.kompose.service: rabbitmq
@@ -22,6 +22,7 @@ spec:
         name: rabbitmq
         ports:
         - containerPort: 5672
+        - containerPort: 15672
         resources: {}
       restartPolicy: Always
 status: {}
diff --git a/K8s/rabbitmq-service.yaml b/K8s/rabbitmq-service.yaml
index 0c6dc3e..e2a1a84 100644
--- a/K8s/rabbitmq-service.yaml
+++ b/K8s/rabbitmq-service.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   annotations:
     kompose.cmd: kompose convert -f ../docker-compose.yaml
-    kompose.version: 1.7.0 (767ab4b)
+    kompose.version: 1.8.0 (0c0c027)
   creationTimestamp: null
   labels:
     io.kompose.service: rabbitmq
@@ -13,6 +13,9 @@ spec:
   - name: "5672"
     port: 5672
     targetPort: 5672
+  - name: "15672"
+    port: 15672
+    targetPort: 15672
   selector:
     io.kompose.service: rabbitmq
 status:
diff --git a/K8s/redis-deployment.yaml b/K8s/redis-deployment.yaml
index 4ea27d1..d0a4472 100644
--- a/K8s/redis-deployment.yaml
+++ b/K8s/redis-deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   annotations:
     kompose.cmd: kompose convert -f ../docker-compose.yaml
-    kompose.version: 1.7.0 (767ab4b)
+    kompose.version: 1.8.0 (0c0c027)
   creationTimestamp: null
   labels:
     io.kompose.service: redis
diff --git a/K8s/redis-service.yaml b/K8s/redis-service.yaml
index 4e059ed..1d1031d 100644
--- a/K8s/redis-service.yaml
+++ b/K8s/redis-service.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   annotations:
     kompose.cmd: kompose convert -f ../docker-compose.yaml
-    kompose.version: 1.7.0 (767ab4b)
+    kompose.version: 1.8.0 (0c0c027)
   creationTimestamp: null
   labels:
     io.kompose.service: redis
diff --git a/K8s/shipping-deployment.yaml b/K8s/shipping-deployment.yaml
index 6b396cc..2141142 100644
--- a/K8s/shipping-deployment.yaml
+++ b/K8s/shipping-deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   annotations:
     kompose.cmd: kompose convert -f ../docker-compose.yaml
-    kompose.version: 1.7.0 (767ab4b)
+    kompose.version: 1.8.0 (0c0c027)
   creationTimestamp: null
   labels:
     io.kompose.service: shipping
@@ -18,7 +18,7 @@ spec:
         io.kompose.service: shipping
     spec:
       containers:
-      - image: steveww/rs-shipping
+      - image: robotshop/rs-shipping:0.2.0
         name: shipping
         ports:
         - containerPort: 8080
diff --git a/K8s/shipping-service.yaml b/K8s/shipping-service.yaml
index 06a8d9f..79f9b83 100644
--- a/K8s/shipping-service.yaml
+++ b/K8s/shipping-service.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   annotations:
     kompose.cmd: kompose convert -f ../docker-compose.yaml
-    kompose.version: 1.7.0 (767ab4b)
+    kompose.version: 1.8.0 (0c0c027)
   creationTimestamp: null
   labels:
     io.kompose.service: shipping
diff --git a/K8s/user-deployment.yaml b/K8s/user-deployment.yaml
index 1f12d24..16f1f5d 100644
--- a/K8s/user-deployment.yaml
+++ b/K8s/user-deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   annotations:
     kompose.cmd: kompose convert -f ../docker-compose.yaml
-    kompose.version: 1.7.0 (767ab4b)
+    kompose.version: 1.8.0 (0c0c027)
   creationTimestamp: null
   labels:
     io.kompose.service: user
@@ -18,7 +18,7 @@ spec:
         io.kompose.service: user
     spec:
       containers:
-      - image: steveww/rs-user
+      - image: robotshop/rs-user:0.2.0
         name: user
         ports:
         - containerPort: 8080
diff --git a/K8s/user-service.yaml b/K8s/user-service.yaml
index 40fdfed..0e8a7c8 100644
--- a/K8s/user-service.yaml
+++ b/K8s/user-service.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   annotations:
     kompose.cmd: kompose convert -f ../docker-compose.yaml
-    kompose.version: 1.7.0 (767ab4b)
+    kompose.version: 1.8.0 (0c0c027)
   creationTimestamp: null
   labels:
     io.kompose.service: user
diff --git a/K8s/web-deployment.yaml b/K8s/web-deployment.yaml
index 7e8bf0b..605b311 100644
--- a/K8s/web-deployment.yaml
+++ b/K8s/web-deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   annotations:
     kompose.cmd: kompose convert -f ../docker-compose.yaml
-    kompose.version: 1.7.0 (767ab4b)
+    kompose.version: 1.8.0 (0c0c027)
   creationTimestamp: null
   labels:
     io.kompose.service: web
@@ -18,7 +18,7 @@ spec:
         io.kompose.service: web
     spec:
       containers:
-      - image: steveww/rs-web
+      - image: robotshop/rs-web:0.2.0
         name: web
         # env:
           # - name: INSTANA_EUM_KEY
diff --git a/K8s/web-service.yaml b/K8s/web-service.yaml
index 925bbb8..0698b12 100644
--- a/K8s/web-service.yaml
+++ b/K8s/web-service.yaml
@@ -3,18 +3,16 @@ kind: Service
 metadata:
   annotations:
     kompose.cmd: kompose convert -f ../docker-compose.yaml
-    kompose.version: 1.7.0 (767ab4b)
+    kompose.version: 1.8.0 (0c0c027)
   creationTimestamp: null
   labels:
     io.kompose.service: web
   name: web
 spec:
-  type: NodePort
   ports:
   - name: "8080"
     port: 8080
     targetPort: 8080
-    nodePort: 30080
   selector:
     io.kompose.service: web
 status: