diff --git a/k8s/infra/auth/keycloak-realms/homelab/clients/netbird/client.yaml b/k8s/infra/auth/keycloak-realms/homelab/clients/netbird/client.yaml
index a484c87..33f15ff 100644
--- a/k8s/infra/auth/keycloak-realms/homelab/clients/netbird/client.yaml
+++ b/k8s/infra/auth/keycloak-realms/homelab/clients/netbird/client.yaml
@@ -21,3 +21,23 @@ spec:
       - "+"
     realmIdRef:
       name: homelab
+---
+apiVersion: client.keycloak.crossplane.io/v1alpha1
+kind: ProtocolMapper
+metadata:
+  name: netbird-sub-mapper
+spec:
+  forProvider:
+    name: Username as sub claim
+    protocol: openid-connect
+    protocolMapper: oidc-usermodel-property-mapper
+    config:
+      user.attribute: username
+      claim.name: sub
+      id.token.claim: "true"
+      access.token.claim: "true"
+      userinfo.token.claim: "true"
+    clientIdRef:
+      name: netbird
+    realmIdRef:
+      name: homelab
diff --git a/k8s/infra/vpn/netbird/dashboard/values.yaml b/k8s/infra/vpn/netbird/dashboard/values.yaml
index 132fabc..487a6e2 100644
--- a/k8s/infra/vpn/netbird/dashboard/values.yaml
+++ b/k8s/infra/vpn/netbird/dashboard/values.yaml
@@ -13,13 +13,3 @@ netbird:
 
 ingress:
   enabled: false
-#  annotations:
-#    cert-manager.io/cluster-issuer: cloudflare-cluster-issuer
-#  hosts:
-#    - host: netbird.stonegarden.dev
-#      paths:
-#        - path: /
-#          pathType: Prefix
-#  tls:
-#    - hosts:
-#        - netbird.stonegarden.dev