diff --git a/deployments/uber-manifest.tpl b/deployments/uber-manifest.tpl
index 4c5aa1f..a1cdeef 100644
--- a/deployments/uber-manifest.tpl
+++ b/deployments/uber-manifest.tpl
@@ -90,9 +90,13 @@ sources:
       {{ template "quay_auth" }}
       {{ end }}
       versionFilter:
-        kind: regex
+        kind: {{ (eq $id "next") | ternary "semver" "regex" }}
         pattern: >-
+          {{- if eq $id "next" }}
+          {{ index . "acs" "version" }}
+          {{- else }}
           ^{{ index . "acs" "version" }}{{ index . "acs" "pattern" }}$
+          {{- end }}
   {{- end }}
   {{ with index . "insight-zeppelin" }}
   {{ $image := "quay.io/alfresco/insight-zeppelin" }}
@@ -146,9 +150,13 @@ sources:
       {{ template "quay_auth" }}
       {{ end }}
       versionFilter:
-        kind: regex
+        kind: {{ (eq $id "next") | ternary "semver" "regex" }}
         pattern: >-
+          {{- if eq $id "next" }}
+          {{ index . "share" "version" }}
+          {{- else }}
           ^{{ index . "share" "version" }}{{ index . "share" "pattern" }}$
+          {{- end }}
   {{- end }}
   {{- if index . "sync" }}
   syncTag_{{ $id }}:
diff --git a/deployments/values/supported-matrix.yaml b/deployments/values/supported-matrix.yaml
index b945ea1..b27c588 100644
--- a/deployments/values/supported-matrix.yaml
+++ b/deployments/values/supported-matrix.yaml
@@ -11,14 +11,12 @@ matrix:
   next:
     id: next
     acs:
-      version: &acs_next_version "23"
-      pattern: *development_pattern
+      version: &acs_next_version ">=25.0.0-0"
     activemq:
       version: "5.18"
       pattern: *ga_activemq_pattern
     share:
       version: *acs_next_version
-      pattern: *development_pattern
     search:
       version: "2"
       pattern: *development_pattern