diff --git a/clusters/cl01tl/manifests/blocky/ConfigMap-blocky.yaml b/clusters/cl01tl/manifests/blocky/ConfigMap-blocky.yaml
index e088fbfab..d83d9afc7 100644
--- a/clusters/cl01tl/manifests/blocky/ConfigMap-blocky.yaml
+++ b/clusters/cl01tl/manifests/blocky/ConfigMap-blocky.yaml
@@ -95,6 +95,7 @@ data:
         audiobookshelf                  IN      CNAME   traefik-cl01tl
         authentik                       IN      CNAME   traefik-cl01tl
         backrest                        IN      CNAME   traefik-cl01tl
+        bao                             IN      CNAME   traefik-cl01tl
         bazarr                          IN      CNAME   traefik-cl01tl
         ceph                            IN      CNAME   traefik-cl01tl
         dawarich                        IN      CNAME   traefik-cl01tl
@@ -130,7 +131,6 @@ data:
         objects                         IN      CNAME   traefik-cl01tl
         ollama                          IN      CNAME   traefik-cl01tl
         omni-tools                      IN      CNAME   traefik-cl01tl
-        openbao                         IN      CNAME   traefik-cl01tl
         paperless-ngx                   IN      CNAME   traefik-cl01tl
         plex                            IN      CNAME   traefik-cl01tl
         postiz-spotlight                IN      CNAME   traefik-cl01tl
diff --git a/clusters/cl01tl/manifests/blocky/Deployment-blocky.yaml b/clusters/cl01tl/manifests/blocky/Deployment-blocky.yaml
index b4a57fa32..e3dd6aba1 100644
--- a/clusters/cl01tl/manifests/blocky/Deployment-blocky.yaml
+++ b/clusters/cl01tl/manifests/blocky/Deployment-blocky.yaml
@@ -22,7 +22,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/configMaps: c09d68cf84d75e9c363e3663d97d8cccc831b88e7dd6e6cd79b2ac6c85369339
+        checksum/configMaps: 6a74369df91b8e1256132009e63003401e6137c2e747c30f8f439de142d24c7b
       labels:
         app.kubernetes.io/controller: main
         app.kubernetes.io/instance: blocky
diff --git a/clusters/cl01tl/manifests/gatus/ConfigMap-gatus.yaml b/clusters/cl01tl/manifests/gatus/ConfigMap-gatus.yaml
index 327e57cb1..5d51a82a0 100644
--- a/clusters/cl01tl/manifests/gatus/ConfigMap-gatus.yaml
+++ b/clusters/cl01tl/manifests/gatus/ConfigMap-gatus.yaml
@@ -491,7 +491,7 @@ data:
       group: core
       interval: 30s
       name: openbao
-      url: https://openbao.alexlebens.net
+      url: https://bao.alexlebens.net
     - alerts:
       - type: ntfy
       conditions:
diff --git a/clusters/cl01tl/manifests/gatus/Deployment-gatus.yaml b/clusters/cl01tl/manifests/gatus/Deployment-gatus.yaml
index 3cc291f04..290ae5782 100644
--- a/clusters/cl01tl/manifests/gatus/Deployment-gatus.yaml
+++ b/clusters/cl01tl/manifests/gatus/Deployment-gatus.yaml
@@ -26,7 +26,7 @@ spec:
         app.kubernetes.io/name: gatus
         app.kubernetes.io/instance: gatus
       annotations:
-        checksum/config: 2e9a8befb2caa928dbe6f8c2ea3f9a85f1d98354adeb28580e90fc18413fb127
+        checksum/config: 84322f5f6d4ca8f740b634e70fd762c2e0badb1686585f5d8250ced5d2afda19
     spec:
       serviceAccountName: default
       automountServiceAccountToken: false
diff --git a/clusters/cl01tl/manifests/homepage/ConfigMap-homepage.yaml b/clusters/cl01tl/manifests/homepage/ConfigMap-homepage.yaml
index cea5aebf6..07be3e7f3 100644
--- a/clusters/cl01tl/manifests/homepage/ConfigMap-homepage.yaml
+++ b/clusters/cl01tl/manifests/homepage/ConfigMap-homepage.yaml
@@ -570,7 +570,7 @@ data:
         - Secrets:
             icon: sh-openbao.webp
             description: OpenBao
-            href: https://openbao.alexlebens.net
+            href: https://bao.alexlebens.net
             siteMonitor: http://openbao.openbao:8200
             statusStyle: dot
             namespace: openbao
diff --git a/clusters/cl01tl/manifests/homepage/Deployment-homepage.yaml b/clusters/cl01tl/manifests/homepage/Deployment-homepage.yaml
index bf60549a4..4065a69cb 100644
--- a/clusters/cl01tl/manifests/homepage/Deployment-homepage.yaml
+++ b/clusters/cl01tl/manifests/homepage/Deployment-homepage.yaml
@@ -24,7 +24,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/configMaps: 23a5c8ee073c4b2443acd207d4b960c17b431a3ff0bdea1a44a8a179ff788c89
+        checksum/configMaps: 93bedb9a595b5b1d2a52224b9ca6c6aad24ca55cb0ff848c7706af81f6785e8b
         checksum/secrets: d3ba83f111cd32f92c909268c55ad8bbd4f9e299b74b35b33c1a011180d8b378
       labels:
         app.kubernetes.io/controller: main
diff --git a/clusters/cl01tl/manifests/openbao/ConfigMap-openbao-config.yaml b/clusters/cl01tl/manifests/openbao/ConfigMap-openbao-config.yaml
index cf85f03a2..94e52bb3b 100644
--- a/clusters/cl01tl/manifests/openbao/ConfigMap-openbao-config.yaml
+++ b/clusters/cl01tl/manifests/openbao/ConfigMap-openbao-config.yaml
@@ -25,13 +25,13 @@ data:
     storage "raft" {
       path = "/openbao/data"
       retry_join {
-        leader_api_addr = "http://openbao-0.openbao-internal:8201"
+        leader_api_addr = "http://openbao-0.openbao-internal:8200"
       }
       retry_join {
-        leader_api_addr = "http://openbao-1.openbao-internal:8201"
+        leader_api_addr = "http://openbao-1.openbao-internal:8200"
       }
       retry_join {
-        leader_api_addr = "http://openbao-2.openbao-internal:8201"
+        leader_api_addr = "http://openbao-2.openbao-internal:8200"
       }
     }
 
diff --git a/clusters/cl01tl/manifests/openbao/Namespace-openbao.yaml b/clusters/cl01tl/manifests/openbao/Namespace-openbao.yaml
new file mode 100644
index 000000000..c0bf66a32
--- /dev/null
+++ b/clusters/cl01tl/manifests/openbao/Namespace-openbao.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: openbao
+  labels:
+    app.kubernetes.io/name: openbao
+    app.kubernetes.io/instance: openbao
+    app.kubernetes.io/part-of: openbao
+    pod-security.kubernetes.io/audit: privileged
+    pod-security.kubernetes.io/enforce: privileged
+    pod-security.kubernetes.io/warn: privileged
diff --git a/clusters/cl01tl/manifests/openbao/TLSRoute-openbao.yaml b/clusters/cl01tl/manifests/openbao/TLSRoute-openbao.yaml
index e693dacc5..a9b085fa3 100644
--- a/clusters/cl01tl/manifests/openbao/TLSRoute-openbao.yaml
+++ b/clusters/cl01tl/manifests/openbao/TLSRoute-openbao.yaml
@@ -10,7 +10,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
 spec:
   hostnames:
-    - "vault.alexlebens.net"
+    - "bao.alexlebens.net"
   parentRefs:
     - group: gateway.networking.k8s.io
       kind: Gateway