diff --git a/doc/docker/development/Dockerfile b/doc/docker/development/Dockerfile
index f31654cd3d..19c1943ab4 100644
--- a/doc/docker/development/Dockerfile
+++ b/doc/docker/development/Dockerfile
@@ -19,7 +19,7 @@ RUN apt-get update \
 	&& apt-get update \
 	&& bash -c "apt-get install -y php$PHP_VERSION-{cli,mysql,gd,xsl,bz2,opcache,apcu,tidy,zip,bcmath,mbstring,smbclient,ldap,curl,fpm,pgsql,gmp}" \
 	# PHP 8.0 no longer has a separate json extension
-    && bash -c "[ ${PHP_VERSION:0:1} = 7 ] && apt-get install -y php$PHP_VERSION-json" \
+    && apt-get install -y php$PHP_VERSION-json || true \
 	# fpm and php.ini settings
 	&& sed -e 's/^;\?listen \?=.*/listen = 9000/g' \
 		-e '/allowed_clients/d' \
diff --git a/doc/docker/development/entrypoint.sh b/doc/docker/development/entrypoint.sh
index 63d5086d3d..7c634dd0cd 100755
--- a/doc/docker/development/entrypoint.sh
+++ b/doc/docker/development/entrypoint.sh
@@ -11,7 +11,7 @@ test -n "$EGW_SESSION_TIMEOUT" && test "$EGW_SESSION_TIMEOUT" -ge 1440 &&
 
 # if XDEBUG_REMOTE_HOST is set, patch it into xdebug config
 test -n "$XDEBUG_REMOTE_HOST" && \
-	sed -e "s/^xdebug.remote_host.*/xdebug.remote_host=$XDEBUG_REMOTE_HOST/g" \
+	sed -e "s/^xdebug.client_host.*/xdebug.client_host=$XDEBUG_REMOTE_HOST/g" \
 		-i /etc/php/$PHP_VERSION/fpm/conf.d/*xdebug.ini
 
 # downgrade composer to 1.8.6, as 1.9.x does not work with "dev-master" version :(