diff --git a/.github/workflows/podvm_builder.yaml b/.github/workflows/podvm_builder.yaml
index 266106dd3..c71d381e1 100644
--- a/.github/workflows/podvm_builder.yaml
+++ b/.github/workflows/podvm_builder.yaml
@@ -63,4 +63,4 @@ jobs:
           "CAA_SRC=https://github.com/confidential-containers/cloud-api-adaptor"
           "CAA_SRC_REF=staging"
           "KATA_SRC=https://github.com/kata-containers/kata-containers"
-          "KATA_SRC_BRANCH=CCv0"
+          "KATA_SRC_BRANCH=CC-0.6.0"
diff --git a/podvm/Dockerfile.podvm_builder b/podvm/Dockerfile.podvm_builder
index f2ec08a75..4580293f3 100644
--- a/podvm/Dockerfile.podvm_builder
+++ b/podvm/Dockerfile.podvm_builder
@@ -49,7 +49,7 @@ ARG CAA_SRC="https://github.com/confidential-containers/cloud-api-adaptor"
 ARG CAA_SRC_REF="staging"
 
 ARG KATA_SRC="https://github.com/kata-containers/kata-containers"
-ARG KATA_SRC_BRANCH="CCv0"
+ARG KATA_SRC_BRANCH="CC-0.6.0"
 
 RUN echo $CAA_SRC
 
diff --git a/podvm/Dockerfile.podvm_builder.centos b/podvm/Dockerfile.podvm_builder.centos
index 7fded0b11..99714dd2b 100644
--- a/podvm/Dockerfile.podvm_builder.centos
+++ b/podvm/Dockerfile.podvm_builder.centos
@@ -52,7 +52,7 @@ ARG CAA_SRC="https://github.com/confidential-containers/cloud-api-adaptor"
 ARG CAA_SRC_REF="staging"
 
 ARG KATA_SRC="https://github.com/kata-containers/kata-containers"
-ARG KATA_SRC_BRANCH="CCv0"
+ARG KATA_SRC_BRANCH="CC-0.6.0"
 
 RUN echo $CAA_SRC
 
diff --git a/podvm/Dockerfile.podvm_builder.rhel b/podvm/Dockerfile.podvm_builder.rhel
index fc8febbc4..bb711ab08 100644
--- a/podvm/Dockerfile.podvm_builder.rhel
+++ b/podvm/Dockerfile.podvm_builder.rhel
@@ -48,7 +48,7 @@ ARG CAA_SRC="https://github.com/confidential-containers/cloud-api-adaptor"
 ARG CAA_SRC_REF="staging"
 
 ARG KATA_SRC="https://github.com/kata-containers/kata-containers"
-ARG KATA_SRC_BRANCH="CCv0"
+ARG KATA_SRC_BRANCH="CC-0.6.0"
 
 RUN echo $CAA_SRC
 
diff --git a/podvm/Makefile.inc b/podvm/Makefile.inc
index 5c6e13c5d..52f5153e3 100644
--- a/podvm/Makefile.inc
+++ b/podvm/Makefile.inc
@@ -10,7 +10,7 @@
 UBUNTU_RELEASE     = focal
 SKOPEO_VERSION     = 1.5.0
 UMOCI_VERSION      = 0.4.7
-AA_VERSION         = aa1d3c510350cd2f2668aca374abba19e2b73b3f
+AA_VERSION         = v0.6.0
 
 IMAGE_PREFIX := podvm