diff --git a/updatecli-matrix-targets.yaml b/updatecli-matrix-targets.yaml
index a653b07cd..c88856ad8 100644
--- a/updatecli-matrix-targets.yaml
+++ b/updatecli-matrix-targets.yaml
@@ -28,7 +28,7 @@ matrix:
       compose_target: *compose231
       compose_key: $.services.solr6.image
       helm_target: *helmvalues231
-      helm_keys:
+      helm_keys: &search_helm_keys
         search: $.alfresco-search.searchServicesImage.tag
         insight: $.alfresco-search.insightEngineImage.tag
       image:
@@ -149,7 +149,7 @@ matrix:
       compose_target: *compose74
       compose_key: $.services.solr6.image
       helm_target: *helmvalues74
-      helm_key: $.alfresco-search.searchServicesImage.tag
+      helm_keys: *search_helm_keys
       image:
       pattern:
     search-enterprise:
@@ -263,7 +263,7 @@ matrix:
       compose_target: *compose73
       compose_key: $.services.solr6.image
       helm_target: *helmvalues73
-      helm_key: $.alfresco-search.searchServicesImage.tag
+      helm_keys: *search_helm_keys
       pattern:
       image:
     search-enterprise:
@@ -377,7 +377,7 @@ matrix:
       compose_target: *compose72
       compose_key: $.services.solr6.image
       helm_target: *helmvalues72
-      helm_key: $.alfresco-search.searchServicesImage.tag
+      helm_keys: *search_helm_keys
       pattern:
       image:
     search-enterprise:
@@ -491,7 +491,7 @@ matrix:
       compose_target: *compose71
       compose_key: $.services.solr6.image
       helm_target: *helmvalues71
-      helm_key: $.alfresco-search.searchServicesImage.tag
+      helm_keys: *search_helm_keys
       pattern:
       image:
     search-enterprise:
@@ -598,7 +598,7 @@ matrix:
       compose_target: *compose70
       compose_key: $.services.solr6.image
       helm_target: *helmvalues70
-      helm_key: $.alfresco-search.searchServicesImage.tag
+      helm_keys: *search_helm_keys
       pattern:
       image:
     sync: