diff --git a/tools/testing/kata-webhook/deploy/webhook.yaml b/tools/testing/kata-webhook/deploy/webhook.yaml
index 07e8a57a2b..efd7d8225a 100644
--- a/tools/testing/kata-webhook/deploy/webhook.yaml
+++ b/tools/testing/kata-webhook/deploy/webhook.yaml
@@ -67,3 +67,10 @@ spec:
     targetPort: 8080
   selector:
     app: pod-annotate-webhook
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: kata-webhook
+data:
+  runtime_class: kata
diff --git a/tools/testing/kata-webhook/webhook-check.sh b/tools/testing/kata-webhook/webhook-check.sh
index f13177a423..081e72f556 100755
--- a/tools/testing/kata-webhook/webhook-check.sh
+++ b/tools/testing/kata-webhook/webhook-check.sh
@@ -16,7 +16,7 @@ source "${webhook_dir}/common.bash"
 
 readonly hello_pod="hello-kata-webhook"
 # The Pod RuntimeClassName for Kata Containers.
-RUNTIME_CLASS="${RUNTIME_CLASS:-"kata"}"
+RUNTIME_CLASS="${RUNTIME_CLASS:-$(kubectl get configmap kata-webhook -o jsonpath='{.data.runtime_class}' 2>/dev/null || echo "kata")}"
 
 cleanup() {
 	{