diff --git a/.github/workflows/chainsaw-e2e.yaml b/.github/workflows/chainsaw-e2e.yaml
index 1735cc1a..3c7b189c 100644
--- a/.github/workflows/chainsaw-e2e.yaml
+++ b/.github/workflows/chainsaw-e2e.yaml
@@ -19,11 +19,9 @@ jobs:
     strategy:
       fail-fast: false    
       matrix:
-        k8s-version: [v1.29.2, v1.28.7, v1.27.11, v1.26.14, v1.25.16]
-        # For n4k-versions 1.10, and 1.11     
-        # "devel" refers to the RC version. 
-        # If there are no new RC versions available, it installs the latest n4k version.
-        n4k-chart-version: [3.0.18, 3.1.1, devel]
+        k8s-version: [v1.29.2, v1.28.7, v1.27.11, v1.26.14, v1.25.16, v1.24.12, v1.23.1]
+        # For n4k-versions 1.9
+        n4k-chart-version: [1.6.11]
         
     steps:
       - name: Checkout
diff --git a/Makefile b/Makefile
index cc90d06a..2dea7295 100644
--- a/Makefile
+++ b/Makefile
@@ -55,11 +55,7 @@ kind-deploy-kyverno: $(HELM)
 	@echo Install kyverno chart... >&2
 	@$(HELM) repo add nirmata https://nirmata.github.io/kyverno-charts
 	@$(HELM) repo update
-	@if [ "$(N4K_VERSION)" = "devel" ]; then \
-		$(HELM) install kyverno nirmata/kyverno -n kyverno --create-namespace --devel; \
-	else \
-		$(HELM) install kyverno nirmata/kyverno -n kyverno --create-namespace --version=$(N4K_VERSION); \
-	fi
+	@$(HELM) install kyverno nirmata/kyverno -n kyverno --create-namespace --version=$(N4K_VERSION)
 
 ## Check Kyverno status 
 .PHONY: wait-for-kyverno