diff --git a/environments/network-isolation-v6.j2.yaml b/environments/network-isolation-v6.j2.yaml
index 2375e3e056..d51e3bd080 100644
--- a/environments/network-isolation-v6.j2.yaml
+++ b/environments/network-isolation-v6.j2.yaml
@@ -1,11 +1,3 @@
-{%- set primary_role = [roles[0]] -%}
-{%- for role in roles -%}
-  {%- if 'primary' in role.tags and 'controller' in role.tags -%}
-    {%- set _ = primary_role.pop() -%}
-    {%- set _ = primary_role.append(role) -%}
-  {%- endif -%}
-{%- endfor -%}
-{%- set primary_role_name = primary_role[0].name -%}
 # NOTE: This template is now deprecated, and is only included for compatibility
 # when upgrading a deployment where this template was originally used. For new
 # deployments, set "ipv6: true" on desired networks in network_data.yaml, and
@@ -14,7 +6,6 @@
 # Enable the creation of Neutron networks for isolated Overcloud
 # traffic and configure each role to assign ports (related
 # to that role) on these networks.
-# primary role is: {{primary_role_name}}
 resource_registry:
   # networks as defined in network_data.yaml
   {%- for network in networks if network.enabled|default(true) %}
diff --git a/environments/network-isolation.j2.yaml b/environments/network-isolation.j2.yaml
index 6ed4fb6de2..92dce6f6ef 100644
--- a/environments/network-isolation.j2.yaml
+++ b/environments/network-isolation.j2.yaml
@@ -1,15 +1,6 @@
-{%- set primary_role = [roles[0]] -%}
-{%- for role in roles -%}
-  {%- if 'primary' in role.tags and 'controller' in role.tags -%}
-    {%- set _ = primary_role.pop() -%}
-    {%- set _ = primary_role.append(role) -%}
-  {%- endif -%}
-{%- endfor -%}
-{%- set primary_role_name = primary_role[0].name -%}
 # Enable the creation of Neutron networks for isolated Overcloud
 # traffic and configure each role to assign ports (related
 # to that role) on these networks.
-# primary role is: {{primary_role_name}}
 resource_registry:
   # networks as defined in network_data.yaml
   {%- for network in networks if network.enabled|default(true) %}