diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index 23a5347d0..559586381 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -313,8 +313,8 @@ steps:
       <<: *ubuntu_agents
       cgroup: "v2"
   - <<: *common
-    label: ":docker: Containerd 1.5.4 tests (cgroupv1)"
-    command: make containerd-test-1.5.4
+    label: ":docker: Containerd 1.5.11 tests (cgroupv1)"
+    command: make containerd-test-1.5.11
     agents:
       <<: *platform_specific_agents
       <<: *ubuntu_agents
@@ -322,22 +322,22 @@ steps:
   - <<: *common
     # See above: not truly a source test.
     <<: *source_test
-    label: ":docker: Containerd 1.5.4 tests (cgroupv2)"
-    command: make containerd-test-1.5.4
+    label: ":docker: Containerd 1.5.11 tests (cgroupv2)"
+    command: make containerd-test-1.5.11
     agents:
       <<: *ubuntu_agents
       cgroup: "v2"
   - <<: *common
-    label: ":docker: Containerd 1.6.0-rc.4 tests (cgroupv1)"
-    command: make containerd-test-1.6.0-rc.4
+    label: ":docker: Containerd 1.6.2 tests (cgroupv1)"
+    command: make containerd-test-1.6.2
     agents:
       <<: *platform_specific_agents
       <<: *ubuntu_agents
       cgroup: "v1"
   - <<: *common
     <<: *source_test
-    label: ":docker: Containerd 1.6.0-rc.4 tests (cgroupv2)"
-    command: make containerd-test-1.6.0-rc.4
+    label: ":docker: Containerd 1.6.2 tests (cgroupv2)"
+    command: make containerd-test-1.6.2
     agents:
       <<: *ubuntu_agents
       cgroup: "v2"
diff --git a/Makefile b/Makefile
index 9e7ebc822..395a75127 100644
--- a/Makefile
+++ b/Makefile
@@ -340,8 +340,8 @@ containerd-tests-min: containerd-test-1.4.12
 ##
 containerd-tests:
 containerd-tests: containerd-test-1.4.12
-containerd-tests: containerd-test-1.5.9
-containerd-tests: containerd-test-1.6.0
+containerd-tests: containerd-test-1.5.11
+containerd-tests: containerd-test-1.6.2
 
 ##
 ## Benchmarks.
diff --git a/tools/install_containerd.sh b/tools/install_containerd.sh
index f70677018..599647e45 100755
--- a/tools/install_containerd.sh
+++ b/tools/install_containerd.sh
@@ -22,7 +22,7 @@ declare -r CONTAINERD_MINOR="$(echo ${CONTAINERD_VERSION} | awk -F '.' '{ print
 declare -r CRITOOLS_VERSION=${CRITOOLS_VERSION:-1.18.0}
 
 if [[ "${CONTAINERD_MAJOR}" -eq 1 ]] && [[ "${CONTAINERD_MINOR}" -le 4 ]]; then
-  # We're running Go 1.16, but using pre-module containerd and cri-tools.
+  # We're running Go 1.18, but using pre-module containerd and cri-tools.
   export GO111MODULE=off
 fi