diff --git a/common-dev-assets b/common-dev-assets
index fa67327af..5f8307445 160000
--- a/common-dev-assets
+++ b/common-dev-assets
@@ -1 +1 @@
-Subproject commit fa67327af1a57a7a9094adb0432e44b1478f25b0
+Subproject commit 5f830744586a45ffc2b2b75550ee23f4f343677f
diff --git a/variables.tf b/variables.tf
index 3d300c264..04ba9eeb6 100644
--- a/variables.tf
+++ b/variables.tf
@@ -365,8 +365,27 @@ variable "addons" {
   default     = {}
 
   validation {
-    condition     = (lookup(var.addons, "openshift-ai", null) != null ? lookup(var.addons["openshift-ai"], "version", null) == null : true) || (tonumber(local.ocp_version_num) >= 4.16)
-    error_message = "OCP AI add-on requires OCP version >= 4.16.0"
+    condition = (
+      lookup(var.addons, "openshift-ai", null) == null
+      || lookup(var.addons["openshift-ai"], "version", null) == null
+      || contains(["416", "417", "418"], lookup(var.addons["openshift-ai"], "version", null))
+    )
+    error_message = "Only versions 416, 417, or 418 are supported for the 'openshift-ai' add-on."
+  }
+
+  validation {
+    condition     = (lookup(var.addons, "openshift-ai", null) == null) || (lookup(var.addons["openshift-ai"], "version", null) != "416") || (tonumber(local.ocp_version_num) >= 4.16 && tonumber(local.ocp_version_num) < 4.18)
+    error_message = "OCP AI add-on 416 requires OCP version >=4.16.0 and <4.18.0"
+  }
+
+  validation {
+    condition     = (lookup(var.addons, "openshift-ai", null) == null) || (lookup(var.addons["openshift-ai"], "version", null) != "417") || (tonumber(local.ocp_version_num) >= 4.17 && tonumber(local.ocp_version_num) < 4.19)
+    error_message = "OCP AI add-on 417 requires OCP version >=4.17.0 and <4.19.0"
+  }
+
+  validation {
+    condition     = (lookup(var.addons, "openshift-ai", null) == null) || (lookup(var.addons["openshift-ai"], "version", null) != "418") || (tonumber(local.ocp_version_num) >= 4.18 && tonumber(local.ocp_version_num) < 4.20)
+    error_message = "OCP AI add-on 418 requires OCP version >=4.18.0 and <4.20.0"
   }
 
   validation {