diff --git a/Chapter16/frontend-podaffinity-host.yaml b/Chapter16/frontend-podaffinity-host.yaml
index 30ecb64..939cf8a 100644
--- a/Chapter16/frontend-podaffinity-host.yaml
+++ b/Chapter16/frontend-podaffinity-host.yaml
@@ -1,9 +1,12 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: frontend
 spec:
   replicas: 5
+  selector:
+   matchLabels:
+    app: frontend
   template:
     metadata:
       labels:
diff --git a/Chapter16/frontend-podaffinity-preferred-host.yaml b/Chapter16/frontend-podaffinity-preferred-host.yaml
index ccabb72..64d4db8 100644
--- a/Chapter16/frontend-podaffinity-preferred-host.yaml
+++ b/Chapter16/frontend-podaffinity-preferred-host.yaml
@@ -1,9 +1,12 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: frontend
 spec:
   replicas: 5
+  selector:
+   matchLabels:
+    app: frontend
   template:
     metadata:
       labels:
diff --git a/Chapter16/frontend-podantiaffinity-host.yaml b/Chapter16/frontend-podantiaffinity-host.yaml
index 1d3b3b5..145e684 100644
--- a/Chapter16/frontend-podantiaffinity-host.yaml
+++ b/Chapter16/frontend-podantiaffinity-host.yaml
@@ -1,9 +1,12 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: frontend
 spec:
   replicas: 5
+  selector:
+   matchLabels:
+    app: frontend
   template:
     metadata:
       labels:
diff --git a/Chapter18/website-controller.yaml b/Chapter18/website-controller.yaml
index f161f7b..567f6f3 100644
--- a/Chapter18/website-controller.yaml
+++ b/Chapter18/website-controller.yaml
@@ -1,18 +1,21 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: website-controller
+ name: website-controller
 spec:
-  replicas: 1
-  template:
-    metadata:
-      name: website-controller
-      labels:
-        app: website-controller
-    spec:
-      serviceAccountName: website-controller
-      containers:
-      - name: main
-        image: luksa/website-controller
-      - name: proxy
-        image: luksa/kubectl-proxy:1.6.2
+ replicas: 1
+ selector:
+  matchLabels:
+   app: website-controller
+ template:
+   metadata:
+    name: website-controller
+    labels:
+     app: website-controller
+   spec:
+    serviceAccountName: website-controller
+    containers:
+    - name: main
+      image: luksa/website-controller
+    - name: proxy
+      image: luksa/kubectl-proxy:1.6.2