diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index f2345f57..3285fbf5 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -29,9 +29,9 @@ jobs:
               run: sed -i 's/mariadb-admin/mysqladmin/' ./docker-compose.testing-${{ matrix.configuration }}.yml
             - name: Build images
               working-directory: ./testing/
-              run: docker-compose -f ./docker-compose/docker-compose.testing-${{ matrix.configuration }}.yml build
+              run: docker compose -f ./docker-compose/docker-compose.testing-${{ matrix.configuration }}.yml build
             - name: Run ${{ matrix.configuration }} tests
               working-directory: ./testing/
-              run: docker-compose -f ./docker-compose/docker-compose.testing-${{ matrix.configuration }}.yml up --build --abort-on-container-exit --exit-code-from=sut
+              run: docker compose -f ./docker-compose/docker-compose.testing-${{ matrix.configuration }}.yml up --build --abort-on-container-exit --exit-code-from=sut
               env:
                 DB: ${{ matrix.database-image }}
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index c85bf099..f69e70fb 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -37,6 +37,10 @@ RUN set -ex; \
         | sort -u \
         | xargs -rt apt-mark manual; \
     \
+    # start: Apache specific build
+    a2enmod remoteip; \
+    # end: Apache specific build
+    \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
     rm -rf /var/lib/apt/lists/*; \
     ldd "$extdir"/*.so | grep -qzv "=> not found" || (echo "Sanity check failed: missing libraries:"; ldd "$extdir"/*.so | grep " => not found"; exit 1); \
diff --git a/Makefile b/Makefile
index 2fb5ca6f..b5692252 100644
--- a/Makefile
+++ b/Makefile
@@ -16,24 +16,24 @@ build-fpm-alpine:
 	docker build ${DOCKER_FLAGS} -t ${DOCKER_REPO}:testing-fpm-alpine fpm-alpine
 
 run:
-	docker-compose -f ./testing/docker-compose/docker-compose.testing-default.yml up -d
+	docker compose -f ./testing/docker-compose/docker-compose.testing-default.yml up -d
 
 testing-%:
-	docker-compose -p "phpmyadmin_$@" -f ./testing/docker-compose/docker-compose.$@.yml up --build --abort-on-container-exit --exit-code-from=sut
-	docker-compose -p "phpmyadmin_$@" -f ./testing/docker-compose/docker-compose.$@.yml down
+	docker compose -p "phpmyadmin_$@" -f ./testing/docker-compose/docker-compose.$@.yml up --build --abort-on-container-exit --exit-code-from=sut
+	docker compose -p "phpmyadmin_$@" -f ./testing/docker-compose/docker-compose.$@.yml down
 
 run-tests: testing-default testing-one-host testing-one-socket-host testing-config-mount-dir testing-fs-import-export testing-different-apache-port
 
 logs:
-	docker-compose -f ./testing/docker-compose/docker-compose.testing-default.yml logs
+	docker compose -f ./testing/docker-compose/docker-compose.testing-default.yml logs
 
 clean: stop rm prune
 
 stop:
-	docker-compose -f ./testing/docker-compose/docker-compose.testing-default.yml stop
+	docker compose -f ./testing/docker-compose/docker-compose.testing-default.yml stop
 
 rm:
-	docker-compose -f ./testing/docker-compose/docker-compose.testing-default.yml rm
+	docker compose -f ./testing/docker-compose/docker-compose.testing-default.yml rm
 
 prune:
 	docker rm `docker ps -q -a --filter status=exited`
diff --git a/README.md b/README.md
index 80db1d28..a034b40d 100644
--- a/README.md
+++ b/README.md
@@ -81,7 +81,7 @@ You can use arbitrary servers by adding the environment variable `PMA_ARBITRARY=
 docker run --name phpmyadmin -d -e PMA_ARBITRARY=1 -p 8080:80 phpmyadmin:latest
 ```
 
-## Usage with docker-compose and arbitrary server
+## Usage with docker compose and an arbitrary server
 
 This will run phpMyAdmin with the arbitrary server option - allowing you to specify any MySQL/MariaDB
 server on the login page.
@@ -210,7 +210,7 @@ docker run --name phpmyadmin -d -e PMA_PASSWORD_FILE=/run/secrets/db_password.tx
 ## Run the E2E tests for this docker image
 
 You can run the E2E test suite on a local test environment.
-The Requirements are `make`, `docker` and `docker-compose`.
+The Requirements are `make`, `docker` and the `docker compose` plugin.
 
 Clone this repository: `https://github.com/phpmyadmin/docker.git`
 
diff --git a/apache/Dockerfile b/apache/Dockerfile
index 66a92621..3435ad4d 100644
--- a/apache/Dockerfile
+++ b/apache/Dockerfile
@@ -38,6 +38,10 @@ RUN set -ex; \
         | sort -u \
         | xargs -rt apt-mark manual; \
     \
+    # start: Apache specific build
+    a2enmod remoteip; \
+    # end: Apache specific build
+    \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
     rm -rf /var/lib/apt/lists/*; \
     ldd "$extdir"/*.so | grep -qzv "=> not found" || (echo "Sanity check failed: missing libraries:"; ldd "$extdir"/*.so | grep " => not found"; exit 1); \
diff --git a/fpm/Dockerfile b/fpm/Dockerfile
index 34e24d1f..19b3f601 100644
--- a/fpm/Dockerfile
+++ b/fpm/Dockerfile
@@ -38,6 +38,7 @@ RUN set -ex; \
         | sort -u \
         | xargs -rt apt-mark manual; \
     \
+    \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
     rm -rf /var/lib/apt/lists/*; \
     ldd "$extdir"/*.so | grep -qzv "=> not found" || (echo "Sanity check failed: missing libraries:"; ldd "$extdir"/*.so | grep " => not found"; exit 1); \
diff --git a/update.sh b/update.sh
index 610cbecd..42ddef26 100755
--- a/update.sh
+++ b/update.sh
@@ -64,6 +64,7 @@ function create_variant() {
 	cp docker-entrypoint.sh "$variant/docker-entrypoint.sh"
 	if [ "$variant" != "apache" ]; then
 		sed -i "/^# start: Apache specific settings$/,/^# end: Apache specific settings$/d" "$variant/docker-entrypoint.sh"
+		sed -i "/^\s*# start: Apache specific build$/,/^\s*# end: Apache specific build$/d" "$variant/Dockerfile"
 	fi
 
 	# Copy config.inc.php