diff --git a/config/keycloak/keycloak.env b/config/keycloak/keycloak.env
index 24135996..b1304edc 100644
--- a/config/keycloak/keycloak.env
+++ b/config/keycloak/keycloak.env
@@ -14,4 +14,4 @@ KC_HOSTNAME_STRICT_HTTPS="false"
 KEYCLOAK_ADMIN=admin
 KEYCLOAK_ADMIN_PASSWORD=admin
 X_API_CHECK_REALM=cerc
-X_API_CHECK_CLIENT_ID="%user_id%"
+X_API_CHECK_CLIENT_ID="%api_key%"
diff --git a/container-build/cerc-keycloak/Dockerfile b/container-build/cerc-keycloak/Dockerfile
index 61fd7a4e..038f578c 100644
--- a/container-build/cerc-keycloak/Dockerfile
+++ b/container-build/cerc-keycloak/Dockerfile
@@ -3,7 +3,7 @@ RUN apk add --update --no-cache git
 WORKDIR /build
 RUN git clone https://github.com/cerc-io/keycloak-api-key-demo.git && \
       cd keycloak-api-key-demo && \
-      git checkout '69c1903a6f1bdecb654e9982708239c698e3d648' && \
+      git checkout '60c48b5c3e562c6cf2c85cfdd8f08145b0ebac5a' && \
       mvn -f api-key-module package
 
 FROM quay.io/keycloak/keycloak:20.0