diff --git a/.devcontainer/conf/httpd/httpd.conf b/.devcontainer/conf/httpd/httpd.conf
index 29f9fd2bc..d0de1fc9b 100644
--- a/.devcontainer/conf/httpd/httpd.conf
+++ b/.devcontainer/conf/httpd/httpd.conf
@@ -566,7 +566,7 @@ SSLRandomSeed connect builtin
         Alias /SOGo.woa/WebServerResources/       /usr/local/lib/GNUstep/SOGo/WebServerResources/
         Alias /SOGo/WebServerResources/       /usr/local/lib/GNUstep/SOGo/WebServerResources/
 
-        <Directory /usr/lib/GNUstep/SOGo/>
+        <Directory /usr/lib/x86_64-linux-gnu/GNUstep/SOGo/>
             <IfVersion < 2.4>
                 Order deny,allow
                 Allow from all
@@ -639,7 +639,7 @@ SSLRandomSeed connect builtin
         Alias /SOGo.woa/WebServerResources/       /usr/local/lib/GNUstep/SOGo/WebServerResources/
         Alias /SOGo/WebServerResources/       /usr/local/lib/GNUstep/SOGo/WebServerResources/
 
-        <Directory /usr/lib/GNUstep/SOGo/>
+        <Directory /usr/lib/x86_64-linux-gnu/GNUstep/SOGo/>
             <IfVersion < 2.4>
                 Order deny,allow
                 Allow from all
@@ -709,7 +709,7 @@ SSLRandomSeed connect builtin
         SSLCertificateFile /ssl/apache-selfsigned.crt
         SSLCertificateKeyFile /ssl/apache-selfsigned.key
 
-        <Directory /usr/lib/GNUstep/SOGo/>
+        <Directory /usr/lib/x86_64-linux-gnu/GNUstep/SOGo/>
             <IfVersion < 2.4>
                 Order deny,allow
                 Allow from all
diff --git a/Apache/SOGo.conf b/Apache/SOGo.conf
index cfe62caf5..1d337048c 100644
--- a/Apache/SOGo.conf
+++ b/Apache/SOGo.conf
@@ -1,9 +1,9 @@
 Alias /SOGo.woa/WebServerResources/ \
-      /usr/lib/GNUstep/SOGo/WebServerResources/
+      /usr/lib/x86_64-linux-gnu/GNUstep/SOGo/WebServerResources/
 Alias /SOGo/WebServerResources/ \
-      /usr/lib/GNUstep/SOGo/WebServerResources/
+      /usr/lib/x86_64-linux-gnu/GNUstep/SOGo/WebServerResources/
 
-<Directory /usr/lib/GNUstep/SOGo/>
+<Directory /usr/lib/x86_64-linux-gnu/GNUstep/SOGo/>
     AllowOverride None
 
     <IfVersion < 2.4>
diff --git a/packaging/debian/sogo-dev.install b/packaging/debian/sogo-dev.install
index 43e84abbb..a3f28736c 100644
--- a/packaging/debian/sogo-dev.install
+++ b/packaging/debian/sogo-dev.install
@@ -1,2 +1,2 @@
-usr/include/GNUstep/*
+/usr/include/x86_64-linux-gnu/GNUstep/*
 usr/lib/sogo/lib*.so
diff --git a/packaging/debian/sogo.postinst b/packaging/debian/sogo.postinst
index 30e9238a6..6d4e04607 100644
--- a/packaging/debian/sogo.postinst
+++ b/packaging/debian/sogo.postinst
@@ -19,7 +19,7 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin
 case "$1" in
     configure)
           # update timestamp on imgs,css,js to let apache know the files changed
-          find /usr/lib/GNUstep/SOGo/WebServerResources  -exec touch {} \;
+          find /usr/lib/x86_64-linux-gnu/GNUstep/SOGo/WebServerResources  -exec touch {} \;
 
           # Make example scripts in /usr/share/doc/sogo/ executable
           # (they do not really belong there, we are violating Debian