diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index bb80715e16..828b6febbd 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -532,7 +532,7 @@ resources:
         # list of maps, but appends to colliding lists so we can
         # create a map of lists for all nodes for each network
         yaql:
-          expression: dict($.data.where($ != null).flatten().selectMany($.items()).groupBy($[0], $[1], $.flatten()))
+          expression: dict($.data.where($ != null).flatten().selectMany($.items()).groupBy($[0], $[1]).select([$[0], $[1].flatten()]))
           data:
             - {get_attr: [{{role.name}}, hostname_map]}
 
@@ -688,7 +688,7 @@ resources:
         # list of maps, but appends to colliding lists when a service
         # is deployed on more than one role
         yaql:
-          expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1], $.flatten()))
+          expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1]).select([$[0], $[1].flatten()]))
           data:
             l:
 {% for role in roles %}
@@ -696,7 +696,7 @@ resources:
 {% endfor %}
       service_node_names:
         yaql:
-          expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1], $.flatten()))
+          expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1]).select([$[0], $[1].flatten()]))
           data:
             l:
 {% for role in roles %}
@@ -704,7 +704,7 @@ resources:
 {% endfor %}
       short_service_node_names:
         yaql:
-          expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1], $.flatten()))
+          expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1]).select([$[0], $[1].flatten()]))
           data:
             l:
 {% for role in roles %}
@@ -712,7 +712,7 @@ resources:
 {% endfor %}
       short_service_bootstrap_node:
         yaql:
-          expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1], $.flatten().first()))
+          expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1]).select([$[0], $[1].flatten().first()]))
           data:
             l:
 {% for role in roles %}
@@ -904,7 +904,7 @@ resources:
         # list of maps, but appends to colliding lists when a service
         # is deployed on more than one role
         yaql:
-          expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1], $.flatten()))
+          expression: dict($.data.l.where($ != null).selectMany($.items()).groupBy($[0], $[1]).select([$[0], $[1].flatten()]))
           data:
             l:
 {% for role in roles %}