diff --git a/Apache/SOGo-debian.conf b/Apache/SOGo-debian.conf
index 19ee2eec2..5490b5248 100644
--- a/Apache/SOGo-debian.conf
+++ b/Apache/SOGo-debian.conf
@@ -11,23 +11,7 @@ AliasMatch /SOGo/so/ControlPanel/Products/(.*)/Resources/(.*) \
     Allow from all
 </Directory>
 
-<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*jpg">
-  SetHandler default-handler
-</LocationMatch>
-
-<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*png">
-  SetHandler default-handler
-</LocationMatch>
-
-<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*gif">
-  SetHandler default-handler
-</LocationMatch>
-
-<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*css">
-  SetHandler default-handler
-</LocationMatch>
-
-<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*js">
+<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*\.(jpg|png|gif|css|js)">
   SetHandler default-handler
 </LocationMatch>
 
@@ -45,8 +29,7 @@ AliasMatch /SOGo/so/ControlPanel/Products/(.*)/Resources/(.*) \
 ProxyRequests Off
 SetEnv proxy-nokeepalive 1
 ProxyPreserveHost On
-ProxyPassInterpolateEnv On
-ProxyPass /SOGo http://127.0.0.1:20000/SOGo interpolate
+ProxyPass /SOGo http://127.0.0.1:20000/SOGo retry=0
 
 <Proxy http://127.0.0.1:20000/SOGo>
 ## adjust the following to your configuration
diff --git a/Apache/SOGo.conf b/Apache/SOGo.conf
index e713ee6f3..4be65695b 100644
--- a/Apache/SOGo.conf
+++ b/Apache/SOGo.conf
@@ -5,23 +5,7 @@ Alias /SOGo/WebServerResources/ \
 AliasMatch /SOGo/so/ControlPanel/Products/(.*)/Resources/(.*) \
            /usr/GNUstep/System/Library/SOGo/$1.SOGo/Resources/$2
 
-<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*jpg">
-  SetHandler default-handler
-</LocationMatch>
-
-<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*png">
-  SetHandler default-handler
-</LocationMatch>
-
-<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*gif">
-  SetHandler default-handler
-</LocationMatch>
-
-<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*css">
-  SetHandler default-handler
-</LocationMatch>
-
-<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*js">
+<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*\.(jpg|png|gif|css|js)">
   SetHandler default-handler
 </LocationMatch>
 
@@ -39,8 +23,7 @@ AliasMatch /SOGo/so/ControlPanel/Products/(.*)/Resources/(.*) \
 ProxyRequests Off
 SetEnv proxy-nokeepalive 1
 ProxyPreserveHost On
-ProxyPassInterpolateEnv On
-ProxyPass /SOGo http://127.0.0.1:20000/SOGo interpolate
+ProxyPass /SOGo http://127.0.0.1:20000/SOGo retry=0
 
 <Proxy http://127.0.0.1:20000/SOGo>
 ## adjust the following to your configuration