diff --git a/.env.sample b/.env.sample
index c0b8cd6..b738275 100644
--- a/.env.sample
+++ b/.env.sample
@@ -42,10 +42,12 @@ ENCRYPTED_BY_DEFAULT=all
 
 #COMPOSE_FILE="$COMPOSE_FILE:compose.keycloak.yml"
 #KEYCLOAK_ENABLED=1
+#KEYCLOAK_ID=keycloak
 #KEYCLOAK_NAME=
 #KEYCLOAK_URL=
 #KEYCLOAK_CLIENT_ID=
 #KEYCLOAK_CLIENT_DOMAIN=
+#KEYCLOAK_ALLOW_EXISTING_USERS=false
 #SECRET_KEYCLOAK_CLIENT_SECRET_VERSION=v1
 
 #COMPOSE_FILE="$COMPOSE_FILE:compose.turn.yml"
diff --git a/abra.sh b/abra.sh
index 277f4a6..e195a88 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,3 +1,3 @@
 export ENTRYPOINT_CONF_VERSION=v1
-export HOMESERVER_YAML_VERSION=v8
+export HOMESERVER_YAML_VERSION=v9
 export LOG_CONFIG_VERSION=v2
diff --git a/compose.keycloak.yml b/compose.keycloak.yml
index 6a540c8..be86fe0 100644
--- a/compose.keycloak.yml
+++ b/compose.keycloak.yml
@@ -14,7 +14,9 @@ services:
       - KEYCLOAK_CLIENT_ID
       - KEYCLOAK_ENABLED
       - KEYCLOAK_NAME
+      - KEYCLOAK_ID
       - KEYCLOAK_URL
+      - KEYCLOAK_ALLOW_EXISTING_USERS
 
 secrets:
   keycloak_client_secret:
diff --git a/homeserver.yaml.tmpl b/homeserver.yaml.tmpl
index 7fa0752..e0ab17f 100644
--- a/homeserver.yaml.tmpl
+++ b/homeserver.yaml.tmpl
@@ -1885,12 +1885,13 @@ saml2_config:
 oidc_providers:
 
   {{ if eq (env "KEYCLOAK_ENABLED") "1" }}
-  - idp_id: keycloak
+  - idp_id: {{ env "KEYCLOAK_ID" }} 
     idp_name: {{ env "KEYCLOAK_NAME" }}
     issuer: "{{ env "KEYCLOAK_URL" }}"
     client_id: "{{ env "KEYCLOAK_CLIENT_ID" }}"
     client_secret: "{{ secret "keycloak_client_secret" }}"
     scopes: ["openid", "profile"]
+    allow_existing_users: {{ env "KEYCLOAK_ALLOW_EXISTING_USERS" }}
     user_mapping_provider:
       config:
         localpart_template: "{{ "{{ user.preferred_username }}" }}"