diff --git a/tests/integration/kubernetes/kata-deploy-ensure-runtimec-classes-created.bats b/tests/integration/kubernetes/kata-deploy-ensure-runtimec-classes-created.bats
index bd1d5a1517..b2ec3c330b 100644
--- a/tests/integration/kubernetes/kata-deploy-ensure-runtimec-classes-created.bats
+++ b/tests/integration/kubernetes/kata-deploy-ensure-runtimec-classes-created.bats
@@ -14,13 +14,23 @@ setup() {
 	# * `kata-${KATA_HYPERVISOR}` is the other one
 	#    * As part of the tests we're only deploying the specific runtimeclass that will be used, instead of all of them.
 	expected_runtime_classes=2
+
+	# We expect both runtime classes to have the same handler: kata-${KATA_HYPERVISOR}
+	expected_handlers_re=( \
+		"kata\s+kata-${KATA_HYPERVISOR}" \
+		"kata-${KATA_HYPERVISOR}\s+kata-${KATA_HYPERVISOR}" \
+	)
 }
 
 @test "Test runtimeclasses are being properly created" {
 	# We filter `kata-mshv-vm-isolation` out as that's present on AKS clusters, but that's not coming from kata-deploy
 	current_runtime_classes=$(kubectl get runtimeclasses | grep -v "kata-mshv-vm-isolation" | grep "kata" | wc -l)
 	[[ ${current_runtime_classes} -eq ${expected_runtime_classes} ]]
-	[[ $(kubectl get runtimeclasses | grep -q "${KATA_HYPERVISOR}") -eq 0 ]]
+
+	for handler_re in ${expected_handlers_re[@]}
+	do
+		[[ $(kubectl get runtimeclass | grep -E "${handler_re}") ]]
+	done
 }
 
 teardown() {
diff --git a/tools/packaging/kata-deploy/scripts/kata-deploy.sh b/tools/packaging/kata-deploy/scripts/kata-deploy.sh
index 3388341612..496c58e638 100755
--- a/tools/packaging/kata-deploy/scripts/kata-deploy.sh
+++ b/tools/packaging/kata-deploy/scripts/kata-deploy.sh
@@ -44,7 +44,7 @@ function create_runtimeclasses() {
 	if [[ "${CREATE_DEFAULT_RUNTIMECLASS}" == "true" ]]; then
 		echo "Creating the kata runtime class for the default shim (an alias for kata-${default_shim})"
 		cp /opt/kata-artifacts/runtimeclasses/kata-${default_shim}.yaml /tmp/kata.yaml
-		sed -i -e 's/kata-'${default_shim}'/kata/g' /tmp/kata.yaml
+		sed -i -e 's/name: kata-'${default_shim}'/name: kata/g' /tmp/kata.yaml
 		kubectl apply -f /tmp/kata.yaml
 		rm -f /tmp/kata.yaml
 	fi
@@ -62,7 +62,7 @@ function delete_runtimeclasses() {
 	if [[ "${CREATE_DEFAULT_RUNTIMECLASS}" == "true" ]]; then
 		echo "Deleting the kata runtime class for the default shim (an alias for kata-${default_shim})"
 		cp /opt/kata-artifacts/runtimeclasses/kata-${default_shim}.yaml /tmp/kata.yaml
-		sed -i -e 's/kata-'${default_shim}'/kata/g' /tmp/kata.yaml
+		sed -i -e 's/name: kata-'${default_shim}'/name: kata/g' /tmp/kata.yaml
 		kubectl delete -f /tmp/kata.yaml
 		rm -f /tmp/kata.yaml
 	fi