diff --git a/deployment/ec2/ec2-api-container-puppet.yaml b/deployment/ec2/ec2-api-container-puppet.yaml
index bdec42f1f8..6f5eebd4db 100644
--- a/deployment/ec2/ec2-api-container-puppet.yaml
+++ b/deployment/ec2/ec2-api-container-puppet.yaml
@@ -129,7 +129,7 @@ outputs:
           ec2api::api::ec2api_listen:
             if:
             - use_tls_proxy
-            - 'localhost'
+            - "%{hiera('localhost_address')}"
             - str_replace:
                 template:
                   "%{hiera('fqdn_$NETWORK')}"
@@ -138,7 +138,7 @@ outputs:
           ec2api::metadata::metadata_listen:
             if:
             - use_tls_proxy
-            - 'localhost'
+            - "%{hiera('localhost_address')}"
             - str_replace:
                 template:
                   "%{hiera('fqdn_$NETWORK')}"
diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml
index eeb79c66ad..2f44281392 100644
--- a/deployment/glance/glance-api-container-puppet.yaml
+++ b/deployment/glance/glance-api-container-puppet.yaml
@@ -378,7 +378,7 @@ outputs:
             glance::api::bind_host:
               if:
               - use_tls_proxy
-              - 'localhost'
+              - "%{hiera('localhost_address')}"
               - str_replace:
                   template:
                     "%{hiera('$NETWORK')}"
diff --git a/deployment/kernel/kernel-baremetal-puppet.yaml b/deployment/kernel/kernel-baremetal-puppet.yaml
index 0834680ed5..d6e60cedaa 100644
--- a/deployment/kernel/kernel-baremetal-puppet.yaml
+++ b/deployment/kernel/kernel-baremetal-puppet.yaml
@@ -85,6 +85,9 @@ parameters:
     tags:
       - role_specific
 
+conditions:
+  ipv6_disabled: {equals: [{get_param: KernelDisableIPv6}, 1]}
+
 resources:
   # Merging role-specific parameters (RoleParameters) with the default parameters.
   # RoleParameters will have the precedence over the default parameters.
@@ -108,6 +111,11 @@ outputs:
     value:
       service_name: kernel
       config_settings:
+        localhost_address:
+          if:
+          - ipv6_disabled
+          - '127.0.0.1'
+          - 'localhost'
         kernel_modules:
           map_merge:
             - nf_conntrack: {}
diff --git a/deployment/neutron/neutron-api-container-puppet.yaml b/deployment/neutron/neutron-api-container-puppet.yaml
index 12fc70a700..10db40de9f 100644
--- a/deployment/neutron/neutron-api-container-puppet.yaml
+++ b/deployment/neutron/neutron-api-container-puppet.yaml
@@ -244,7 +244,7 @@ outputs:
             neutron::bind_host:
               if:
               - use_tls_proxy
-              - 'localhost'
+              - "%{hiera('localhost_address')}"
               - str_replace:
                   template:
                     "%{hiera('$NETWORK')}"
diff --git a/deployment/swift/swift-proxy-container-puppet.yaml b/deployment/swift/swift-proxy-container-puppet.yaml
index 7f176a0eb8..60e4716dd1 100644
--- a/deployment/swift/swift-proxy-container-puppet.yaml
+++ b/deployment/swift/swift-proxy-container-puppet.yaml
@@ -271,7 +271,7 @@ outputs:
             swift::proxy::proxy_local_net_ip:
               if:
               - use_tls_proxy
-              - 'localhost'
+              - "%{hiera('localhost_address')}"
               - str_replace:
                   template:
                     "%{hiera('$NETWORK')}"