diff --git a/setup/nextcloud.sh b/setup/nextcloud.sh
index 3c23f252..81e2ea2f 100755
--- a/setup/nextcloud.sh
+++ b/setup/nextcloud.sh
@@ -387,8 +387,8 @@ tools/editconf.py /etc/php/$(php_version)/cli/conf.d/10-opcache.ini -c ';' \
 	opcache.revalidate_freq=1
 
 # If apc is explicitly disabled we need to enable it
-if grep -q apc.enabled=0 /etc/php/8.0/mods-available/apcu.ini; then
-	tools/editconf.py /etc/php/8.0/mods-available/apcu.ini -c ';' \
+if grep -q apc.enabled=0 /etc/php/$(php_version)/mods-available/apcu.ini; then
+	tools/editconf.py /etc/php/$(php_version)/mods-available/apcu.ini -c ';' \
 		apc.enabled=1
 fi
 
diff --git a/setup/start.sh b/setup/start.sh
index bd743ac5..8c91d82d 100755
--- a/setup/start.sh
+++ b/setup/start.sh
@@ -51,6 +51,8 @@ source setup/start.sh
 EOF
 chmod +x /usr/local/bin/mailinabox
 
+git config --global --add safe.directory $(pwd)
+
 # Ask the user for the PRIMARY_HOSTNAME, PUBLIC_IP, and PUBLIC_IPV6,
 # if values have not already been set in environment variables. When running
 # non-interactively, be sure to set values for all! Also sets STORAGE_USER and
diff --git a/setup/zpush.sh b/setup/zpush.sh
index 673689ed..91aeb02c 100755
--- a/setup/zpush.sh
+++ b/setup/zpush.sh
@@ -17,7 +17,7 @@ source /etc/mailinabox.conf # load global vars
 
 echo "Installing Z-Push (Exchange/ActiveSync server)..."
 apt_install \
-	php-soap php-imap libawl-php php8.0-xml
+	php-soap php-imap libawl-php php-xml
 
 phpenmod -v php imap
 
@@ -102,7 +102,7 @@ EOF
 
 # Restart service.
 
-restart_service php8.0-fpm
+restart_service php$(php_version)-fpm
 
 # Fix states after upgrade