diff --git a/keycloak/base/keycloak-deployment.yaml b/keycloak/base/keycloak-deployment.yaml
index 00bafe7..c965035 100644
--- a/keycloak/base/keycloak-deployment.yaml
+++ b/keycloak/base/keycloak-deployment.yaml
@@ -26,14 +26,8 @@ spec:
             - "start"
             - "--verbose"
           env:
-            - name: KC_HOSTNAME_ADMIN_URL
-              value: "https://kcadmin.streams.sunet.se"
-            - name: KC_HOSTNAME_URL
-              value: "https://keycloak.streams.sunet.se"
             - name: KC_HOSTNAME_STRICT
               value: "false"
-            - name: KC_HOSTNAME_STRICT_HTTPS
-              value: "false"
             - name: KC_HTTP_ENABLED
               value: "true"
             - name: KEYCLOAK_USER
@@ -52,8 +46,8 @@ spec:
                   key: password
             - name: KC_HEALTH_ENABLED
               value: "true"
-            - name: KC_PROXY
-              value: "edge"
+            - name: KC_PROXY_HEADERS
+              value: xforwarded
           ports:
             - name: http
               containerPort: 8080
diff --git a/keycloak/keycloak-application.yaml b/keycloak/keycloak-application.yaml
index bcd8354..d99be12 100644
--- a/keycloak/keycloak-application.yaml
+++ b/keycloak/keycloak-application.yaml
@@ -7,7 +7,7 @@ spec:
   project: default
   source:
     repoURL: https://platform.sunet.se/streams/streams-manifests.git
-    targetRevision: streams-manifests-2025-01-31-v22
+    targetRevision: streams-manifests-2025-01-31-v23
     path: keycloak/overlays/test
   destination:
     server: https://kubernetes.default.svc
diff --git a/keycloak/overlays/test/keycloak-deployment.yaml b/keycloak/overlays/test/keycloak-deployment.yaml
deleted file mode 100644
index 946dd23..0000000
--- a/keycloak/overlays/test/keycloak-deployment.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: keycloak
-  namespace: keycloak
-  labels:
-    app: keycloak
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: keycloak
-  template:
-    metadata:
-      labels:
-        app: keycloak
-    spec:
-      containers:
-        - name: keycloak
-          image: quay.io/keycloak/keycloak:26.1
-          env:
-            - name: KC_HOSTNAME_ADMIN_URL
-              value: "https://kcadmin-test.streams.sunet.se"
-            - name: KC_HOSTNAME_URL
-              value: "https://keycloak-test.streams.sunet.se"
-            - name: KC_HOSTNAME_STRICT
-              value: "false"
-            - name: KC_HOSTNAME_STRICT_HTTPS
-              value: "false"
-            - name: KC_HTTP_ENABLED
-              value: "true"
-            - name: KEYCLOAK_USER
-              value: admin
-            - name: KEYCLOAK_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: keycloak-admin-secret
-                  key: password
-            - name: KC_BOOTSTRAP_ADMIN_USERNAME
-              value: "admin"
-            - name: KC_BOOTSTRAP_ADMIN_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: keycloak-admin-secret
-                  key: password
-            - name: KC_HEALTH_ENABLED
-              value: "true"
-            - name: KC_PROXY
-              value: "edge"
diff --git a/keycloak/overlays/test/kustomization.yaml b/keycloak/overlays/test/kustomization.yaml
index 2379afa..dc58c91 100644
--- a/keycloak/overlays/test/kustomization.yaml
+++ b/keycloak/overlays/test/kustomization.yaml
@@ -6,5 +6,4 @@ commonLabels:
 resources:
 - ../../base/
 patches:
-  - path: keycloak-deployment.yaml
   - path: keycloak-ingress.yaml