diff --git a/installation/resource/installer/bin/backup-config.sh b/installation/resource/installer/bin/backup-config.sh
index 7871ac491c8b65a2679886f1c81abf52b3b44c47..1bf7f9ba566a52070263e6ee17a8f69dd2eea216 100755
--- a/installation/resource/installer/bin/backup-config.sh
+++ b/installation/resource/installer/bin/backup-config.sh
@@ -20,11 +20,12 @@ ROOT=$BASE/../servers
 cp $BASE/env $CONF/
 
 # -- AS
-cp $ROOT/openBIS-server/jetty/webapps/openbis/WEB-INF/classes/service.properties $CONF/
+cp $ROOT/openBIS-server/jetty/etc/service.properties $CONF/
 cp $ROOT/openBIS-server/jetty/etc/log.xml $CONF/
-cp $ROOT/openBIS-server/jetty/bin/openbis.conf $CONF/
+copyIfExists $ROOT/openBIS-server/jetty/bin/openbis.conf $CONF/
+copyIfExists $ROOT/openBIS-server/jetty/etc/openbis.conf $CONF/
 cp $ROOT/openBIS-server/jetty/etc/jetty.xml $CONF/
-cp $ROOT/openBIS-server/jetty/bin/jetty.properties $CONF/
+cp $ROOT/openBIS-server/jetty/etc/jetty.properties $CONF/
 cp $ROOT/openBIS-server/jetty/webapps/openbis/welcomePageSimple.html $CONF/
 # not always present
 copyIfExists $ROOT/openBIS-server/jetty/etc/openBIS.keystore $CONF/.keystore 
diff --git a/installation/resource/installer/bin/restore-config-from-backup.sh b/installation/resource/installer/bin/restore-config-from-backup.sh
index c6b2418ee7da5956ac94c685289327ad2f6d6a18..9ef31fe61a4b437f325c4cf78bb591e554046839 100755
--- a/installation/resource/installer/bin/restore-config-from-backup.sh
+++ b/installation/resource/installer/bin/restore-config-from-backup.sh
@@ -27,11 +27,11 @@ if [ -e "$CONF/env" ]; then
 fi
 
 # -- AS
-cp $CONF/service.properties $ROOT/openBIS-server/jetty/webapps/openbis/WEB-INF/classes/
+cp $CONF/service.properties $ROOT/openBIS-server/jetty/etc/
 cp $CONF/log.xml $ROOT/openBIS-server/jetty/etc/ 
-cp $CONF/openbis.conf $ROOT/openBIS-server/jetty/bin/
+cp $CONF/openbis.conf $ROOT/openBIS-server/jetty/etc/
 cp $CONF/jetty.xml $ROOT/openBIS-server/jetty/etc/
-cp $CONF/jetty.properties $ROOT/openBIS-server/jetty/bin/
+cp $CONF/jetty.properties $ROOT/openBIS-server/jetty/etc/
 cp $CONF/welcomePageSimple.html $ROOT/openBIS-server/jetty/webapps/openbis/ 
 # not always present
 copyIfExists $CONF/.keystore $ROOT/openBIS-server/jetty/etc/openBIS.keystore
diff --git a/screening/dist/admin/backup-config.sh b/screening/dist/admin/backup-config.sh
index e0003563c4d492ca3358de21206e68e659c2648a..fba9fd403c82e79c79697ac8928c579442ba263f 100755
--- a/screening/dist/admin/backup-config.sh
+++ b/screening/dist/admin/backup-config.sh
@@ -22,7 +22,8 @@ cp $BASE/env $CONF/
 # -- AS
 cp $ROOT/openBIS-server/jetty/etc/service.properties $CONF/
 cp $ROOT/openBIS-server/jetty/etc/log.xml $CONF/
-cp $ROOT/openBIS-server/jetty/bin/openbis.conf $CONF/
+copyIfExists $ROOT/openBIS-server/jetty/bin/openbis.conf $CONF/
+copyIfExists $ROOT/openBIS-server/jetty/etc/openbis.conf $CONF/
 cp $ROOT/openBIS-server/jetty/etc/jetty.xml $CONF/
 cp $ROOT/openBIS-server/jetty/etc/jetty.properties $CONF/
 cp $ROOT/openBIS-server/jetty/webapps/openbis/welcomePageSimple.html $CONF/
diff --git a/screening/dist/admin/restore-config-from-backup.sh b/screening/dist/admin/restore-config-from-backup.sh
index 0fb435302f2ca05be9c79d2085fc1dd39beabd92..b938de0117502d4f2460a2a4f5ec4543d2eb6854 100755
--- a/screening/dist/admin/restore-config-from-backup.sh
+++ b/screening/dist/admin/restore-config-from-backup.sh
@@ -29,7 +29,7 @@ fi
 # -- AS
 cp $CONF/service.properties $ROOT/openBIS-server/jetty/etc/
 cp $CONF/log.xml $ROOT/openBIS-server/jetty/etc/ 
-cp $CONF/openbis.conf $ROOT/openBIS-server/jetty/bin/
+cp $CONF/openbis.conf $ROOT/openBIS-server/jetty/etc/
 cp $CONF/jetty.xml $ROOT/openBIS-server/jetty/etc/
 cp $CONF/jetty.properties $ROOT/openBIS-server/jetty/etc/
 cp $CONF/welcomePageSimple.html $ROOT/openBIS-server/jetty/webapps/openbis/