diff --git a/etc/openstack_deploy/openstack_user_config.yml.aio b/etc/openstack_deploy/openstack_user_config.yml.aio
index e4d6cb4fa0..ffb8aafb3f 100644
--- a/etc/openstack_deploy/openstack_user_config.yml.aio
+++ b/etc/openstack_deploy/openstack_user_config.yml.aio
@@ -97,7 +97,7 @@ global_overrides:
         container_interface: "eth12"
         host_bind_override: "eth12"
         type: "flat"
-        net_name: "flat"
+        net_name: "physnet1"
         group_binds:
           - neutron_linuxbridge_agent
     - network:
@@ -106,7 +106,7 @@ global_overrides:
         container_interface: "eth11"
         type: "vlan"
         range: "101:200,301:400"
-        net_name: "vlan"
+        net_name: "physnet1"
         group_binds:
           - neutron_linuxbridge_agent
     - network:
diff --git a/etc/openstack_deploy/openstack_user_config.yml.aio.j2 b/etc/openstack_deploy/openstack_user_config.yml.aio.j2
index f4b81a20b2..d1da920261 100644
--- a/etc/openstack_deploy/openstack_user_config.yml.aio.j2
+++ b/etc/openstack_deploy/openstack_user_config.yml.aio.j2
@@ -145,13 +145,13 @@ global_overrides:
         network_interface: "eth12"
         type: "vlan"
         range: "101:200,301:400"
-        net_name: "vlan"
+        net_name: "physnet1"
         group_binds:
           - neutron_openvswitch_agent
     - network:
         container_bridge: "br-provider"
         container_type: "veth"
-        net_name: "vlan"
+        net_name: "physnet1"
         type: "flat"
         group_binds:
           - neutron_openvswitch_agent
@@ -162,7 +162,7 @@ global_overrides:
         container_interface: "eth12"
         host_bind_override: "eth12"
         type: "flat"
-        net_name: "flat"
+        net_name: "physnet1"
         group_binds:
           - neutron_linuxbridge_agent
     - network:
@@ -171,7 +171,7 @@ global_overrides:
         container_interface: "eth11"
         type: "vlan"
         range: "101:200,301:400"
-        net_name: "vlan"
+        net_name: "physnet1"
         group_binds:
           - neutron_linuxbridge_agent
 {% else %}
@@ -180,13 +180,13 @@ global_overrides:
         network_interface: "eth12"
         type: "vlan"
         range: "101:200,301:400"
-        net_name: "vlan"
+        net_name: "physnet1"
         group_binds:
           - neutron_ovn_gateway
     - network:
         container_bridge: "br-provider"
         container_type: "veth"
-        net_name: "vlan"
+        net_name: "physnet1"
         type: "flat"
         group_binds:
           - neutron_ovn_gateway
diff --git a/etc/openstack_deploy/openstack_user_config.yml.example b/etc/openstack_deploy/openstack_user_config.yml.example
index b33dddcf4d..bfdb77aa45 100644
--- a/etc/openstack_deploy/openstack_user_config.yml.example
+++ b/etc/openstack_deploy/openstack_user_config.yml.example
@@ -286,7 +286,7 @@
 #         container_interface: "eth11"
 #         type: "vlan"
 #         range: "101:200,301:400"
-#         net_name: "vlan"
+#         net_name: "physnet1"
 #     - network:
 #         group_binds:
 #           - neutron_linuxbridge_agent
@@ -295,7 +295,7 @@
 #         container_interface: "eth12"
 #         host_bind_override: "eth12"
 #         type: "flat"
-#         net_name: "flat"
+#         net_name: "physnet1"
 #
 # --------
 #
diff --git a/etc/openstack_deploy/openstack_user_config.yml.pod.example b/etc/openstack_deploy/openstack_user_config.yml.pod.example
index d5be4d9a90..6baafa6c26 100644
--- a/etc/openstack_deploy/openstack_user_config.yml.pod.example
+++ b/etc/openstack_deploy/openstack_user_config.yml.pod.example
@@ -181,7 +181,7 @@ global_overrides:
         container_interface: "eth12"
         host_bind_override: "eth12"
         type: "flat"
-        net_name: "flat"
+        net_name: "physnet1"
         group_binds:
           - neutron_linuxbridge_agent
     - network:
@@ -190,7 +190,7 @@ global_overrides:
         container_interface: "eth11"
         type: "vlan"
         range: "101:200,301:400"
-        net_name: "vlan"
+        net_name: "physnet1"
         group_binds:
           - neutron_linuxbridge_agent
     - network:
diff --git a/etc/openstack_deploy/openstack_user_config.yml.prod-ceph.example b/etc/openstack_deploy/openstack_user_config.yml.prod-ceph.example
index 6ec4afa705..8f90108a62 100644
--- a/etc/openstack_deploy/openstack_user_config.yml.prod-ceph.example
+++ b/etc/openstack_deploy/openstack_user_config.yml.prod-ceph.example
@@ -48,7 +48,7 @@ global_overrides:
         container_interface: "eth12"
         host_bind_override: "eth12"
         type: "flat"
-        net_name: "flat"
+        net_name: "physnet1"
         group_binds:
           - neutron_linuxbridge_agent
     - network:
@@ -57,7 +57,7 @@ global_overrides:
         container_interface: "eth11"
         type: "vlan"
         range: "101:200,301:400"
-        net_name: "vlan"
+        net_name: "physnet1"
         group_binds:
           - neutron_linuxbridge_agent
     - network:
diff --git a/etc/openstack_deploy/openstack_user_config.yml.prod.example b/etc/openstack_deploy/openstack_user_config.yml.prod.example
index cb72a4de3d..7c8d96f3fa 100644
--- a/etc/openstack_deploy/openstack_user_config.yml.prod.example
+++ b/etc/openstack_deploy/openstack_user_config.yml.prod.example
@@ -47,7 +47,7 @@ global_overrides:
         container_interface: "eth12"
         host_bind_override: "eth12"
         type: "flat"
-        net_name: "flat"
+        net_name: "physnet1"
         group_binds:
           - neutron_linuxbridge_agent
     - network:
@@ -56,7 +56,7 @@ global_overrides:
         container_interface: "eth11"
         type: "vlan"
         range: "101:200,301:400"
-        net_name: "vlan"
+        net_name: "physnet1"
         group_binds:
           - neutron_linuxbridge_agent
     - network:
diff --git a/etc/openstack_deploy/openstack_user_config.yml.test.example b/etc/openstack_deploy/openstack_user_config.yml.test.example
index 32f3635247..0f13d0e982 100644
--- a/etc/openstack_deploy/openstack_user_config.yml.test.example
+++ b/etc/openstack_deploy/openstack_user_config.yml.test.example
@@ -43,7 +43,7 @@ global_overrides:
         container_interface: "eth12"
         host_bind_override: "eth12"
         type: "flat"
-        net_name: "flat"
+        net_name: "physnet1"
         group_binds:
           - neutron_linuxbridge_agent
     - network:
@@ -52,7 +52,7 @@ global_overrides:
         container_interface: "eth11"
         type: "vlan"
         range: "101:200,301:400"
-        net_name: "vlan"
+        net_name: "physnet1"
         group_binds:
           - neutron_linuxbridge_agent
     - network:
diff --git a/playbooks/defaults/healthchecks-vars.yml b/playbooks/defaults/healthchecks-vars.yml
index fad5b21089..d95949f477 100644
--- a/playbooks/defaults/healthchecks-vars.yml
+++ b/playbooks/defaults/healthchecks-vars.yml
@@ -34,7 +34,7 @@ public_dns_servers:
 
 neutron_networks:
   public:
-    name: "{{ tempest_public_net_name | default('public') }}"
+    name: "{{ tempest_public_net_name | default('physnet1') }}"
     shared: True
     external: True
     pn_type: "{{ tempest_public_net_provider_type | default('flat') }}"
diff --git a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
index db75c6a8bb..a0d2c65be7 100644
--- a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
+++ b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2
@@ -33,11 +33,7 @@ tempest_private_net_provider_type: geneve
 {% else %}
 tempest_private_net_provider_type: vxlan
 {% endif %}
-{% if _neutron_plugin_driver == 'ml2.lxb' %}
-tempest_public_net_physical_name: flat
-{% else  %}
-tempest_public_net_physical_name: vlan
-{% endif %}
+tempest_public_net_physical_name: 'physnet1'
 
 # systemd-journald limitations
 openstack_hosts_journald_config: