diff --git a/network/service_net_map.j2.yaml b/network/service_net_map.j2.yaml
index bcd3387322..0edfc17c7c 100644
--- a/network/service_net_map.j2.yaml
+++ b/network/service_net_map.j2.yaml
@@ -56,13 +56,15 @@ resources:
     properties:
       type: json
       value:
-        map_replace:
-          - {get_param: ServiceNetMap}
-          - values:
+        map_merge:
+        - map_replace:
+            - {get_param: ServiceNetMap}
+            - values:
 {%- for network in networks if network.enabled|default(true) %}
-              {{network.name_lower}}: {get_param: {{network.name}}NetName}
+                {{network.name_lower}}: {get_param: {{network.name}}NetName}
 {%- endfor %}
-            keys: {get_param: ServiceNetMapDeprecatedMapping}
+              keys: {get_param: ServiceNetMapDeprecatedMapping}
+        - NovaVncProxyNetwork: { get_param: [ServiceNetMap, NovaLibvirtNetwork] }
 
 outputs:
   service_net_map:
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index 35eb766ea6..8bd65bc60d 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -399,7 +399,6 @@ parameter_defaults:
     HeatApiCloudwatchNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
     NovaApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
     PlacementNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
-    NovaVncProxyNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
     NovaMetadataNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
     NovaLibvirtNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
     NovajoinNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}