diff --git a/deployments/uber-manifest.tpl b/deployments/uber-manifest.tpl
index 862aae7..36f1041 100644
--- a/deployments/uber-manifest.tpl
+++ b/deployments/uber-manifest.tpl
@@ -286,6 +286,30 @@ sources:
         pattern: >-
           {{ index . "tengine-tika" "version" }}
   {{- end }}
+  {{- if index . "activiti"}}
+  activitiTag_{{ $id }}:
+    name: Alfresco Activiti image tag
+    kind: dockerimage
+    spec:
+      image: quay.io/alfresco/alfresco-process-services
+      {{ template "quay_auth" }}
+      versionFilter:
+        kind: regex
+        pattern: >-
+          ^{{ index . "activiti" "version" }}{{ index . "activiti" "pattern" }}$
+  {{- end }}
+  {{- if index . "activiti-admin"}}
+  activitiAdminTag_{{ $id }}:
+    name: Alfresco Activiti Admin image tag
+    kind: dockerimage
+    spec:
+      image: quay.io/alfresco/alfresco-process-services-admin
+      {{ template "quay_auth" }}
+      versionFilter:
+        kind: regex
+        pattern: >-
+          ^{{ index . "activiti-admin" "version" }}{{ index . "activiti-admin" "pattern" }}$
+  {{- end }}
   {{- end }}
 
 
@@ -766,4 +790,43 @@ targets:
       key: "$.appVersion"
   {{- end }}
   {{- end }}
+  {{- if index . "activiti" }}
+  activitiValues_{{ $id }}:
+    name: Activiti image tag
+    kind: yaml
+    sourceid: activitiTag_{{ $id }}
+    spec:
+      file: {{ .activiti.helm_target }}
+      key: >-
+        {{ .activiti.helm_key }}
+  {{- if index . "activiti" "helm_update_appVersion" }}
+  activitiAppVersion_{{ $id }}:
+    name: Activiti appVersion in Chart.yaml
+    kind: yaml
+    sourceid: activitiTag_{{ $id }}
+    spec:
+      file: {{ osDir .activiti.helm_target }}/Chart.yaml
+      key: "$.appVersion"
+  {{- end }}
+  {{- end }}
+  {{- if index . "activiti-admin" }}
+  activitiAdminValues_{{ $id }}:
+    name: Activiti Admin image tag
+    kind: yaml
+    sourceid: activitiAdminTag_{{ $id }}
+    spec:
+      file: {{ index . "activiti-admin" "helm_target" }}
+      key: >-
+        {{ index . "activiti-admin" "helm_key" }}
+  {{- if index . "activiti-admin" "helm_update_appVersion" }}
+  {{- $target_activitiAdmin := index . "activiti-admin" "helm_target" }}
+  activitiAdminAppVersion_{{ $id }}:
+    name: Activiti Admin appVersion in Chart.yaml
+    kind: yaml
+    sourceid: activitiAdminTag_{{ $id }}
+    spec:
+      file: {{ osDir $target_activitiAdmin }}/Chart.yaml
+      key: "$.appVersion"
+  {{- end }}
+  {{- end }}
   {{- end }}
diff --git a/deployments/values/supported-matrix.yaml b/deployments/values/supported-matrix.yaml
index 1ddd9dd..3ce338c 100644
--- a/deployments/values/supported-matrix.yaml
+++ b/deployments/values/supported-matrix.yaml
@@ -112,6 +112,12 @@ matrix:
       version: *tengine_ga_version
     tengine-tika:
       version: *tengine_ga_version
+    activiti:
+      version: &activiti_ga_version "24.2"
+      pattern: *ga_hotfixes_pattern
+    activiti-admin:
+      version: *activiti_ga_version
+      pattern: *ga_hotfixes_pattern
 
   7.4.N:
     id: 74n
@@ -166,6 +172,12 @@ matrix:
       version: *tengine_ga_version
     tengine-tika:
       version: *tengine_ga_version
+    activiti:
+      version: "2.4"
+      pattern: *ga_hotfixes_pattern
+    activiti-admin:
+      version: "2.4"
+      pattern: *ga_hotfixes_pattern
 
   7.3.N:
     id: 73n
@@ -220,6 +232,12 @@ matrix:
       version: "~3.1.1"
     tengine-tika:
       version: "~3.1.1"
+    activiti:
+      version: "2.4"
+      pattern: *ga_hotfixes_pattern
+    activiti-admin:
+      version: "2.4"
+      pattern: *ga_hotfixes_pattern
 
   7.2.N:
     id: 72n
@@ -274,6 +292,12 @@ matrix:
       version: "~3.1.1"
     tengine-tika:
       version: "~3.1.1"
+    activiti:
+      version: "2.4"
+      pattern: *ga_hotfixes_pattern
+    activiti-admin:
+      version: "2.4"
+      pattern: *ga_hotfixes_pattern
 
   7.1.N:
     id: 71n