diff --git a/comanage-registry-mod-auth-openidc/Dockerfile b/comanage-registry-mod-auth-openidc/Dockerfile
index e615615..f633e15 100644
--- a/comanage-registry-mod-auth-openidc/Dockerfile
+++ b/comanage-registry-mod-auth-openidc/Dockerfile
@@ -18,14 +18,14 @@
 # limitations under the License.
 ARG COMANAGE_REGISTRY_VERSION=develop
 ARG COMANAGE_REGISTRY_BASE_IMAGE_VERSION=1
-ARG MOD_AUTH_OPENIDC_SRC_URL=https://github.com/zmartzone/mod_auth_openidc/releases/download/v2.3.11/mod_auth_openidc-2.3.11.tar.gz
+ARG MOD_AUTH_OPENIDC_VERSION
 
 FROM comanage-registry-base:${COMANAGE_REGISTRY_VERSION}-${COMANAGE_REGISTRY_BASE_IMAGE_VERSION} AS comanage
 
-FROM debian:bullseye AS building
+FROM debian:bookworm-slim AS building
 
-ARG MOD_AUTH_OPENIDC_SRC_URL
-ENV MOD_AUTH_OPENIDC_SRC_URL ${MOD_AUTH_OPENIDC_SRC_URL}
+ARG MOD_AUTH_OPENIDC_VERSION
+ENV MOD_AUTH_OPENIDC_VERSION ${MOD_AUTH_OPENIDC_VERSION:-2.4.16.6}
 
 RUN apt-get update \
       && apt-get install -y --no-install-recommends \
@@ -40,12 +40,13 @@ RUN apt-get update \
         libpcre3-dev \
         libssl-dev \
         pkg-config \
-        wget \
+        wget
+
+RUN MOD_AUTH_OPENIDC_URL="https://github.com/zmartzone/mod_auth_openidc/releases/download/v${MOD_AUTH_OPENIDC_VERSION}/mod_auth_openidc-${MOD_AUTH_OPENIDC_VERSION}.tar.gz" \
       && mkdir -p /tmp/mod_auth_openidc \
-      && wget -O mod_auth_openidc.tar.gz "$MOD_AUTH_OPENIDC_SRC_URL" \
+      && wget -O mod_auth_openidc.tar.gz "${MOD_AUTH_OPENIDC_URL}" \
       && tar -zxf mod_auth_openidc.tar.gz -C /tmp/mod_auth_openidc --strip-components=1 \
       && cd /tmp/mod_auth_openidc \
-      && ./autogen.sh \
       && ./configure --with-apxs2=`which apxs2` \
       && make \
       && make install