diff --git a/extraconfig/nova_metadata/krb-service-principals.j2.yaml b/extraconfig/nova_metadata/krb-service-principals.j2.yaml
index 53bd955f54..633a5c0838 100644
--- a/extraconfig/nova_metadata/krb-service-principals.j2.yaml
+++ b/extraconfig/nova_metadata/krb-service-principals.j2.yaml
@@ -87,7 +87,7 @@ resources:
     properties:
       value:
         yaql:
-          expression: dict(coalesce($.data, []).where($ != null and $.type = 'node').select([$.service, $.network.replace('_', '')]).groupBy($[0], $[1]))
+          expression: dict(coalesce($.data, []).where($ != null and $.type = 'node').groupBy(concat('compact_service_', $.service), $.network.replace('_', '')))
           data: {get_attr: [IncomingMetadataSettings, value]}
 
 outputs:
@@ -96,5 +96,5 @@ outputs:
     value:
       map_merge:
         - {get_attr: [IndividualServices, value]}
-        - compact_services: {get_attr: [CompactServices, value]}
+        - {get_attr: [CompactServices, value]}