diff --git a/.github/aks_versions.json b/.github/aks_versions.json
index c8addaf4fb..a467050777 100644
--- a/.github/aks_versions.json
+++ b/.github/aks_versions.json
@@ -1,4 +1,5 @@
 [
+  "1.36.0",
   "1.35.4",
   "1.34.7",
   "1.33.9"
diff --git a/.github/kind_versions.json b/.github/kind_versions.json
index a6331770aa..7ae0beefc9 100644
--- a/.github/kind_versions.json
+++ b/.github/kind_versions.json
@@ -1,7 +1,8 @@
 [
-  "v1.35.1",
-  "v1.34.3",
-  "v1.33.7",
+  "v1.36.1",
+  "v1.35.5",
+  "v1.34.8",
+  "v1.33.12",
   "v1.32.11",
   "v1.31.14",
   "v1.30.13",
diff --git a/.github/openshift_versions.json b/.github/openshift_versions.json
index a284f05f08..592f9e2446 100644
--- a/.github/openshift_versions.json
+++ b/.github/openshift_versions.json
@@ -1,4 +1,5 @@
 [
+  "4.22",
   "4.21",
   "4.20",
   "4.19",
diff --git a/Makefile b/Makefile
index 9d48b37fc7..db6c5ab4c9 100644
--- a/Makefile
+++ b/Makefile
@@ -70,7 +70,7 @@ OPERATOR_SDK_VERSION ?= v1.42.2
 OPM_VERSION ?= v1.69.0
 # renovate: datasource=github-tags depName=redhat-openshift-ecosystem/openshift-preflight
 PREFLIGHT_VERSION ?= 1.19.0
-OPENSHIFT_VERSIONS ?= v4.16-v4.21
+OPENSHIFT_VERSIONS ?= v4.16-v4.22
 ARCH ?= amd64
 FUZZ_TIME ?= 30s