diff --git a/versions.yaml b/versions.yaml
index 4958fc18c2..1a53c20b4a 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -71,7 +71,8 @@ assets:
     description: "Component used to create virtual machines"
 
     cloud_hypervisor:
-      description: "Cloud Hypervisor is an open source Virtual Machine Monitor"
+      # yamllint disable-line rule:line-length
+      description: "Cloud Hypervisor is an open source Virtual Machine Monitor -- DO NOT TOUCH on main -> CCv0 merges"
       url: "https://github.com/cloud-hypervisor/cloud-hypervisor"
       uscan-url: >-
         https://github.com/cloud-hypervisor/cloud-hypervisor/tags.*/v?(\d\S+)\.tar\.gz
@@ -98,16 +99,18 @@ assets:
       uscan-url: >-
         https://github.com/qemu/qemu/tags
         .*/v?(\d\S+)\.tar\.gz
-      tdx:
-        description: "VMM that uses KVM and supports TDX"
-        url: "https://github.com/kata-containers/qemu"
-        tag: "TDX-v3.1"
 
     qemu-experimental:
       description: "QEMU with virtiofs support"
       url: "https://github.com/qemu/qemu"
       version: "7a800cf9496fddddf71b21a00991e0ec757a170a"
 
+    qemu-tdx-experimental:
+      # yamllint disable-line rule:line-length
+      description: "QEMU with TDX support - DO NOT TOUCH on main -> CCv0 merges"
+      url: "https://github.com/kata-containers/qemu"
+      tag: "TDX-v3.1"
+
     qemu-snp-experimental:
       description: "QEMU with experimental SNP support (no UPM)"
       url: "https://github.com/AMDESE/qemu"
@@ -160,10 +163,6 @@ assets:
     description: "Linux kernel optimised for virtual machines"
     url: "https://cdn.kernel.org/pub/linux/kernel/v5.x/"
     version: "v5.19.2"
-    tdx:
-      description: "Linux kernel that supports TDX"
-      url: "https://github.com/kata-containers/linux/archive/refs/tags"
-      tag: "5.15-plus-TDX"
     sev:
       description: "Linux kernel that supports SEV and SNP"
       url: "https://cdn.kernel.org/pub/linux/kernel/v5.x/"
@@ -188,6 +187,12 @@ assets:
     url: "https://cdn.kernel.org/pub/linux/kernel/v5.x/"
     version: "v5.10.25"
 
+  kernel-tdx-experimental:
+    # yamllint disable-line rule:line-length
+    description: "Linux kernel with TDX support -- DO NOT TOUCH on main -> CCv0 merges"
+    url: "https://github.com/kata-containers/linux/archive/refs/tags"
+    version: "5.15-plus-TDX"
+
 externals:
   description: "Third-party projects used by the system"
 
@@ -303,13 +308,15 @@ externals:
       package_output_dir: "AmdSev"
     tdx:
       url: "https://github.com/tianocore/edk2-staging"
-      description: "TDVF build needed for TDX measured direct boot."
+      # yamllint disable-line rule:line-length
+      description: "TDVF build needed for TDX measured direct boot. -- DO NOT TOUCH on main -> CCv0 merges"
       version: "2022-tdvf-ww28.5"
       package: "OvmfPkg/OvmfPkgX64.dsc"
       package_output_dir: "OvmfX64"
 
   td-shim:
-    description: "Confidential Containers Shim Firmware"
+    # yamllint disable-line rule:line-length
+    description: "Confidential Containers Shim Firmware -- DO NOT TOUCH on main -> CCv0 merges"
     url: "https://github.com/confidential-containers/td-shim"
     version: "v0.7.0"
     toolchain: "nightly-2022-11-15"