diff --git a/deployment/glance/glance-api-edge-container-puppet.yaml b/deployment/glance/glance-api-edge-container-puppet.yaml
index 81640ed9cb..e7814ec6cb 100644
--- a/deployment/glance/glance-api-edge-container-puppet.yaml
+++ b/deployment/glance/glance-api-edge-container-puppet.yaml
@@ -55,16 +55,18 @@ outputs:
   glance_api_edge_uri:
     description: URI of the glance-api service runing at the edge site.
     value: &glance_api_edge_uri
-      str_replace:
-        template:
-          "PROTOCOL://%{hiera('NETWORK_uri')}:9292"
-        params:
-          PROTOCOL:
-            if:
-            - internal_tls_enabled
-            - https
-            - http
-          NETWORK: {get_param: [ServiceNetMap, GlanceApiEdgeNetwork]}
+      if:
+      - internal_tls_enabled
+      - str_replace:
+          template:
+            "https://%{hiera('fqdn_NETWORK')}:9292"
+          params:
+            NETWORK: {get_param: [ServiceNetMap, GlanceApiEdgeNetwork]}
+      - str_replace:
+          template:
+            "http://%{hiera('NETWORK_uri')}:9292"
+          params:
+            NETWORK: {get_param: [ServiceNetMap, GlanceApiEdgeNetwork]}
 
   role_data:
     description: Role data for the Glance API role for DCN/Edge.
diff --git a/deployment/haproxy/haproxy-edge-container-puppet.yaml b/deployment/haproxy/haproxy-edge-container-puppet.yaml
index c0818dd39f..93a7b6f1de 100644
--- a/deployment/haproxy/haproxy-edge-container-puppet.yaml
+++ b/deployment/haproxy/haproxy-edge-container-puppet.yaml
@@ -61,16 +61,18 @@ outputs:
   glance_api_edge_uri:
     description: URI of the glance-api service runing at the edge site.
     value: &glance_api_edge_uri
-      str_replace:
-        template:
-          "PROTOCOL://%{hiera('NETWORK_uri')}:9292"
-        params:
-          PROTOCOL:
-            if:
-            - internal_tls_enabled
-            - https
-            - http
-          NETWORK: {get_param: [ServiceNetMap, GlanceApiEdgeNetwork]}
+      if:
+      - internal_tls_enabled
+      - str_replace:
+          template:
+            "https://%{hiera('fqdn_NETWORK')}:9292"
+          params:
+            NETWORK: {get_param: [ServiceNetMap, GlanceApiEdgeNetwork]}
+      - str_replace:
+          template:
+            "http://%{hiera('NETWORK_uri')}:9292"
+          params:
+            NETWORK: {get_param: [ServiceNetMap, GlanceApiEdgeNetwork]}
 
   role_data:
     description: Role data for the HAproxy role for DCN/Edge.