diff --git a/Dockerfile b/Dockerfile
index fb854489..489396ee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,6 +11,7 @@ ENV MW_VERSION=REL1_39 \
 	MW_VOLUME=/mediawiki \
 	WWW_USER=www-data \
     WWW_GROUP=www-data \
+	PHP_LOG_DIR=/var/log/php-fpm \
     APACHE_LOG_DIR=/var/log/apache2
 
 # System setup
@@ -84,6 +85,7 @@ RUN set -x; \
 	&& a2enmod proxy_fcgi \
     # Create directories
     && mkdir -p $MW_HOME \
+	&& mkdir -p $PHP_LOG_DIR \
     && mkdir -p $MW_ORIGIN_FILES \
     && mkdir -p $MW_VOLUME
 
@@ -201,7 +203,7 @@ ENV MW_ENABLE_JOB_RUNNER=true \
 COPY _sources/configs/msmtprc /etc/
 COPY _sources/configs/mediawiki.conf /etc/apache2/sites-enabled/
 COPY _sources/configs/status.conf /etc/apache2/mods-available/
-COPY _sources/configs/php_error_reporting.ini _sources/configs/php_upload_max_filesize.ini /etc/php/8.1/cli/conf.d/
+COPY _sources/configs/php_cli_error_reporting.ini _sources/configs/php_upload_max_filesize.ini /etc/php/8.1/cli/conf.d/
 COPY _sources/configs/php_error_reporting.ini _sources/configs/php_upload_max_filesize.ini /etc/php/8.1/fpm/conf.d/
 COPY _sources/configs/php_max_input_vars.ini _sources/configs/php_max_input_vars.ini /etc/php/8.1/fpm/conf.d/
 COPY _sources/configs/php_timeouts.ini /etc/php/8.1/fpm/conf.d/
diff --git a/_sources/configs/mediawiki.conf b/_sources/configs/mediawiki.conf
index bb6f955c..5038ccd6 100644
--- a/_sources/configs/mediawiki.conf
+++ b/_sources/configs/mediawiki.conf
@@ -24,6 +24,16 @@ RewriteRule ^/?w/img_auth.php/ - [L]
 RedirectMatch 404 /\.git
 # Disable directory indexing
 Options -Indexes
+
+######## Overwrite log format to include X-Forwarded-For if it is provided ########
+RemoteIPHeader X-Forwarded-For
+RemoteIPInternalProxy 10.0.0.0/8
+RemoteIPInternalProxy 172.16.0.0/12
+RemoteIPInternalProxy 192.168.0.0/16
+
+LogFormat "%a %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" docker
+
+CustomLog "|/usr/bin/rotatelogs -c -f -l -p /rotatelogs-compress.sh -L /var/log/apache2/access_log.current /var/log/apache2/access_log_%Y%m%d 86400" docker
 # Disable directory indexing
 ErrorLog "|/usr/bin/rotatelogs -c -f -l -p /rotatelogs-compress.sh -L /var/log/apache2/error_log.current /var/log/apache2/error_log_%Y%m%d 86400"
 # Overwrite log format to include X-Forwarded-For if it is provided
diff --git a/_sources/configs/php_cli_error_reporting.ini b/_sources/configs/php_cli_error_reporting.ini
new file mode 100644
index 00000000..bbf09b18
--- /dev/null
+++ b/_sources/configs/php_cli_error_reporting.ini
@@ -0,0 +1,5 @@
+log_errors=stderr
+; must be an integer, see
+; https://www.php.net/manual/en/function.error-reporting
+; https://www.php.net/manual/en/errorfunc.constants.php
+error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT
\ No newline at end of file
diff --git a/_sources/configs/php_error_reporting.ini b/_sources/configs/php_error_reporting.ini
index b0d39357..204b7874 100644
--- a/_sources/configs/php_error_reporting.ini
+++ b/_sources/configs/php_error_reporting.ini
@@ -1,4 +1,5 @@
 log_errors=On
+error_log = "${PHP_LOG_DIR}/php_error.log"
 ; must be an integer, see
 ; https://www.php.net/manual/en/function.error-reporting
 ; https://www.php.net/manual/en/errorfunc.constants.php