diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index 9a4c7d9..cb3f85b 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -37,6 +37,19 @@ RUN apk add --no-cache \
     git \
     curl
 
+# Enable php8-xdebug if $PHP_XDEBUG_MODE is not empty
+ARG PHP_XDEBUG_MODE=off
+ARG PHP_XDEBUG_CLIENT_PORT=5902
+ARG PHP_XDEBUG_CLIENT_HOST=host.docker.internal
+COPY xdebug.ini  /etc/php8/conf.d/xdebug.ini.template
+RUN if [[ "$PHP_XDEBUG_MODE" != "" ]]; then \
+        export PHP_XDEBUG_MODE=$PHP_XDEBUG_MODE; \
+        export PHP_XDEBUG_CLIENT_PORT=$PHP_XDEBUG_CLIENT_PORT; \
+        export PHP_XDEBUG_CLIENT_HOST=$PHP_XDEBUG_CLIENT_HOST; \
+        envsubst < /etc/php8/conf.d/xdebug.ini.template > /etc/php8/conf.d/xdebug.ini; \
+    fi
+RUN rm -f /etc/php8/conf.d/xdebug.ini.template
+
 RUN curl -sS https://getcomposer.org/installer | tee composer-setup.php \
     && php8 composer-setup.php && rm composer-setup.php* \
     && chmod +x composer.phar && mv composer.phar /usr/bin/composer \
@@ -76,6 +89,8 @@ ARG INFLUXDB_PASSWORD
 ARG INFLUXDB_ADMIN_TOKEN
 ENV INFLUXDB_URL=http://cc-influxdb:${INFLUXDB_PORT}
 ENV INFLUXDB_TOKEN=${INFLUXDB_ADMIN_TOKEN}
+ARG LDAP_PASSWORD
+ENV LDAP_PW=${LDAP_PASSWORD}
 ARG MYSQL_USER
 ARG MYSQL_PASSWORD
 ARG MYSQL_DATABASE