diff --git a/deployment/kubernetes/cdc-service/ftgo-cdc-service.yml b/deployment/kubernetes/cdc-service/ftgo-cdc-service.yml
index 449edef3..b7f923bf 100644
--- a/deployment/kubernetes/cdc-service/ftgo-cdc-service.yml
+++ b/deployment/kubernetes/cdc-service/ftgo-cdc-service.yml
@@ -9,7 +9,7 @@ spec:
   selector:
     svc: ftgo-cdc-service
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: ftgo-cdc-service
@@ -17,12 +17,17 @@ metadata:
     application: ftgo
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: ftgo-cdc-service
+      svc: ftgo-cdc-service
   strategy:
     rollingUpdate:
       maxUnavailable: 0
   template:
     metadata:
       labels:
+        app: ftgo-cdc-service
         svc: ftgo-cdc-service
     spec:
       containers:
diff --git a/deployment/kubernetes/scripts/kubernetes-deploy-all.sh b/deployment/kubernetes/scripts/kubernetes-deploy-all.sh
index 790cef24..de254c37 100755
--- a/deployment/kubernetes/scripts/kubernetes-deploy-all.sh
+++ b/deployment/kubernetes/scripts/kubernetes-deploy-all.sh
@@ -4,6 +4,6 @@ kubectl apply -f <(cat deployment/kubernetes/stateful-services/*.yml)
 
 ./deployment/kubernetes/scripts/kubernetes-wait-for-ready-pods.sh ftgo-mysql-0 ftgo-kafka-0 ftgo-dynamodb-local-0 ftgo-zookeeper-0
 
-kubectl apply -f <(cat deployment/kubernetes/cdc-services/*.yml)
+kubectl apply -f <(cat deployment/kubernetes/cdc-service/*.yml)
 
 kubectl apply -f <(cat */src/deployment/kubernetes/*.yml)
diff --git a/deployment/kubernetes/stateful-services/ftgo-dynamodb-local.yml b/deployment/kubernetes/stateful-services/ftgo-dynamodb-local.yml
index 7413bee3..c23e85e9 100644
--- a/deployment/kubernetes/stateful-services/ftgo-dynamodb-local.yml
+++ b/deployment/kubernetes/stateful-services/ftgo-dynamodb-local.yml
@@ -9,7 +9,7 @@ spec:
   selector:
     svc: ftgo-dynamodb-local
 ---
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: ftgo-dynamodb-local
@@ -18,14 +18,19 @@ metadata:
 spec:
   serviceName: "ftgo-dynamodb"
   replicas: 1
+  selector:
+    matchLabels:
+      app: ftgo-dynamodb-local
+      svc: ftgo-dynamodb-local
   template:
     metadata:
       labels:
+        app: ftgo-dynamodb-local
         svc: ftgo-dynamodb-local
     spec:
       containers:
       - name: ftgo-dynamodb-local
-        image: cnadiminti/dynamodb-local:2017-04-22_beta
+        image: amazon/dynamodb-local:latest
         livenessProbe:
           tcpSocket:
             port: 8000
diff --git a/deployment/kubernetes/stateful-services/ftgo-kafka-deployment.yml b/deployment/kubernetes/stateful-services/ftgo-kafka-deployment.yml
index 0190b53e..115fb975 100644
--- a/deployment/kubernetes/stateful-services/ftgo-kafka-deployment.yml
+++ b/deployment/kubernetes/stateful-services/ftgo-kafka-deployment.yml
@@ -11,22 +11,27 @@ spec:
   selector:
     role: ftgo-kafka
 ---
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: ftgo-kafka
 spec:
   serviceName: "kafka"
   replicas: 1
+  selector:
+    matchLabels:
+      app: ftgo-kafka
+      role: ftgo-kafka
   template:
     metadata:
       labels:
+        app: ftgo-kafka
         role: ftgo-kafka
     spec:
       terminationGracePeriodSeconds: 10
       containers:
         - name: ftgo-kafka
-          image: confluentinc/cp-kafka:5.2.4
+          image: confluentinc/cp-kafka:latest
           env:
             - name: KAFKA_ADVERTISED_LISTENERS
               value: PLAINTEXT://ftgo-kafka:9092
diff --git a/deployment/kubernetes/stateful-services/ftgo-mysql-deployment.yml b/deployment/kubernetes/stateful-services/ftgo-mysql-deployment.yml
index 73b98479..d77f5738 100644
--- a/deployment/kubernetes/stateful-services/ftgo-mysql-deployment.yml
+++ b/deployment/kubernetes/stateful-services/ftgo-mysql-deployment.yml
@@ -12,22 +12,27 @@ spec:
   selector:
     role: ftgo-mysql
 ---
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: ftgo-mysql
 spec:
   serviceName: "mysql"
   replicas: 1
+  selector:
+    matchLabels:
+      app: ftgo-mysql
+      role: ftgo-mysql
   template:
     metadata:
       labels:
+        app: ftgo-mysql
         role: ftgo-mysql
     spec:
       terminationGracePeriodSeconds: 10
       containers:
         - name: ftgo-mysql
-          image: msapatterns/mysql:latest
+          image: mysql:latest
           imagePullPolicy: Always
           args:
               - "--ignore-db-dir=lost+found"
diff --git a/deployment/kubernetes/stateful-services/ftgo-zookeeper-deployment.yml b/deployment/kubernetes/stateful-services/ftgo-zookeeper-deployment.yml
index 4bfadd5d..4c1f9a20 100644
--- a/deployment/kubernetes/stateful-services/ftgo-zookeeper-deployment.yml
+++ b/deployment/kubernetes/stateful-services/ftgo-zookeeper-deployment.yml
@@ -12,22 +12,27 @@ spec:
   selector:
     role: ftgo-zookeeper
 ---
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: ftgo-zookeeper
 spec:
   serviceName: "zookeeper"
   replicas: 1
+  selector:
+    matchLabels:
+      role: ftgo-zookeeper
+      app: ftgo-zookeeper
   template:
     metadata:
       labels:
+        app: ftgo-zookeeper
         role: ftgo-zookeeper
     spec:
       terminationGracePeriodSeconds: 10
       containers:
         - name: ftgo-zookeeper
-          image: confluentinc/cp-zookeeper:5.2.4
+          image: confluentinc/cp-zookeeper:latest
           ports:
               - containerPort: 2181
           env:
diff --git a/ftgo-accounting-service/src/deployment/kubernetes/ftgo-accounting-service.yml b/ftgo-accounting-service/src/deployment/kubernetes/ftgo-accounting-service.yml
index 4076b11a..7f1b7a44 100644
--- a/ftgo-accounting-service/src/deployment/kubernetes/ftgo-accounting-service.yml
+++ b/ftgo-accounting-service/src/deployment/kubernetes/ftgo-accounting-service.yml
@@ -9,7 +9,7 @@ spec:
   selector:
     svc: ftgo-accounting-service
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: ftgo-accounting-service
@@ -17,12 +17,18 @@ metadata:
     application: ftgo
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: ftgo-accounting-service
+      svc: ftgo-accounting-service
+      application: ftgo
   strategy:
     rollingUpdate:
       maxUnavailable: 0
   template:
     metadata:
       labels:
+        app: ftgo-accounting-service
         svc: ftgo-accounting-service
         application: ftgo
     spec:
diff --git a/ftgo-api-gateway/src/deployment/kubernetes/ftgo-api-gateway.yml b/ftgo-api-gateway/src/deployment/kubernetes/ftgo-api-gateway.yml
index da9a31c7..36ee16d7 100644
--- a/ftgo-api-gateway/src/deployment/kubernetes/ftgo-api-gateway.yml
+++ b/ftgo-api-gateway/src/deployment/kubernetes/ftgo-api-gateway.yml
@@ -16,7 +16,7 @@ spec:
 #  loadBalancerSourceRanges:
 #    - 88.128.82.195/32
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: ftgo-api-gateway
@@ -24,12 +24,18 @@ metadata:
     application: ftgo
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: ftgo-api-gateway
+      svc: ftgo-api-gateway
+      application: ftgo
   strategy:
     rollingUpdate:
       maxUnavailable: 0
   template:
     metadata:
       labels:
+        app: ftgo-api-gateway
         svc: ftgo-api-gateway
         application: ftgo
     spec:
diff --git a/ftgo-consumer-service/src/deployment/kubernetes/ftgo-consumer-service.yml b/ftgo-consumer-service/src/deployment/kubernetes/ftgo-consumer-service.yml
index 28a7e8a4..3c00f34f 100644
--- a/ftgo-consumer-service/src/deployment/kubernetes/ftgo-consumer-service.yml
+++ b/ftgo-consumer-service/src/deployment/kubernetes/ftgo-consumer-service.yml
@@ -9,7 +9,7 @@ spec:
   selector:
     svc: ftgo-consumer-service
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: ftgo-consumer-service
@@ -17,12 +17,18 @@ metadata:
     application: ftgo
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: ftgo-consumer-service
+      svc: ftgo-consumer-service
+      application: ftgo
   strategy:
     rollingUpdate:
       maxUnavailable: 0
   template:
     metadata:
       labels:
+        app: ftgo-consumer-service
         svc: ftgo-consumer-service
         application: ftgo
     spec:
diff --git a/ftgo-kitchen-service/src/deployment/kubernetes/ftgo-kitchen-service.yml b/ftgo-kitchen-service/src/deployment/kubernetes/ftgo-kitchen-service.yml
index 341e6f8f..c4dc2257 100644
--- a/ftgo-kitchen-service/src/deployment/kubernetes/ftgo-kitchen-service.yml
+++ b/ftgo-kitchen-service/src/deployment/kubernetes/ftgo-kitchen-service.yml
@@ -9,7 +9,7 @@ spec:
   selector:
     svc: ftgo-kitchen-service
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: ftgo-kitchen-service
@@ -17,12 +17,18 @@ metadata:
     application: ftgo
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: ftgo-kitchen-service
+      svc: ftgo-kitchen-service
+      application: ftgo
   strategy:
     rollingUpdate:
       maxUnavailable: 0
   template:
     metadata:
       labels:
+        app: ftgo-kitchen-service
         svc: ftgo-kitchen-service
         application: ftgo
     spec:
diff --git a/ftgo-order-history-service/src/deployment/kubernetes/ftgo-order-history-service.yml b/ftgo-order-history-service/src/deployment/kubernetes/ftgo-order-history-service.yml
index c77fe573..d0ca5430 100644
--- a/ftgo-order-history-service/src/deployment/kubernetes/ftgo-order-history-service.yml
+++ b/ftgo-order-history-service/src/deployment/kubernetes/ftgo-order-history-service.yml
@@ -9,7 +9,7 @@ spec:
   selector:
     svc: ftgo-order-history-service
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: ftgo-order-history-service
@@ -17,12 +17,18 @@ metadata:
     application: ftgo
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: ftgo-order-history-service
+      svc: ftgo-order-history-service
+      application: ftgo
   strategy:
     rollingUpdate:
       maxUnavailable: 0
   template:
     metadata:
       labels:
+        app: ftgo-order-history-service
         svc: ftgo-order-history-service
         application: ftgo
     spec:
diff --git a/ftgo-order-service/src/deployment/kubernetes/ftgo-order-service.yml b/ftgo-order-service/src/deployment/kubernetes/ftgo-order-service.yml
index 1258554b..3fd02fac 100644
--- a/ftgo-order-service/src/deployment/kubernetes/ftgo-order-service.yml
+++ b/ftgo-order-service/src/deployment/kubernetes/ftgo-order-service.yml
@@ -17,7 +17,7 @@ spec:
   selector:
     svc: ftgo-order-service
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: ftgo-order-service
@@ -25,12 +25,18 @@ metadata:
     application: ftgo
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: ftgo-order-service
+      svc: ftgo-order-service
+      application: ftgo
   strategy:
     rollingUpdate:
       maxUnavailable: 0
   template:
     metadata:
       labels:
+        app: ftgo-order-service
         svc: ftgo-order-service
         application: ftgo
     spec:
diff --git a/ftgo-restaurant-service/src/deployment/kubernetes/ftgo-restaurant-service.yml b/ftgo-restaurant-service/src/deployment/kubernetes/ftgo-restaurant-service.yml
index bf251277..7b833aa4 100644
--- a/ftgo-restaurant-service/src/deployment/kubernetes/ftgo-restaurant-service.yml
+++ b/ftgo-restaurant-service/src/deployment/kubernetes/ftgo-restaurant-service.yml
@@ -9,7 +9,7 @@ spec:
   selector:
     svc: ftgo-restaurant-service
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: ftgo-restaurant-service
@@ -18,12 +18,18 @@ metadata:
     svc: ftgo-restaurant-service
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: ftgo-restaurant-service
+      svc: ftgo-restaurant-service
+      application: ftgo
   strategy:
     rollingUpdate:
       maxUnavailable: 0
   template:
     metadata:
       labels:
+        app: ftgo-restaurant-service
         svc: ftgo-restaurant-service
         application: ftgo
     spec: