diff --git a/install_postfixadmin.sh b/install_postfixadmin.sh
index 8719a35..f92071e 100755
--- a/install_postfixadmin.sh
+++ b/install_postfixadmin.sh
@@ -147,11 +147,11 @@ if $systemd_supported ; then
 	# - Is Service exclusive controlled by systemd
 	# -
 	if systemctl -t service list-unit-files \
-			| grep -e "^apache" \
+			| grep -e "^apache2.service" \
 			| grep -q -E "(enabled|disabled)" 2> /devnull ; then
 
 		APACHE_SERVICE_FILE=$(systemctl -t service list-unit-files \
-										| grep -e "^apache" \
+										| grep -e "^apache2.service" \
 										| awk '{print$1}')
 
 	fi
@@ -1275,8 +1275,12 @@ EOF
    <FilesMatch \.php$>
 EOF
       if $PHP_DEBIAN_INSTALLATION ; then
+         php_socket_file="/run/php/php${php_major_version}-fpm.sock"
+         if [[ -S "/run/php$(echo $php_major_version | cut -d'.' -f1)-fpm.sock" ]]; then
+            php_socket_file="/run/php$(echo $php_major_version | cut -d'.' -f1)-fpm.sock"
+         fi
          cat <<EOF >> ${APACHE_VHOST_DIR}/${WEBSITE_NAME}.conf 2>> $log_file
-      SetHandler "proxy:unix:/var/run/php$(echo $php_major_version | cut -d'.' -f1)-fpm.sock|fcgi://127.0.0.1"
+      SetHandler "proxy:unix:${php_socket_file}|fcgi://127.0.0.1"
 EOF
       else
          cat <<EOF >> ${APACHE_VHOST_DIR}/${WEBSITE_NAME}.conf 2>> $log_file
diff --git a/install_roundcube.sh b/install_roundcube.sh
index 3e7c1b5..cecaea4 100755
--- a/install_roundcube.sh
+++ b/install_roundcube.sh
@@ -108,11 +108,11 @@ if $systemd_supported ; then
    # - Is Service exclusive controlled by systemd
    # -
    if systemctl -t service list-unit-files \
-         | grep -e "^apache" \
+         | grep -e "^apache2.service" \
          | grep -q -E "(enabled|disabled)" 2> /devnull ; then
 
       APACHE_SERVICE_FILE=$(systemctl -t service list-unit-files \
-                              | grep -e "^apache" \
+                              | grep -e "^apache2.service" \
                               | awk '{print$1}')
 
    fi
@@ -1272,8 +1272,12 @@ elif [[ "$PHP_TYPE" = "php_fpm" ]]; then
    <FilesMatch \.php$>
 EOF
    if $PHP_DEBIAN_INSTALLATION ; then
+      php_socket_file="/run/php/php${php_major_version}-fpm.sock"
+      if [[ -S "/run/php$(echo $php_major_version | cut -d'.' -f1)-fpm.sock" ]]; then
+         php_socket_file="/run/php$(echo $php_major_version | cut -d'.' -f1)-fpm.sock"
+      fi
       cat <<EOF >> ${APACHE_VHOST_DIR}/${WEBSITE_NAME}.conf 2>> $log_file
-      SetHandler "proxy:unix:/var/run/php$(echo $php_major_version | cut -d'.' -f1)-fpm.sock|fcgi://127.0.0.1"
+      SetHandler "proxy:unix:${php_socket_file}|fcgi://127.0.0.1"
 EOF
    else
       cat <<EOF >> ${APACHE_VHOST_DIR}/${WEBSITE_NAME}.conf 2>> $log_file
diff --git a/upgrade_roundcube.sh b/upgrade_roundcube.sh
index b4dd710..56915ba 100755
--- a/upgrade_roundcube.sh
+++ b/upgrade_roundcube.sh
@@ -112,11 +112,11 @@ if $systemd_supported ; then
    # - Is Service exclusive controlled by systemd
    # -
    if systemctl -t service list-unit-files \
-         | grep -e "^apache" \
+         | grep -e "^apache2.service" \
          | grep -q -E "(enabled|disabled)" 2> /devnull ; then
 
       APACHE_SERVICE_FILE=$(systemctl -t service list-unit-files \
-                              | grep -e "^apache" \
+                              | grep -e "^apache2.service" \
                               | awk '{print$1}')
 
    fi