diff --git a/helm/alfresco-content-services/updatecli-matrix-targets.yaml b/helm/alfresco-content-services/updatecli-matrix-targets.yaml
index c2378ea05..e5860ef85 100644
--- a/helm/alfresco-content-services/updatecli-matrix-targets.yaml
+++ b/helm/alfresco-content-services/updatecli-matrix-targets.yaml
@@ -6,35 +6,21 @@ matrix:
   next:
     id: next
     acs:
-      version:
-      pattern:
-      image:
       helm_target: &helmvaluesNext >-
         helm/alfresco-content-services/pre-release_values.yaml
       helm_key: $.alfresco-repository.image.tag
     activemq:
-      version:
-      pattern:
-      image:
       helm_target: *helmvaluesNext
       helm_key: $.activemq.image.tag
     share:
-      version:
-      pattern:
-      image:
       helm_target: *helmvaluesNext
       helm_key: $.share.image.tag
     search:
-      version:
       helm_target: *helmvaluesNext
       helm_keys: &search_helm_keys
         search: $.alfresco-search.searchServicesImage.tag
         insight: $.alfresco-search.insightEngineImage.tag
-      image:
-      pattern:
     search-enterprise:
-      version:
-      pattern:
       helm_target: *helmvaluesNext
       helm_keys:
         Reindexing: $.alfresco-search-enterprise.reindexing.image.tag
@@ -48,99 +34,66 @@ matrix:
           Path: >-
             $.alfresco-search-enterprise.liveIndexing.path.image.tag
     sync:
-      version:
       helm_target: *helmvaluesNext
       helm_key: $.alfresco-sync-service.image.tag
-      pattern:
     adw:
-      version:
       helm_target: *helmvaluesNext
       helm_key: $.alfresco-digital-workspace.image.tag
-      pattern:
     adminApp:
-      version:
       helm_target: *helmvaluesNext
       helm_key: $.alfresco-control-center.image.tag
-      pattern:
     onedrive:
-      version:
       helm_target: *helmvaluesNext
       helm_key: $.alfresco-connector-ms365.image.tag
-      pattern:
     msteams:
-      version:
       helm_target: *helmvaluesNext
       helm_key: $.alfresco-connector-msteams.image.tag
-      pattern:
     intelligence:
-      version:
       helm_target: *helmvaluesNext
       helm_key: $.alfresco-ai-transformer.image.tag
     trouter:
-      version:
       helm_target: *helmvaluesNext
       helm_key: $.alfresco-transform-service.transformrouter.image.tag
     sfs:
-      version:
       helm_target: *helmvaluesNext
       helm_key: $.alfresco-transform-service.filestore.image.tag
     tengine-misc:
-      version:
       helm_target: *helmvaluesNext
       helm_key: $.alfresco-transform-service.transformmisc.image.tag
     tengine-im:
-      version:
       helm_target: *helmvaluesNext
       helm_key: $.alfresco-transform-service.imagemagick.image.tag
     tengine-lo:
-      version:
       helm_target: *helmvaluesNext
       helm_key: $.alfresco-transform-service.libreoffice.image.tag
     tengine-pdf:
-      version:
       helm_target: *helmvaluesNext
       helm_key: $.alfresco-transform-service.pdfrenderer.image.tag
     tengine-tika:
-      version:
       helm_target: *helmvaluesNext
       helm_key: $.alfresco-transform-service.tika.image.tag
     audit-storage:
-      version:
       helm_target: *helmvaluesNext
       helm_key: $.alfresco-audit-storage.image.tag
 
   current:
     id: current
     acs:
-      version:
-      pattern:
-      image:
       helm_target: &helmvaluesCurrent >-
         helm/alfresco-content-services/values.yaml
       helm_key: $.alfresco-repository.image.tag
       # keep the unused anchor to detect multiple usages when copying blocks for new versions
       helm_update_appVersion: &helm_update_appVersion true
     activemq:
-      version:
-      pattern:
-      image:
       helm_target: *helmvaluesCurrent
       helm_key: $.activemq.image.tag
     share:
-      version:
-      pattern:
-      image:
       helm_target: *helmvaluesCurrent
       helm_key: $.share.image.tag
     search:
-      version:
       helm_target: *helmvaluesCurrent
       helm_keys: *search_helm_keys
-      image:
-      pattern:
     search-enterprise:
-      version:
-      pattern:
       helm_target: *helmvaluesCurrent
       helm_keys:
         Reindexing: $.alfresco-search-enterprise.reindexing.image.tag
@@ -154,97 +107,64 @@ matrix:
           Path: >-
             $.alfresco-search-enterprise.liveIndexing.path.image.tag
     sync:
-      version:
       helm_target: *helmvaluesCurrent
       helm_key: $.alfresco-sync-service.image.tag
-      pattern:
     adw:
-      version:
       helm_target: *helmvaluesCurrent
       helm_key: $.alfresco-digital-workspace.image.tag
-      pattern:
     adminApp:
-      version:
       helm_target: *helmvaluesCurrent
       helm_key: $.alfresco-control-center.image.tag
-      pattern:
     onedrive:
-      version:
       helm_target: *helmvaluesCurrent
       helm_key: $.alfresco-connector-ms365.image.tag
-      pattern:
     msteams:
-      version:
       helm_target: *helmvaluesCurrent
       helm_key: $.alfresco-connector-msteams.image.tag
-      pattern:
     intelligence:
-      version:
       helm_target: *helmvaluesCurrent
       helm_key: $.alfresco-ai-transformer.image.tag
     trouter:
-      version:
       helm_target: *helmvaluesCurrent
       helm_key: $.alfresco-transform-service.transformrouter.image.tag
     sfs:
-      version:
       helm_target: *helmvaluesCurrent
       helm_key: $.alfresco-transform-service.filestore.image.tag
     tengine-misc:
-      version:
       helm_target: *helmvaluesCurrent
       helm_key: $.alfresco-transform-service.transformmisc.image.tag
     tengine-im:
-      version:
       helm_target: *helmvaluesCurrent
       helm_key: $.alfresco-transform-service.imagemagick.image.tag
     tengine-lo:
-      version:
       helm_target: *helmvaluesCurrent
       helm_key: $.alfresco-transform-service.libreoffice.image.tag
     tengine-pdf:
-      version:
       helm_target: *helmvaluesCurrent
       helm_key: $.alfresco-transform-service.pdfrenderer.image.tag
     tengine-tika:
-      version:
       helm_target: *helmvaluesCurrent
       helm_key: $.alfresco-transform-service.tika.image.tag
     audit-storage:
-      version:
       helm_target: *helmvaluesCurrent
       helm_key: $.alfresco-audit-storage.image.tag
 
   7.4.N:
     id: 74n
     acs:
-      version:
       helm_target: &helmvalues74 >-
         helm/alfresco-content-services/7.4.N_values.yaml
       helm_key: $.alfresco-repository.image.tag
-      pattern:
-      image:
     activemq:
-      version:
       helm_target: *helmvalues74
       helm_key: $.activemq.image.tag
-      pattern:
-      image:
     share:
-      version:
       helm_target: *helmvalues74
       helm_key: $.share.image.tag
-      pattern:
-      image:
     search:
-      version:
       helm_target: *helmvalues74
       helm_keys: *search_helm_keys
-      image:
-      pattern:
     search-enterprise:
-      version:
-      pattern:
       helm_target: *helmvalues74
       helm_keys:
         Reindexing: $.alfresco-search-enterprise.reindexing.image.tag
@@ -258,91 +178,60 @@ matrix:
           Path: >-
             $.alfresco-search-enterprise.liveIndexing.path.image.tag
     sync:
-      version:
       helm_target: *helmvalues74
       helm_key: $.alfresco-sync-service.image.tag
-      pattern:
     adw:
-      version:
       helm_target: *helmvalues74
       helm_key: $.alfresco-digital-workspace.image.tag
-      pattern:
     adminApp:
-      version:
       helm_target: *helmvalues74
       helm_key: $.alfresco-control-center.image.tag
-      pattern:
     onedrive:
-      version:
       helm_target: *helmvalues74
       helm_key: $.alfresco-connector-ms365.image.tag
-      pattern:
     msteams:
-      version:
       helm_target: *helmvalues74
       helm_key: $.alfresco-connector-msteams.image.tag
-      pattern:
     intelligence:
-      version:
       helm_target: *helmvalues74
       helm_key: $.alfresco-ai-transformer.image.tag
     trouter:
-      version:
       helm_target: *helmvalues74
       helm_key: $.alfresco-transform-service.transformrouter.image.tag
     sfs:
-      version:
       helm_target: *helmvalues74
       helm_key: $.alfresco-transform-service.filestore.image.tag
     tengine-misc:
-      version:
       helm_target: *helmvalues74
       helm_key: $.alfresco-transform-service.transformmisc.image.tag
     tengine-im:
-      version:
       helm_target: *helmvalues74
       helm_key: $.alfresco-transform-service.imagemagick.image.tag
     tengine-lo:
-      version:
       helm_target: *helmvalues74
       helm_key: $.alfresco-transform-service.libreoffice.image.tag
     tengine-pdf:
-      version:
       helm_target: *helmvalues74
       helm_key: $.alfresco-transform-service.pdfrenderer.image.tag
     tengine-tika:
-      version:
       helm_target: *helmvalues74
       helm_key: $.alfresco-transform-service.tika.image.tag
   7.3.N:
     id: 73n
     acs:
-      version:
       helm_target: &helmvalues73 >-
         helm/alfresco-content-services/7.3.N_values.yaml
       helm_key: $.alfresco-repository.image.tag
-      pattern:
-      image:
     activemq:
-      version:
       helm_target: *helmvalues73
       helm_key: $.activemq.image.tag
-      pattern:
-      image:
     share:
-      version:
       helm_target: *helmvalues73
       helm_key: $.share.image.tag
-      pattern:
-      image:
     search:
-      version:
       helm_target: *helmvalues73
       helm_keys: *search_helm_keys
-      pattern:
-      image:
     search-enterprise:
-      version:
       helm_target: *helmvalues73
       helm_keys:
         Reindexing: $.alfresco-search-enterprise.reindexing.image.tag
@@ -355,91 +244,60 @@ matrix:
             $.alfresco-search-enterprise.liveIndexing.metadata.image.tag
           Path: >-
             $.alfresco-search-enterprise.liveIndexing.path.image.tag
-      pattern:
     sync:
-      version:
       helm_target: *helmvalues73
       helm_key: $.alfresco-sync-service.image.tag
-      pattern:
     adw:
-      version:
       helm_target: *helmvalues73
       helm_key: $.alfresco-digital-workspace.image.tag
-      pattern:
     adminApp:
-      version:
       helm_target: *helmvalues73
       helm_key: $.alfresco-control-center.image.tag
-      pattern:
     onedrive:
-      version:
       helm_target: *helmvalues73
       helm_key: $.alfresco-connector-ms365.image.tag
-      pattern:
     msteams:
-      version:
       helm_target: *helmvalues73
       helm_key: $.alfresco-connector-msteams.image.tag
-      pattern:
     intelligence:
-      version:
       helm_target: *helmvalues73
       helm_key: $.alfresco-ai-transformer.image.tag
     trouter:
-      version:
       helm_target: *helmvalues73
       helm_key: $.alfresco-transform-service.transformrouter.image.tag
     sfs:
-      version:
       helm_target: *helmvalues73
       helm_key: $.alfresco-transform-service.filestore.image.tag
     tengine-misc:
-      version:
       helm_target: *helmvalues73
       helm_key: $.alfresco-transform-service.transformmisc.image.tag
     tengine-im:
-      version:
       helm_target: *helmvalues73
       helm_key: $.alfresco-transform-service.imagemagick.image.tag
     tengine-lo:
-      version:
       helm_target: *helmvalues73
       helm_key: $.alfresco-transform-service.libreoffice.image.tag
     tengine-pdf:
-      version:
       helm_target: *helmvalues73
       helm_key: $.alfresco-transform-service.pdfrenderer.image.tag
     tengine-tika:
-      version:
       helm_target: *helmvalues73
       helm_key: $.alfresco-transform-service.tika.image.tag
   7.2.N:
     id: 72n
     acs:
-      version:
       helm_target: &helmvalues72 >-
         helm/alfresco-content-services/7.2.N_values.yaml
       helm_key: $.alfresco-repository.image.tag
-      pattern:
-      image:
     activemq:
-      version:
       helm_target: *helmvalues72
       helm_key: $.activemq.image.tag
-      pattern:
-      image:
     share:
-      version:
       helm_target: *helmvalues72
       helm_key: $.share.image.tag
-      pattern:
-      image:
     search:
-      version:
       helm_target: *helmvalues72
       helm_keys: *search_helm_keys
-      pattern:
-      image:
     search-enterprise:
       version:
       helm_target: *helmvalues72
@@ -454,94 +312,57 @@ matrix:
             $.alfresco-search-enterprise.liveIndexing.metadata.image.tag
           Path: >-
             $.alfresco-search-enterprise.liveIndexing.path.image.tag
-      pattern:
     sync:
-      version:
       helm_target: *helmvalues72
       helm_key: $.alfresco-sync-service.image.tag
-      pattern:
     adw:
-      version:
       helm_target: *helmvalues72
       helm_key: $.alfresco-digital-workspace.image.tag
-      pattern:
     adminApp:
-      version:
       helm_target: *helmvalues72
       helm_key: $.alfresco-control-center.image.tag
-      pattern:
     onedrive:
-      version:
       helm_target: *helmvalues72
       helm_key: $.alfresco-connector-ms365.image.tag
-      pattern:
     msteams:
-      version:
       helm_target: *helmvalues72
       helm_key: $.alfresco-connector-msteams.image.tag
-      pattern:
     intelligence:
-      version:
       helm_target: *helmvalues72
       helm_key: $.alfresco-ai-transformer.image.tag
     trouter:
-      version:
       helm_target: *helmvalues72
       helm_key: $.alfresco-transform-service.transformrouter.image.tag
     sfs:
-      version:
       helm_target: *helmvalues72
       helm_key: $.alfresco-transform-service.filestore.image.tag
     tengine-misc:
-      version:
       helm_target: *helmvalues72
       helm_key: $.alfresco-transform-service.transformmisc.image.tag
     tengine-im:
-      version:
       helm_target: *helmvalues72
       helm_key: $.alfresco-transform-service.imagemagick.image.tag
     tengine-lo:
-      version:
       helm_target: *helmvalues72
       helm_key: $.alfresco-transform-service.libreoffice.image.tag
     tengine-pdf:
-      version:
       helm_target: *helmvalues72
       helm_key: $.alfresco-transform-service.pdfrenderer.image.tag
     tengine-tika:
-      version:
       helm_target: *helmvalues72
       helm_key: $.alfresco-transform-service.tika.image.tag
   community: &community
     id: com
     acs:
-      version:
       helm_target: &helmvaluesOss >-
         helm/alfresco-content-services/community_values.yaml
       helm_key: $.alfresco-repository.image.tag
-      pattern:
-      image:
     activemq:
-      version:
       helm_target: *helmvaluesOss
       helm_key: $.activemq.image.tag
-      pattern:
-      image:
     share:
-      version:
       helm_target: *helmvaluesOss
       helm_key: $.share.image.tag
-      pattern:
-      image:
     search:
-      version:
       helm_target: *helmvaluesOss
       helm_key: $.alfresco-search.searchServicesImage.tag
-      pattern:
-      image:
-    adminApp:
-      version:
-      pattern:
-    aca:
-      version:
-      pattern: