diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index e1f4944183..fdf155a1c0 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -919,12 +919,12 @@ resources:
         - ' '
         - - yaql:
               expression: coalesce($.data, []).first(null)
-              data: {get_attr: [{{primary_role_name}}, ip_address]}
+              data: {get_attr: [{{role.name}}, ip_address]}
   {%- for network in networks %}
     {%- if network.enabled|default(true) and network.name in role.networks|default([]) %}
           - yaql:
               expression: coalesce($.data, []).first(null)
-              data: {get_attr: [{{primary_role_name}}, {{network.name_lower}}_ip_address]}
+              data: {get_attr: [{{role.name}}, {{network.name_lower}}_ip_address]}
     {%- endif %}
   {%- endfor %}
 {%- endfor %}