diff --git a/deployments/values/supported-matrix.yaml b/deployments/values/supported-matrix.yaml
index c670c09..20cf53e 100644
--- a/deployments/values/supported-matrix.yaml
+++ b/deployments/values/supported-matrix.yaml
@@ -43,22 +43,22 @@ matrix:
     sfs:
       version: ">=4.0.0-0"
     tengine-aio:
-      version: ">=4.0.0-0"
+      version: &tengine_next_version  ">=5.0.0-0"
     tengine-misc:
-      version: ">=4.0.0-0"
+      version: *tengine_next_version
     tengine-im:
-      version: ">=4.0.0-0"
+      version: *tengine_next_version
     tengine-lo:
-      version: ">=4.0.0-0"
+      version: *tengine_next_version
     tengine-pdf:
-      version: ">=4.0.0-0"
+      version: *tengine_next_version
     tengine-tika:
-      version: ">=4.0.0-0"
+      version: *tengine_next_version
 
   23.N:
     id: 23n
     acs:
-      version: "23.1"
+      version: &acs_ga_version "23.1"
       pattern: *ga_hotfixes_pattern
     share:
       version: "23.1"
@@ -73,10 +73,10 @@ matrix:
       version: "4.0"
       pattern: *ga_hotfixes_pattern
     adw:
-      version: "4.3"
+      version: &adw_ga_version "4.3"
       pattern: *ga_hotfixes_pattern
     adminApp:
-      version: "8.3"
+      version: &acc_ga_version "8.3"
       pattern: *ga_hotfixes_pattern
     onedrive:
       version: "2"
@@ -91,25 +91,25 @@ matrix:
     sfs:
       version: "~4.0.0"
     tengine-aio:
-      version: &tengine_ga_version "~4.0.0"
+      version: &tengine_ga_version "~5.0.0"
     tengine-misc:
-      version: "~4.0.0"
+      version: *tengine_ga_version
     tengine-im:
-      version: "~4.0.0"
+      version: *tengine_ga_version
     tengine-lo:
-      version: "~4.0.0"
+      version: *tengine_ga_version
     tengine-pdf:
-      version: "~4.0.0"
+      version: *tengine_ga_version
     tengine-tika:
-      version: "~4.0.0"
+      version: *tengine_ga_version
 
   7.4.N:
     id: 74n
     acs:
-      version: &acs_ga_version "7.4"
+      version: "7.4"
       pattern: *ga_hotfixes_pattern
     share:
-      version: *acs_ga_version
+      version: "7.4"
       pattern: *ga_hotfixes_pattern
     search:
       version: "2.0.8"
@@ -121,10 +121,10 @@ matrix:
       version: "3.11"
       pattern: *ga_hotfixes_pattern
     adw:
-      version: &adw_ga_version "4.2"
+      version: "4.2"
       pattern: *ga_hotfixes_pattern
     adminApp:
-      version: &acc_ga_version "8.2"
+      version: "8.2"
       pattern: *ga_hotfixes_pattern
     onedrive:
       version: "2"