diff --git a/deployments/uber-manifest.tpl b/deployments/uber-manifest.tpl
index 1bc9ed3..862aae7 100644
--- a/deployments/uber-manifest.tpl
+++ b/deployments/uber-manifest.tpl
@@ -736,8 +736,8 @@ targets:
       key: >-
         {{ index . "tengine-tika" "helm_key" }}
   {{- end }}
-  {{- if index . "sync" }}
-  {{- if and .sync.compose_target .search.compose_key }}
+  {{- with .sync }}
+  {{- if and .compose_key .compose_target }}
   syncCompose_{{ $id }}:
     name: Sync image tag
     kind: yaml
@@ -745,25 +745,24 @@ targets:
     transformers:
       - addprefix: "quay.io/alfresco/service-sync:"
     spec:
-      file: {{ .sync.compose_target }}
-      key: >-
-        {{ .sync.compose_key }}
+      file: {{ .compose_target }}
+      key: {{ .compose_key }}
   {{- end }}
   syncValues_{{ $id }}:
     name: Sync image tag
     kind: yaml
     sourceid: syncTag_{{ $id }}
     spec:
-      file: {{ .sync.helm_target }}
+      file: {{ .helm_target }}
       key: >-
-        {{ .sync.helm_key }}
-  {{- if index . "sync" "helm_update_appVersion" }}
+        {{ .helm_key }}
+  {{- if .helm_update_appVersion }}
   syncAppVersion_{{ $id }}:
     name: Sync appVersion in Chart.yaml
     kind: yaml
     sourceid: syncTag_{{ $id }}
     spec:
-      file: {{ osDir .sync.helm_target }}/Chart.yaml
+      file: {{ osDir .helm_target }}/Chart.yaml
       key: "$.appVersion"
   {{- end }}
   {{- end }}
diff --git a/deployments/values/supported-matrix.yaml b/deployments/values/supported-matrix.yaml
index 65a8e1c..33073e9 100644
--- a/deployments/values/supported-matrix.yaml
+++ b/deployments/values/supported-matrix.yaml
@@ -95,11 +95,11 @@ matrix:
       version: "2"
       pattern: *ga_hotfixes_pattern
     intelligence:
-      version: "~3.1.0"
+      version: &ais_ga_version "~3.1.0"
     trouter:
-      version: "~4.1.0"
+      version: &trouter_ga_version "~4.1.0"
     sfs:
-      version: "~4.1.0"
+      version: *trouter_ga_version
     tengine-aio:
       version: &tengine_ga_version "~5.1.0"
     tengine-misc:
@@ -149,23 +149,23 @@ matrix:
       version: "2"
       pattern: *ga_hotfixes_pattern
     intelligence:
-      version: "~2.0.0"
+      version: *ais_ga_version
     trouter:
-      version: "~3.0.0"
+      version: *trouter_ga_version
     sfs:
-      version: "~3.0.0"
+      version: *trouter_ga_version
     tengine-aio:
-      version: "~4.0.0"
+      version: *tengine_ga_version
     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.3.N:
     id: 73n