diff --git a/Apache/SOGo.conf b/Apache/SOGo.conf
index cfe62caf5..57f0effd1 100644
--- a/Apache/SOGo.conf
+++ b/Apache/SOGo.conf
@@ -54,7 +54,6 @@ Header always set Referrer-Policy "same-origin"
 
 ProxyRequests Off
 ProxyPreserveHost On
-SetEnv proxy-nokeepalive 1
 
 # Uncomment the following lines if you experience "Bad gateway" errors with mod_proxy
 #SetEnv proxy-initial-not-pooled 1
@@ -89,7 +88,7 @@ ProxyPass /SOGo http://127.0.0.1:20000/SOGo retry=0 nocanon
     RequestHeader set "x-webobjects-server-port" "443"
     SetEnvIf Host (.*) HTTP_HOST=$1
     RequestHeader set "x-webobjects-server-name" "%{HTTP_HOST}e" env=HTTP_HOST
-    RequestHeader set "x-webobjects-server-url" "https://%{HTTP_HOST}e" env=HTTP_HOST
+#    RequestHeader set "x-webobjects-server-url" "https://%{HTTP_HOST}e" env=HTTP_HOST
 
 ## When using proxy-side autentication, you need to uncomment and
 ## adjust the following line:
diff --git a/Scripts/sogo-systemd-redhat b/Scripts/sogo-systemd-redhat
index 0acceb3d2..caa635cc2 100644
--- a/Scripts/sogo-systemd-redhat
+++ b/Scripts/sogo-systemd-redhat
@@ -1,14 +1,12 @@
 [Unit]
 Description=SOGo is a groupware server
-After=network.target
-After=mariadb.service
+After=network.target memcached.service postfix.service dovecot.service postgresql.service
 
 [Service]
 Environment="PREFORK=3"
 EnvironmentFile=-/etc/sysconfig/sogo
-Type=forking
-ExecStart=/usr/sbin/sogod -WOWorkersCount ${PREFORK} -WOPidFile /var/run/sogo/sogo.pid -WOLogFile /var/log/sogo/sogo.log
-PIDFile=/var/run/sogo/sogo.pid
+ExecStart=/usr/sbin/sogod -WOWorkersCount ${PREFORK} -WOPidFile /run/sogo/sogo.pid -WONoDetach YES -WOLogFile /var/log/sogo/sogo.log
+PIDFile=/run/sogo/sogo.pid
 User=sogo
 
 [Install]
diff --git a/Scripts/sogo-systemd.conf b/Scripts/sogo-systemd.conf
index 6755a2969..ecd32c507 100644
--- a/Scripts/sogo-systemd.conf
+++ b/Scripts/sogo-systemd.conf
@@ -1,2 +1,2 @@
-# SOGo needs directory in /var/run
-d /var/run/sogo 0755 sogo sogo
+# SOGo needs directory in /run
+d /run/sogo 0755 sogo sogo