diff --git a/values/headscale/values.yaml b/values/headscale/values.yaml
index af4781b7..8f844110 100644
--- a/values/headscale/values.yaml
+++ b/values/headscale/values.yaml
@@ -1,13 +1,14 @@
 image:
   repository: ghcr.io/juanfont/headscale
   pullPolicy: IfNotPresent
-  tag: v0.25.0
+  tag: v0.25.1
 
 args: [ "serve" ]
 
 env:
-  HEADSCALE_DNS_BASE_DOMAIN: "obx.io"
+  HEADSCALE_DNS_BASE_DOMAIN: "obx.hs"
 
+  HEADSCALE_OIDC_ONLY_START_IF_OIDC_IS_AVAILABLE: "true"
   HEADSCALE_OIDC_ISSUER: "https://login.microsoftonline.com/3f737008-e9a0-4485-9d27-40329d288089/v2.0"
   HEADSCALE_OIDC_CLIENT_ID: "688e9096-f140-4498-a46a-e3d1939184de"
   HEADSCALE_OIDC_CLIENT_SECRET: "dPW8Q~1rctY-D0Ih.A1-1KqLl0uj1rX_ixNTcbrh"
@@ -115,7 +116,7 @@ configMaps:
               "hilde.iversen@oceanbox.io",
             ],
             "group:dev": [],
-            "group:intern": []
+            "group:intern": [],
           },
           // tagOwners in tailscale is an association between a TAG and the people allowed to set this TAG on a server.
           // This is documented [here](https://tailscale.com/kb/1068/acl-tags#defining-a-tag)
@@ -208,14 +209,14 @@ configMaps:
     data:
       records: |
         [
-           { "name": "auth.oceanbox.io", "type": "A", "value": "10.255.241.11" },
            { "name": "maps.beta.oceanbox.io", "type": "A", "value": "10.255.241.11" },
            { "name": "atlantis.beta.oceanbox.io", "type": "A", "value": "10.255.241.11" },
 
+           { "name": "auth.adm.oceanbox.io", "type": "A", "value": "10.255.241.11" },
+           { "name": "keycloak.adm.oceanbox.io", "type": "A", "value": "10.255.241.11" },
            { "name": "grafana.adm.oceanbox.io", "type": "A", "value": "10.255.241.11" },
            { "name": "prometheus.adm.oceanbox.io", "type": "A", "value": "10.255.241.99" },
            { "name": "alertmanager.adm.oceanbox.io", "type": "A", "value": "10.255.241.99" },
-           { "name": "auth.adm.oceanbox.io", "type": "A", "value": "10.255.241.11" },
            { "name": "argocd.adm.oceanbox.io", "type": "A", "value": "10.255.241.11" },
            { "name": "hubble.adm.oceanbox.io", "type": "A", "value": "10.255.241.11" },
            { "name": "plausible.adm.oceanbox.io", "type": "A", "value": "10.255.241.11" },