diff --git a/deployments/uber-manifest.tpl b/deployments/uber-manifest.tpl
index f8ff983..77db93c 100644
--- a/deployments/uber-manifest.tpl
+++ b/deployments/uber-manifest.tpl
@@ -92,6 +92,21 @@ sources:
         pattern: >-
           ^{{ index . "acs" "version" }}{{ index . "acs" "pattern" }}$
   {{- end }}
+  {{- if index . "insight-zeppelin" }}
+  {{ $image := "quay.io/alfresco/insight-zeppelin" }}
+  insightZeppelinTag_{{ $id }}:
+    name: Alfresco Insight Zeppelin
+    kind: dockerimage
+    spec:
+      image: {{ $image }}
+      {{ if eq (printf "%.8s" $image) "quay.io/" }}
+      {{ template "quay_auth" }}
+      {{ end }}
+      versionFilter:
+        kind: regex
+        pattern: >-
+          ^{{ index . "insight-zeppelin" "version" }}{{ index . "insight-zeppelin" "pattern" }}$
+  {{- end }}
   {{- if index . "search-enterprise" }}
   searchEnterpriseTag_{{ $id }}:
     name: Search Enterprise tag
@@ -368,6 +383,18 @@ targets:
       key: "$.appVersion"
   {{- end }}
   {{- end }}
+  {{- if index . "insight-zeppelin" }}
+  {{- if index . "insight-zeppelin" "helm_target" }}
+  insightZeppelinValues_{{ $id }}:
+    name: Alfresco Insight Zeppelin image tag
+    kind: yaml
+    sourceid: insightZeppelinTag_{{ $id }}
+    spec:
+      file: {{ index . "insight-zeppelin" "helm_target" }}
+      key: >-
+        {{ index . "insight-zeppelin" "helm_key" }}
+  {{- end }}
+  {{- end }}
   {{- if index . "search" }}
   {{- if and .search.compose_key .search.compose_target }}
   searchCompose_{{ $id }}:
diff --git a/deployments/values/supported-matrix.yaml b/deployments/values/supported-matrix.yaml
index 240eef3..65a8e1c 100644
--- a/deployments/values/supported-matrix.yaml
+++ b/deployments/values/supported-matrix.yaml
@@ -70,9 +70,12 @@ matrix:
     share:
       version: *acs_ga_version
       pattern: *ga_hotfixes_pattern
-    search:
+    insight-zeppelin:
       version: &search_ga_version "2.0.10"
       pattern: *ga_hotfixes_pattern
+    search:
+      version: *search_ga_version
+      pattern: *ga_hotfixes_pattern
     search-enterprise:
       version: "4.0"
       pattern: *ga_hotfixes_pattern
@@ -121,6 +124,9 @@ matrix:
     share:
       version: "7.4"
       pattern: *ga_hotfixes_pattern
+    insight-zeppelin:
+      version: *search_ga_version
+      pattern: *ga_hotfixes_pattern
     search:
       version: *search_ga_version
       pattern: *ga_hotfixes_pattern
@@ -172,6 +178,9 @@ matrix:
     share:
       version: "7.3.1"
       pattern: *ga_hotfixes_pattern
+    insight-zeppelin:
+      version: "2.0.5"
+      pattern: *ga_hotfixes_pattern
     search:
       version: "2.0.5"
       pattern: *ga_hotfixes_pattern
@@ -223,6 +232,9 @@ matrix:
     share:
       version: "7.2"
       pattern: *ga_hotfixes_pattern
+    insight-zeppelin:
+      version: "2.0.3"
+      pattern: *ga_hotfixes_pattern
     search:
       version: "2.0.3"
       pattern: *ga_hotfixes_pattern
@@ -274,6 +286,9 @@ matrix:
     share:
       version: "7.1.1"
       pattern: *ga_hotfixes_pattern
+    insight-zeppelin:
+      version: "2.0.2"
+      pattern: *ga_hotfixes_pattern
     search:
       version: "2.0.2"
       pattern: *ga_hotfixes_pattern