diff --git a/docs/08-bootstrapping-kubernetes-controllers.md b/docs/08-bootstrapping-kubernetes-controllers.md
index 1c2883b..1376e92 100644
--- a/docs/08-bootstrapping-kubernetes-controllers.md
+++ b/docs/08-bootstrapping-kubernetes-controllers.md
@@ -100,6 +100,7 @@ ExecStart=/usr/local/bin/kube-apiserver \\
   --service-node-port-range=30000-32767 \\
   --tls-cert-file=/var/lib/kubernetes/kubernetes.pem \\
   --tls-private-key-file=/var/lib/kubernetes/kubernetes-key.pem \\
+  --feature-gates=RuntimeClass=true \\
   --v=2
 Restart=on-failure
 RestartSec=5
@@ -335,6 +336,35 @@ subjects:
 EOF
 ```
 
+## Configure the RuntimeClass Custom Resource for gVisor
+
+The [RuntimeClass](https://kubernetes.io/docs/concepts/containers/runtime-class/)
+custom resource allows you to discover supported runtimes in your cluster and
+specify a specific runtime per pod. In this lab you will use it to create pods
+that can be run using gVisor.
+
+The runtime class API is in *Alpha* so it is not a built-in resource yet. You will
+need a custom resource definition to use it.  First create the custom resource
+definition.
+
+```
+kubectl apply --kubeconfig admin.kubeconfig \
+    -f https://raw.githubusercontent.com/kubernetes/kubernetes/v1.12.0/cluster/addons/runtimeclass/runtimeclass_crd.yaml
+```
+
+Create the runtime class for gVisor.
+
+```
+cat <<EOF | kubectl apply --kubeconfig admin.kubeconfig -f -
+apiVersion: node.k8s.io/v1alpha1
+kind: RuntimeClass
+metadata:
+  name: gvisor
+spec:
+  runtimeHandler: runsc
+EOF
+```
+
 ## The Kubernetes Frontend Load Balancer
 
 In this section you will provision an external load balancer to front the Kubernetes API Servers. The `kubernetes-the-hard-way` static IP address will be attached to the resulting load balancer.
diff --git a/docs/09-bootstrapping-kubernetes-workers.md b/docs/09-bootstrapping-kubernetes-workers.md
index bec4960..3d9fc89 100644
--- a/docs/09-bootstrapping-kubernetes-workers.md
+++ b/docs/09-bootstrapping-kubernetes-workers.md
@@ -35,7 +35,7 @@ wget -q --show-progress --https-only --timestamping \
   https://storage.googleapis.com/kubernetes-the-hard-way/runsc-50c283b9f56bb7200938d9e207355f05f79f0d17 \
   https://github.com/opencontainers/runc/releases/download/v1.0.0-rc5/runc.amd64 \
   https://github.com/containernetworking/plugins/releases/download/v0.6.0/cni-plugins-amd64-v0.6.0.tgz \
-  https://github.com/containerd/containerd/releases/download/v1.2.0-rc.0/containerd-1.2.0-rc.0.linux-amd64.tar.gz \
+  https://github.com/containerd/containerd/releases/download/v1.2.0-rc.2/containerd-1.2.0-rc.2.linux-amd64.tar.gz \
   https://storage.googleapis.com/kubernetes-release/release/v1.12.0/bin/linux/amd64/kubectl \
   https://storage.googleapis.com/kubernetes-release/release/v1.12.0/bin/linux/amd64/kube-proxy \
   https://storage.googleapis.com/kubernetes-release/release/v1.12.0/bin/linux/amd64/kubelet
@@ -63,7 +63,7 @@ Install the worker binaries:
   sudo mv kubectl kube-proxy kubelet runc runsc /usr/local/bin/
   sudo tar -xvf crictl-v1.12.0-linux-amd64.tar.gz -C /usr/local/bin/
   sudo tar -xvf cni-plugins-amd64-v0.6.0.tgz -C /opt/cni/bin/
-  sudo tar -xvf containerd-1.2.0-rc.0.linux-amd64.tar.gz -C /
+  sudo tar -xvf containerd-1.2.0-rc.2.linux-amd64.tar.gz -C /
 }
 ```
 
@@ -126,18 +126,14 @@ cat << EOF | sudo tee /etc/containerd/config.toml
       runtime_type = "io.containerd.runtime.v1.linux"
       runtime_engine = "/usr/local/bin/runc"
       runtime_root = ""
-    [plugins.cri.containerd.untrusted_workload_runtime]
-      runtime_type = "io.containerd.runtime.v1.linux"
-      runtime_engine = "/usr/local/bin/runsc"
-      runtime_root = "/run/containerd/runsc"
-    [plugins.cri.containerd.gvisor]
+    [plugins.cri.containerd.runtimes.runsc]
       runtime_type = "io.containerd.runtime.v1.linux"
       runtime_engine = "/usr/local/bin/runsc"
       runtime_root = "/run/containerd/runsc"
 EOF
 ```
 
-> Untrusted workloads will be run using the gVisor (runsc) runtime.
+> This sets up support for the runsc runtime handler in containerd.
 
 Create the `containerd.service` systemd unit file:
 
@@ -222,6 +218,7 @@ ExecStart=/usr/local/bin/kubelet \\
   --kubeconfig=/var/lib/kubelet/kubeconfig \\
   --network-plugin=cni \\
   --register-node=true \\
+  --feature-gates=RuntimeClass=true \\
   --v=2
 Restart=on-failure
 RestartSec=5
diff --git a/docs/13-smoke-test.md b/docs/13-smoke-test.md
index f302909..f1bb346 100644
--- a/docs/13-smoke-test.md
+++ b/docs/13-smoke-test.md
@@ -221,9 +221,8 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: untrusted
-  annotations:
-    io.kubernetes.cri.untrusted-workload: "true"
 spec:
+  runtimeClassName: gvisor
   containers:
     - name: webserver
       image: gcr.io/hightowerlabs/helloworld:2.0.0