diff --git a/global/schemas/pegleg/EndpointCatalogue/v1.yaml b/global/schemas/pegleg/EndpointCatalogue/v1.yaml
index 776e4270b..c48ba7bcb 100644
--- a/global/schemas/pegleg/EndpointCatalogue/v1.yaml
+++ b/global/schemas/pegleg/EndpointCatalogue/v1.yaml
@@ -77,6 +77,25 @@ data:
                               type: string
                       additionalProperties:
                         type: string
+                admin:
+                  oneOf:
+                    - type: string
+                    - type: "null"
+                    - type: object
+                      properties:
+                        host:
+                          type: string
+                        tls:
+                          type: object
+                          properties:
+                            crt:
+                              type: string
+                            ca:
+                              type: string
+                            key:
+                              type: string
+                      additionalProperties:
+                        type: string
                 internal:
                   oneOf:
                     - type: string
diff --git a/site/airship-seaworthy/software/config/endpoints.yaml b/site/airship-seaworthy/software/config/endpoints.yaml
index 3f67f8372..b5c327f02 100644
--- a/site/airship-seaworthy/software/config/endpoints.yaml
+++ b/site/airship-seaworthy/software/config/endpoints.yaml
@@ -18,6 +18,8 @@ metadata:
       dest:
         - path: .ucp.identity.host_fqdn_override.public.host
           pattern: DOMAIN
+        - path: .ucp.identity.host_fqdn_override.admin.host
+          pattern: DOMAIN
         - path: .ucp.shipyard.host_fqdn_override.public.host
           pattern: DOMAIN
         - path: .ceph.object_store.host_fqdn_override.public.host
@@ -109,18 +111,18 @@ data:
         default: null
         public:
           host: iam.DOMAIN
+        admin:
+          host: iam.DOMAIN
       path:
         default: /v3
       scheme:
         default: http
         # public: https
       port:
-        admin:
-          default: 35357
         api:
-          default: 5000
+          default: 80
           # public: 443
-          public: 80
+          internal: 5000
     armada:
       name: armada
       hosts:
@@ -401,6 +403,8 @@ metadata:
           pattern: DOMAIN
         - path: .osh.identity.host_fqdn_override.public.host
           pattern: DOMAIN
+        - path: .osh.identity.host_fqdn_override.admin.host
+          pattern: DOMAIN
         - path: .osh.dashboard.host_fqdn_override.public.host
           pattern: DOMAIN
         - path: .osh.volume.host_fqdn_override.public.host
@@ -762,18 +766,18 @@ data:
         default: null
         public:
           host: identity.DOMAIN
+        admin:
+          host: identity.DOMAIN
       path:
         default: /v3
       scheme:
         default: "http"
         # public: "https"
       port:
-        admin:
-          default: 35357
         api:
-          default: 5000
+          default: 80
           # public: 443
-          public: 80
+          internal: 5000
     glance_oslo_messaging:
       namespace: openstack
       hosts: