diff --git a/.gitmodules b/.gitmodules
index 96c4a40d56..7a02b9d603 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "podvm-payload/kata-containers"]
 	path = podvm-payload/kata-containers
-	url = https://github.com/openshift/kata-containers/
-	branch = osc-release
+	url = https://github.com/snir911/kata-containers
+	branch = osc-release_hang_fix
 [submodule "podvm-payload/guest-components"]
 	path = podvm-payload/guest-components
 	url = https://github.com/openshift/confidential-containers-guest-components/
diff --git a/podvm-payload/Dockerfile b/podvm-payload/Dockerfile
index 3200742df3..0c00b102c9 100644
--- a/podvm-payload/Dockerfile
+++ b/podvm-payload/Dockerfile
@@ -9,6 +9,7 @@
 # At this point I'm not sure what would happen if we use builder images that
 # are not using the same versions of RPMs.
 # Let's keep it safe and ensure we keep the same base image/repos for all builders.
+#TEST
 
 ## GOLANG ##
 FROM registry.access.redhat.com/ubi10:10.2-1779861559 as go_builder
diff --git a/podvm-payload/kata-containers b/podvm-payload/kata-containers
index d62cf5689a..89e9ebd6df 160000
--- a/podvm-payload/kata-containers
+++ b/podvm-payload/kata-containers
@@ -1 +1 @@
-Subproject commit d62cf5689aa16f65ddabcbd9754e90aafd2ad02c
+Subproject commit 89e9ebd6df077efdb88c9056fc0bd89eecec4469