diff --git a/10-4-rs-queue.yaml b/10-4-rs-queue.yaml
index d8c06f5..28c9363 100644
--- a/10-4-rs-queue.yaml
+++ b/10-4-rs-queue.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: ReplicaSet
 metadata:
   labels:
@@ -8,6 +8,11 @@ metadata:
   name: queue
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: work-queue
+      component: queue
+      chapter: jobs
   template:
     metadata:
       labels:
diff --git a/13-1-dns-service.yaml b/13-1-dns-service.yaml
index 99a3e60..23a7cd0 100644
--- a/13-1-dns-service.yaml
+++ b/13-1-dns-service.yaml
@@ -4,4 +4,4 @@ metadata:
   name: external-database
 spec:
   type: ExternalName
-  externalName: "database.company.com
+  externalName: database.company.com
diff --git a/13-10-mongo-simple.yaml b/13-10-mongo-simple.yaml
index 0e50b65..9ef719f 100644
--- a/13-10-mongo-simple.yaml
+++ b/13-10-mongo-simple.yaml
@@ -1,10 +1,13 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: mongo
 spec:
   serviceName: "mongo"
   replicas: 3
+  selector:
+    matchLabels:
+      app: mongo
   template:
     metadata:
       labels:
@@ -12,7 +15,7 @@ spec:
     spec:
       containers:
       - name: mongodb
-        image: mongo:3.4.1
+        image: mongo:3.4.24
         command:
         - mongod
         - --replSet
diff --git a/13-13-mongo.yaml b/13-13-mongo.yaml
index 368b1a6..75f21ed 100644
--- a/13-13-mongo.yaml
+++ b/13-13-mongo.yaml
@@ -1,10 +1,13 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: mongo
 spec:
   serviceName: "mongo"
   replicas: 3
+  selector:
+    matchLabels:
+      app: mongo
   template:
     metadata:
       labels:
@@ -20,7 +23,6 @@ spec:
         ports:
         - containerPort: 27017
           name: web
-      # This container initializes the mongodb, then sleeps.
       - name: init-mongo
         image: mongo:3.4.1
         command:
diff --git a/13-2-external-ip-service.yaml b/13-2-external-ip-service.yaml
index aab2b9a..eef45ee 100644
--- a/13-2-external-ip-service.yaml
+++ b/13-2-external-ip-service.yaml
@@ -2,3 +2,6 @@ kind: Service
 apiVersion: v1
 metadata:
   name: external-ip-database
+spec:
+  ports:
+  - port: 3306
diff --git a/13-4-nfs-volume.yaml b/13-4-nfs-volume.yaml
index 0bf70b8..f3ff6cb 100644
--- a/13-4-nfs-volume.yaml
+++ b/13-4-nfs-volume.yaml
@@ -5,6 +5,8 @@ metadata:
   labels:
     volume: my-volume
 spec:
+  accessModes:
+  - ReadWriteMany
   capacity:
     storage: 1Gi
   nfs:
diff --git a/13-5-nfs-volume-claim.yaml b/13-5-nfs-volume-claim.yaml
index 739ba67..05e76af 100644
--- a/13-5-nfs-volume-claim.yaml
+++ b/13-5-nfs-volume-claim.yaml
@@ -3,6 +3,8 @@ apiVersion: v1
 metadata:
   name: database
 spec:
+  accessModes:
+  - ReadWriteMany
   resources:
     requests:
       storage: 1Gi
diff --git a/13-6-mysql-replicaset.yaml b/13-6-mysql-replicaset.yaml
index fe70d29..041ef76 100644
--- a/13-6-mysql-replicaset.yaml
+++ b/13-6-mysql-replicaset.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: ReplicaSet
 metadata:
   name: mysql
diff --git a/13-8-storageclass.yaml b/13-8-storageclass.yaml
index fe208c4..09c93fd 100644
--- a/13-8-storageclass.yaml
+++ b/13-8-storageclass.yaml
@@ -1,4 +1,4 @@
-apiVersion: storage.k8s.io/v1beta1
+apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
   name: default
diff --git a/14-1-parse.yaml b/14-1-parse.yaml
index 3d5138b..ceec9c1 100644
--- a/14-1-parse.yaml
+++ b/14-1-parse.yaml
@@ -1,10 +1,12 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: parse-server
-  namespace: default
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      run: parse-server
   template:
     metadata:
       labels:
diff --git a/14-10-redis.yaml b/14-10-redis.yaml
index 2a8cd58..1a17b3e 100644
--- a/14-10-redis.yaml
+++ b/14-10-redis.yaml
@@ -1,10 +1,13 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: redis
 spec:
   replicas: 3
   serviceName: redis
+  selector:
+    matchLabels:
+      app: redis
   template:
     metadata:
       labels:
diff --git a/14-4-ghost.yaml b/14-4-ghost.yaml
index f553ac0..02b9596 100644
--- a/14-4-ghost.yaml
+++ b/14-4-ghost.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: ghost
diff --git a/8-1-kuard-rs.yaml b/8-1-kuard-rs.yaml
index 75ea392..0cad32d 100644
--- a/8-1-kuard-rs.yaml
+++ b/8-1-kuard-rs.yaml
@@ -1,6 +1,9 @@
 apiVersion: apps/v1
 kind: ReplicaSet
 metadata:
+  labels:
+    app: kuard
+    version: "2"
   name: kuard
   labels:
     app: kuard
diff --git a/9-1-fluentd.yaml b/9-1-fluentd.yaml
index 64065f9..ca46c0a 100644
--- a/9-1-fluentd.yaml
+++ b/9-1-fluentd.yaml
@@ -1,11 +1,13 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: fluentd
-  namespace: kube-system
   labels:
     app: fluentd
 spec:
+  selector:
+    matchLabels:
+      app: fluentd
   template:
     metadata:
       labels:
diff --git a/9-2-nginx-fast-storage.yaml b/9-2-nginx-fast-storage.yaml
index f693e24..8e66746 100644
--- a/9-2-nginx-fast-storage.yaml
+++ b/9-2-nginx-fast-storage.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: "DaemonSet"
 metadata:
   labels:
@@ -6,6 +6,10 @@ metadata:
     ssd: "true"
   name: nginx-fast-storage
 spec:
+  selector:
+    matchLabels:
+      app: nginx
+      ssd: "true"
   template:
     metadata:
       labels: