diff --git a/guestbook/frontend-deployment.yaml b/guestbook/frontend-deployment.yaml
index 1888836b..1af734f4 100644
--- a/guestbook/frontend-deployment.yaml
+++ b/guestbook/frontend-deployment.yaml
@@ -1,8 +1,12 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: frontend
 spec:
+  selector:
+    matchLabels:
+      app: guestbook
+      tier: frontend
   replicas: 3
   template:
     metadata:
diff --git a/guestbook/redis-master-deployment.yaml b/guestbook/redis-master-deployment.yaml
index 3fbcc0f0..21a3d586 100644
--- a/guestbook/redis-master-deployment.yaml
+++ b/guestbook/redis-master-deployment.yaml
@@ -1,8 +1,13 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: redis-master
 spec:
+  selector:
+    matchLabels:
+      app: redis
+      role: master
+      tier: backend
   replicas: 1
   template:
     metadata:
diff --git a/guestbook/redis-slave-deployment.yaml b/guestbook/redis-slave-deployment.yaml
index 2bea4a51..0a1ba9a8 100644
--- a/guestbook/redis-slave-deployment.yaml
+++ b/guestbook/redis-slave-deployment.yaml
@@ -1,8 +1,13 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: redis-slave
 spec:
+  selector:
+    matchLabels:
+      app: redis
+      role: slave
+      tier: backend
   replicas: 2
   template:
     metadata: