diff --git a/lib/os/class.ISPConfigDebian10OS.inc.php b/lib/os/class.ISPConfigDebian10OS.inc.php
index 2c0d4a3a4634f0ffe29b06dfde43a13600fcbcba..b5439d8bc63a14491ca2ea83158b2815836810dc 100644
--- a/lib/os/class.ISPConfigDebian10OS.inc.php
+++ b/lib/os/class.ISPConfigDebian10OS.inc.php
@@ -49,7 +49,7 @@ class ISPConfigDebian10OS extends ISPConfigDebianOS {
 	}
 
 	protected function setDefaultPHP() {
-		ISPConfigLog::info('Settings default system php version.', true);
+		ISPConfigLog::info('Setting default system php version.', true);
 		$cmd = 'update-alternatives --set php /usr/bin/php7.3';
 		$result = $this->exec($cmd);
 		if($result === false) {
@@ -57,7 +57,12 @@ class ISPConfigDebian10OS extends ISPConfigDebianOS {
 		}
 
 		if(ISPConfig::shallInstall('web')) {
-			$cmd = 'update-alternatives --set php-cgi /usr/bin/php-cgi7.3 ; update-alternatives --set php-fpm.sock /run/php/php7.3-fpm.sock';
+			// When --use-php-system is used, there is no alternative for php-fpm.sock.
+			if(ISPConfig::wantsPHP() === 'system') {
+				$cmd = 'update-alternatives --set php-cgi /usr/bin/php-cgi7.3';
+			} else {
+				$cmd = 'update-alternatives --set php-cgi /usr/bin/php-cgi7.3 ; update-alternatives --set php-fpm.sock /run/php/php7.3-fpm.sock';
+			}
 			$result = $this->exec($cmd);
 			if($result === false) {
 				throw new ISPConfigOSException('Command ' . $cmd . ' failed.');
diff --git a/lib/os/class.ISPConfigDebianOS.inc.php b/lib/os/class.ISPConfigDebianOS.inc.php
index 4dddeb2f05e8f51371b19cf295f5ae242f753922..fe32aa94e323ce68ec85dfe9ffe47ea62eb0e83f 100644
--- a/lib/os/class.ISPConfigDebianOS.inc.php
+++ b/lib/os/class.ISPConfigDebianOS.inc.php
@@ -174,7 +174,7 @@ class ISPConfigDebianOS extends ISPConfigBaseOS {
 	}
 
 	protected function setDefaultPHP() {
-		ISPConfigLog::info('Settings default system php version.', true);
+		ISPConfigLog::info('Setting default system php version.', true);
 		$cmd = 'update-alternatives --set php /usr/bin/php7.0';
 		$result = $this->exec($cmd);
 		if($result === false) {
@@ -182,7 +182,12 @@ class ISPConfigDebianOS extends ISPConfigBaseOS {
 		}
 
 		if(ISPConfig::shallInstall('web')) {
-			$cmd = 'update-alternatives --set php-cgi /usr/bin/php-cgi7.0 ; update-alternatives --set php-fpm.sock /run/php/php7.0-fpm.sock';
+			// When --use-php-system is used, there is no alternative for php-fpm.sock.
+			if(ISPConfig::wantsPHP() === 'system') {
+				$cmd = 'update-alternatives --set php-cgi /usr/bin/php-cgi7.0';
+			} else {
+				$cmd = 'update-alternatives --set php-cgi /usr/bin/php-cgi7.0 ; update-alternatives --set php-fpm.sock /run/php/php7.0-fpm.sock';
+			}
 			$result = $this->exec($cmd);
 			if($result === false) {
 				throw new ISPConfigOSException('Command ' . $cmd . ' failed.');
diff --git a/lib/os/class.ISPConfigUbuntu2004OS.inc.php b/lib/os/class.ISPConfigUbuntu2004OS.inc.php
index 8f1d91dbe0bebb83cf7c74898ddd9acc6a458a3f..acc312982960bc4c01a91be94fc510d83686bcc3 100644
--- a/lib/os/class.ISPConfigUbuntu2004OS.inc.php
+++ b/lib/os/class.ISPConfigUbuntu2004OS.inc.php
@@ -99,7 +99,7 @@ maxretry = 3';
 	}
 
 	protected function setDefaultPHP() {
-		ISPConfigLog::info('Settings default system php version.', true);
+		ISPConfigLog::info('Setting default system php version.', true);
 		$cmd = 'update-alternatives --set php /usr/bin/php7.4';
 		$result = $this->exec($cmd);
 		if($result === false) {
@@ -107,7 +107,12 @@ maxretry = 3';
 		}
 
 		if(ISPConfig::shallInstall('web')) {
-			$cmd = 'update-alternatives --set php-cgi /usr/bin/php-cgi7.4 ; update-alternatives --set php-fpm.sock /run/php/php7.4-fpm.sock';
+			// When --use-php-system is used, there is no alternative for php-fpm.sock.
+			if(ISPConfig::wantsPHP() === 'system') {
+				$cmd = 'update-alternatives --set php-cgi /usr/bin/php-cgi7.4';
+			} else {
+				$cmd = 'update-alternatives --set php-cgi /usr/bin/php-cgi7.4 ; update-alternatives --set php-fpm.sock /run/php/php7.4-fpm.sock';
+			}
 			$result = $this->exec($cmd);
 			if($result === false) {
 				throw new ISPConfigOSException('Command ' . $cmd . ' failed.');
diff --git a/lib/os/class.ISPConfigUbuntuOS.inc.php b/lib/os/class.ISPConfigUbuntuOS.inc.php
index 51614b8c1ffcf6fc347d33c705a834bdbdd46e28..e2962c52774afe2c073df3a8ced43bf4d3336417 100644
--- a/lib/os/class.ISPConfigUbuntuOS.inc.php
+++ b/lib/os/class.ISPConfigUbuntuOS.inc.php
@@ -82,7 +82,7 @@ maxretry = 3';
 	}
 
 	protected function setDefaultPHP() {
-		ISPConfigLog::info('Settings default system php version.', true);
+		ISPConfigLog::info('Setting default system php version.', true);
 		$cmd = 'update-alternatives --set php /usr/bin/php7.2';
 		$result = $this->exec($cmd);
 		if($result === false) {
@@ -90,7 +90,12 @@ maxretry = 3';
 		}
 
 		if(ISPConfig::shallInstall('web')) {
-			$cmd = 'update-alternatives --set php-cgi /usr/bin/php-cgi7.2 ; update-alternatives --set php-fpm.sock /run/php/php7.2-fpm.sock';
+			// When --use-php-system is used, there is no alternative for php-fpm.sock.
+			if(ISPConfig::wantsPHP() === 'system') {
+				$cmd = 'update-alternatives --set php-cgi /usr/bin/php-cgi7.2';
+			} else {
+				$cmd = 'update-alternatives --set php-cgi /usr/bin/php-cgi7.2 ; update-alternatives --set php-fpm.sock /run/php/php7.2-fpm.sock';
+			}
 			$result = $this->exec($cmd);
 			if($result === false) {
 				throw new ISPConfigOSException('Command ' . $cmd . ' failed.');