diff --git a/versions.yaml b/versions.yaml
index 2be6456807..6a1d980063 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -221,14 +221,23 @@ externals:
   containerd:
     description: |
       Containerd for Kubernetes Container Runtime Interface.
-    # CCv0 is using our fork of containerd as the changes can't be merged yet
-    # DO NOT TOUCH DURING MERGES FROM MAIN TO CCv0
-    url: "github.com/confidential-containers/containerd"
-    # yamllint disable-line rule:line-length
-    tarball_url: "https://github.com/confidential-containers/containerd/releases/download"
-    version: "v1.6.8.2"
-    # CCv0 needs to know about the specific branch for the integration tests
-    branch: "CC-main"
+    forked:
+      # CCv0 is using our fork of containerd as the changes can't be merged yet
+      # DO NOT TOUCH DURING MERGES FROM MAIN TO CCv0
+      url: "github.com/confidential-containers/containerd"
+      # yamllint disable-line rule:line-length
+      tarball_url: "https://github.com/confidential-containers/containerd/releases/download"
+      version: "v1.6.8.2"
+      # CCv0 needs to know about the specific branch for the integration tests
+      branch: "CC-main"
+    upstream:
+      # DO NOT TOUCH DURING MERGES FROM MAIN TO CCv0
+      url: "github.com/containerd/containerd"
+      # yamllint disable-line rule:line-length
+      tarball_url: "https://github.com/containerd/containerd/releases/download"
+      version: "v1.6.8"
+      # CCv0 needs to know about the specific branch for the integration tests
+      branch: "release/1.6"
 
   critools:
     description: "CLI tool for Container Runtime Interface (CRI)"