diff --git a/barbican/values.yaml b/barbican/values.yaml
index 153ed194a2..be1db1677a 100644
--- a/barbican/values.yaml
+++ b/barbican/values.yaml
@@ -540,8 +540,8 @@ endpoints:
         user_domain_name: service
         project_domain_name: service
     hosts:
-      default: keystone-api
-      public: keystone
+      default: keystone
+      internal: keystone-api
     host_fqdn_override:
       default: null
     path:
diff --git a/ceilometer/values.yaml b/ceilometer/values.yaml
index 928903203e..4e7f10470d 100644
--- a/ceilometer/values.yaml
+++ b/ceilometer/values.yaml
@@ -1782,8 +1782,8 @@ endpoints:
         user_domain_name: service
         project_domain_name: service
     hosts:
-      default: keystone-api
-      public: keystone
+      default: keystone
+      internal: keystone-api
     host_fqdn_override:
       default: null
     path:
diff --git a/ceph-rgw/values.yaml b/ceph-rgw/values.yaml
index 123f70fe5d..0da90b4efc 100644
--- a/ceph-rgw/values.yaml
+++ b/ceph-rgw/values.yaml
@@ -365,8 +365,8 @@ endpoints:
         user_domain_name: service
         project_domain_name: service
     hosts:
-      default: keystone-api
-      public: keystone
+      default: keystone
+      internal: keystone-api
     host_fqdn_override:
       default: null
     path:
diff --git a/cinder/values.yaml b/cinder/values.yaml
index 11535f41fa..13f92456d8 100644
--- a/cinder/values.yaml
+++ b/cinder/values.yaml
@@ -1064,8 +1064,8 @@ endpoints:
         user_domain_name: service
         project_domain_name: service
     hosts:
-      default: keystone-api
-      public: keystone
+      default: keystone
+      internal: keystone-api
     host_fqdn_override:
       default: null
     path:
diff --git a/congress/values.yaml b/congress/values.yaml
index 883b22715c..044d9d1877 100644
--- a/congress/values.yaml
+++ b/congress/values.yaml
@@ -239,8 +239,8 @@ endpoints:
         user_domain_name: service
         project_domain_name: service
     hosts:
-      default: keystone-api
-      public: keystone
+      default: keystone
+      internal: keystone-api
     host_fqdn_override:
       default: null
     path:
diff --git a/glance/values.yaml b/glance/values.yaml
index 33ae627a3c..fc6fd09ea8 100644
--- a/glance/values.yaml
+++ b/glance/values.yaml
@@ -569,8 +569,8 @@ endpoints:
         user_domain_name: service
         project_domain_name: service
     hosts:
-      default: keystone-api
-      public: keystone
+      default: keystone
+      internal: keystone-api
     host_fqdn_override:
       default: null
     path:
diff --git a/gnocchi/values.yaml b/gnocchi/values.yaml
index 98b38098ee..4fb03867e5 100644
--- a/gnocchi/values.yaml
+++ b/gnocchi/values.yaml
@@ -480,8 +480,8 @@ endpoints:
         user_domain_name: service
         project_domain_name: service
     hosts:
-      default: keystone-api
-      public: keystone
+      default: keystone
+      internal: keystone-api
     host_fqdn_override:
       default: null
     path:
diff --git a/heat/values.yaml b/heat/values.yaml
index f49d05799d..60af062063 100644
--- a/heat/values.yaml
+++ b/heat/values.yaml
@@ -806,8 +806,8 @@ endpoints:
         user_domain_name: service
         project_domain_name: service
     hosts:
-      default: keystone-api
-      public: keystone
+      default: keystone
+      internal: keystone-api
     host_fqdn_override:
       default: null
     path:
diff --git a/horizon/values.yaml b/horizon/values.yaml
index 16af9a0af5..039cc1e47b 100644
--- a/horizon/values.yaml
+++ b/horizon/values.yaml
@@ -1999,8 +1999,8 @@ endpoints:
   identity:
     name: keystone
     hosts:
-      default: keystone-api
-      public: keystone
+      default: keystone
+      internal: keystone-api
     host_fqdn_override:
       default: null
     path:
diff --git a/ironic/values.yaml b/ironic/values.yaml
index 3f438b65c4..6fd7499dc4 100644
--- a/ironic/values.yaml
+++ b/ironic/values.yaml
@@ -394,8 +394,8 @@ endpoints:
         user_domain_name: service
         project_domain_name: service
     hosts:
-      default: keystone-api
-      public: keystone
+      default: keystone
+      internal: keystone-api
     host_fqdn_override:
       default: null
     path:
diff --git a/keystone/values.yaml b/keystone/values.yaml
index 4dd3953d46..d41f1e63f6 100644
--- a/keystone/values.yaml
+++ b/keystone/values.yaml
@@ -961,9 +961,8 @@ endpoints:
         user_domain_name: default
         project_domain_name: default
     hosts:
-      default: keystone-api
-      public: keystone
-      admin: keystone
+      default: keystone
+      internal: keystone-api
     host_fqdn_override:
       default: null
       # NOTE(portdirect): this chart supports TLS for fqdn over-ridden public
diff --git a/magnum/values.yaml b/magnum/values.yaml
index 05fee4b0bd..00fe95a14d 100644
--- a/magnum/values.yaml
+++ b/magnum/values.yaml
@@ -352,8 +352,8 @@ endpoints:
         password: password
         domain_name: magnum
     hosts:
-      default: keystone-api
-      public: keystone
+      default: keystone
+      internal: keystone-api
     host_fqdn_override:
       default: null
     path:
diff --git a/mistral/values.yaml b/mistral/values.yaml
index d1610c5f57..d9e461e6e1 100644
--- a/mistral/values.yaml
+++ b/mistral/values.yaml
@@ -236,8 +236,8 @@ endpoints:
         user_domain_name: service
         project_domain_name: service
     hosts:
-      default: keystone-api
-      public: keystone
+      default: keystone
+      internal: keystone-api
     host_fqdn_override:
       default: null
     path:
diff --git a/neutron/values.yaml b/neutron/values.yaml
index 24cd1448a9..a6aaae27da 100644
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@@ -1770,8 +1770,8 @@ endpoints:
         user_domain_name: service
         project_domain_name: service
     hosts:
-      default: keystone-api
-      public: keystone
+      default: keystone
+      internal: keystone-api
     host_fqdn_override:
       default: null
     path:
diff --git a/nova/values.yaml b/nova/values.yaml
index cfb5fc875b..a920a687bd 100644
--- a/nova/values.yaml
+++ b/nova/values.yaml
@@ -1814,8 +1814,8 @@ endpoints:
         user_domain_name: service
         project_domain_name: service
     hosts:
-      default: keystone-api
-      public: keystone
+      default: keystone
+      internal: keystone-api
     host_fqdn_override:
       default: null
     path:
diff --git a/rally/values.yaml b/rally/values.yaml
index 57b152fd54..39bd78c97b 100644
--- a/rally/values.yaml
+++ b/rally/values.yaml
@@ -249,8 +249,8 @@ endpoints:
         user_domain_name: service
         project_domain_name: service
     hosts:
-      default: keystone-api
-      public: keystone
+      default: keystone
+      internal: keystone-api
     host_fqdn_override:
       default: null
     path:
diff --git a/senlin/values.yaml b/senlin/values.yaml
index 25f7895b26..82d1787baa 100644
--- a/senlin/values.yaml
+++ b/senlin/values.yaml
@@ -401,8 +401,8 @@ endpoints:
         user_domain_name: service
         project_domain_name: service
     hosts:
-      default: keystone-api
-      public: keystone
+      default: keystone
+      internal: keystone-api
     host_fqdn_override:
       default: null
     path:
diff --git a/tempest/values.yaml b/tempest/values.yaml
index 3dcd83a4ca..25ad719bff 100644
--- a/tempest/values.yaml
+++ b/tempest/values.yaml
@@ -244,8 +244,8 @@ endpoints:
         user_domain_name: service
         project_domain_name: service
     hosts:
-      default: keystone-api
-      public: keystone
+      default: keystone
+      internal: keystone-api
     host_fqdn_override:
       default: null
     path: