diff --git a/k8s/infra/vpn/netbird/agent/agent-setup-key.yaml b/k8s/infra/vpn/netbird/agent/agent-setup-key.yaml
index fbce27d..0eca1af 100644
--- a/k8s/infra/vpn/netbird/agent/agent-setup-key.yaml
+++ b/k8s/infra/vpn/netbird/agent/agent-setup-key.yaml
@@ -1,16 +1,13 @@
----
 apiVersion: bitnami.com/v1alpha1
 kind: SealedSecret
 metadata:
-  creationTimestamp: null
   name: agent-setup-key
   namespace: netbird
 spec:
   encryptedData:
-    NB_SETUP_KEY: AgATDxsu2H2WWQnbGFJ8IaYjIApaW1p2Ir85lMxYH63QCeiLqcRaYG+VYhd1xJcUvSDXnBn0e+0phSs7NcmXP/SExvt01o0YPYh4dOecLtPudSPl7eldSR9+i0bXSSqVsbm1cYnJ5fRhdSt+TfOR/RzLt7geK6BUggjh1gJ2N1eYSK5J52vGhr8j7JJ/4+JLJQK33PCRJjCKMAcz/x4yNhyBE4MFpFTRQ7dW3K0HXYe/i2nmKxxN1EtMVmTYCWX0bOr008+BForgtFMC68lWxoS3PGnWE0ejE3saGuz1EqmLhftb3UZr/luc8IknJcmzzdNApc7K4iYXXpOFvWVfLwOve3sp/m6Wlu1qEautaH3P9qnf5D9KOiNRgK1t/B3tu1bJTdK9uzgKpCGTQ+RSLA9gQG1EAvZApe1+FsGsQckiDoh3GFsNMXrZWJdkQKDmfJXfk79Z0Tc1myrRItpjbNnofFOzkaMVdI8fjdUng6+US8nmwDWsEQeuMWTrBiHWCtybk9bsW+dL7cQsGfun4UuxMXNuJIVhH0FtVrZcwK3Jw0UuP0tjAa/pfcT0AJwcfXGFpiK381vDG9SgGdIehDlE70HciCSza2iSdYj5DrbMxCLIvddcPrSSvFZvRQMqEAcaSXkmfPXZOGaB8yMQt7fSJEjn76U61q39Xhp/I0V50FX5aeJehs9zjEVkGCZcmwRyaC8+7p9JLWQBw+Wp/Eetc9d6zfu/ZAEW6hfi7lgP2RV1F4M=
+    NB_SETUP_KEY: AgBmGcDeJrOaZ7Nshlh5nRuAVWWyk/HXnlBm2ppnYGp0I6EMGssI6tjrCyPCX8+uPc3Idbvgv/lpcbiIxevZVQyBWJsh3BJ5rAQmZrzOjvmTkSpgdf4QuoXEY2tH6Cqk+s9lKRHYckcZBoyTbQS/0CNLhnnFSx+QahBlT3Apder7WE2j5KAUcXsG4GbgJbpMNrwqilmYM57Uf2fEvFVg+oaEODlxTpkslqT4cFqNwwEb0sj1MhGR5/UGgxAPa9JPEKhDfrQz1n4uHTirCodxU29FHvqkNxsve0WZuiT2mue6n3q1rrXm0DXNhPXXA9jxTYOzOuwu2WsfRe+CWm99yEs1hm4lTwrkiZ1HU3R9ofeawlvRLGBZ0ABnaHOop+4PhMv64uQgQaZONx959n4MnT4ZMRomFF6DhghXz5B+OAeOxvaxKMqcOrQbVKklFNDPLhFo1r/llgpGUXWKJpiqoGEH43X5f61wErSR5ePW+NIlpmvHNHGksXM6k9nqB6yNH3bJjzC1sk23I2gNmaXJBOt/ktn9xHr8kHsO44dIWTxu4Ck9+na/T3EHU5iOYUJVWIRQNZ9CGyHjL28qKslJ6qHvmXt6he/P9SGcu4IPccC1klmfgwNwlSb4+AU3SQIDanxq/JwowVf8LaObCioBKLxi3J9rFf99iyCbh8NcMP2r/x6a/h/zxz8ccHkzN2ZAqxNcl8zHlVOHo/jm3cFzrSLucdZT7duRQzQddLGLkmyVAmzWekY=
   template:
     metadata:
-      creationTimestamp: null
       name: agent-setup-key
       namespace: netbird
     type: Opaque
diff --git a/k8s/infra/vpn/netbird/management/kustomization.yaml b/k8s/infra/vpn/netbird/management/kustomization.yaml
index 72b18df..08cc5a2 100644
--- a/k8s/infra/vpn/netbird/management/kustomization.yaml
+++ b/k8s/infra/vpn/netbird/management/kustomization.yaml
@@ -11,19 +11,9 @@ configMapGenerator:
     namespace: netbird
     literals:
       - AUTH_AUTHORITY="https://authelia.stonegarden.dev"
-#      - AUTH_OIDC_CONFIGURATION_ENDPOINT="https://authelia.stonegarden.dev/.well-known/openid-configuration"
-#      - AUTH_DEVICE_AUTH_AUTHORITY="https://authelia.stonegarden.dev"
-#      - AUTH_DEVICE_AUTH_PROVIDER="hosted"
-#      - AUTH_DEVICE_AUTH_CLIENT_ID="netbird"
-#      - AUTH_DEVICE_AUTH_AUDIENCE="netbird"
-#      - AUTH_DEVICE_AUTH_DEVICE_AUTHORIZATION_ENDPOINT="https://authelia.stonegarden.dev/protocol/openid-connect/auth"
-#      - AUTH_DEVICE_AUTH_TOKEN_ENDPOINT="https://authelia.stonegarden.dev/protocol/openid-connect/token"
-#      - AUTH_DEVICE_AUTH_SCOPE="openid"
-#      - AUTH_DEVICE_AUTH_USE_ID_TOKEN="false"
       - AUTH_CLIENT_ID="netbird"
       - AUTH_AUDIENCE="netbird"
-#      - AUTH_PKCE_REDIRECT_URLS='[ "http://localhost:53000" ]'
-#      - AUTH_PKCE_USE_ID_TOKEN=true
+      - AUTH_USER_ID_CLAIM="preferred_username"
       - AUTH_SUPPORTED_SCOPES="openid profile email offline_access netbird-api"
   - name: management-connection-config
     namespace: netbird
@@ -38,10 +28,6 @@ configMapGenerator:
     literals:
       - LOG_LEVEL="info"
       - DNS_DOMAIN="stonegarden.dev"
-  - name: management-oidc-key-check-config
-    namespace: netbird
-    literals:
-      - KEY_CHECK_INTERVAL_SECONDS="900"
 
 resources:
   - deployment.yaml