diff --git a/deployment/haproxy/haproxy-public-tls-certmonger.yaml b/deployment/haproxy/haproxy-public-tls-certmonger.yaml
index 29a3c1a089..f7184475c7 100644
--- a/deployment/haproxy/haproxy-public-tls-certmonger.yaml
+++ b/deployment/haproxy/haproxy-public-tls-certmonger.yaml
@@ -67,10 +67,18 @@ outputs:
             - ''
             - - {get_param: HAProxyInternalTLSKeysDirectory}
               - '/overcloud-haproxy-external.key'
-          hostname: "%{hiera('cloud_name_external')}"
-          principal: "haproxy/%{hiera('cloud_name_external')}"
+          hostname:
+            str_replace:
+              template: "%{hiera('cloud_name_NETWORK')}"
+              params:
+                NETWORK: {get_param: [ServiceNetMap, PublicNetwork]}
+          principal:
+            str_replace:
+              template: "haproxy/%{hiera('cloud_name_NETWORK')}"
+              params:
+                NETWORK: {get_param: [ServiceNetMap, PublicNetwork]}
           postsave_cmd: "/usr/bin/certmonger-haproxy-refresh.sh reload external"
       metadata_settings:
         - service: haproxy
-          network: external
+          network: {get_param: [ServiceNetMap, PublicNetwork]}
           type: vip