diff --git a/site/airship-seaworthy/software/config/endpoints.yaml b/site/airship-seaworthy/software/config/endpoints.yaml
index b4a80053e..eb084dbd2 100644
--- a/site/airship-seaworthy/software/config/endpoints.yaml
+++ b/site/airship-seaworthy/software/config/endpoints.yaml
@@ -59,8 +59,8 @@ data:
       namespace: ucp
       name: keystone
       hosts:
-        default: keystone-api
-        public: keystone
+        default: keystone
+        internal: keystone-api
       host_fqdn_override:
         default: null
         public:
@@ -564,9 +564,7 @@ data:
       namespace: openstack
       name: keystone
       hosts:
-        default: keystone-api
-        public: keystone
-        admin: keystone-api
+        default: keystone
         internal: keystone-api
       host_fqdn_override:
         default: null
diff --git a/site/airskiff/software/config/endpoints.yaml b/site/airskiff/software/config/endpoints.yaml
index e705c4b5f..0e34f77b8 100644
--- a/site/airskiff/software/config/endpoints.yaml
+++ b/site/airskiff/software/config/endpoints.yaml
@@ -56,8 +56,8 @@ data:
       namespace: ucp
       name: keystone
       hosts:
-        default: keystone-api
-        public: keystone
+        default: keystone
+        internal: keystone-api
       host_fqdn_override:
         default: null
         public: