diff --git a/.github/aks_versions.json b/.github/aks_versions.json
index 3ffbbe129d..b5a3eed520 100644
--- a/.github/aks_versions.json
+++ b/.github/aks_versions.json
@@ -1,6 +1,6 @@
 [
-  "1.31.1",
-  "1.30.5",
+  "1.31.2",
+  "1.30.6",
   "1.29.9",
   "1.28.9"
 ]
diff --git a/.github/openshift_versions.json b/.github/openshift_versions.json
index 08587af16a..49cf2ac65d 100644
--- a/.github/openshift_versions.json
+++ b/.github/openshift_versions.json
@@ -1,4 +1,5 @@
 [
+  "4.18",
   "4.17",
   "4.16",
   "4.15",
diff --git a/Makefile b/Makefile
index 2b93fba0ea..6a80924a5a 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ WOKE_VERSION ?= 0.19.0
 OPERATOR_SDK_VERSION ?= v1.38.0
 OPM_VERSION ?= v1.48.0
 PREFLIGHT_VERSION ?= 1.10.2
-OPENSHIFT_VERSIONS ?= v4.12-v4.17
+OPENSHIFT_VERSIONS ?= v4.12-v4.18
 ARCH ?= amd64
 
 export CONTROLLER_IMG