diff --git a/openbis/dist/admin/backup-config.sh b/openbis/dist/admin/backup-config.sh
index 57fac7b0105c07a0ce0b1636b5064ff0244a815f..84558b9722136c3afe36fcf94b69d9e84a7b23e8 100755
--- a/openbis/dist/admin/backup-config.sh
+++ b/openbis/dist/admin/backup-config.sh
@@ -18,11 +18,12 @@ source $BASE/common-functions.sh
 ROOT=$BASE/../servers
 
 # -- 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/openbis/dist/admin/restore-config-from-backup.sh b/openbis/dist/admin/restore-config-from-backup.sh
index 039bbd8773506b8e7a82952e9e0da00addab06b2..08812e28482e6dc2fe84317b490d8814a33a956d 100755
--- a/openbis/dist/admin/restore-config-from-backup.sh
+++ b/openbis/dist/admin/restore-config-from-backup.sh
@@ -18,11 +18,11 @@ source $BASE/common-functions.sh
 ROOT=$BASE/../servers
 
 # -- 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/openbis_all/source/bash/has-config-changed.sh b/openbis_all/source/bash/has-config-changed.sh
index 336ba0a6ccb300fd98fc5a5b3c9f06bcecf25296..f5d69067ac5bb5167f3b18c27f860164f84540a2 100755
--- a/openbis_all/source/bash/has-config-changed.sh
+++ b/openbis_all/source/bash/has-config-changed.sh
@@ -27,8 +27,8 @@ function compare_configs {
 compare_configs $CONFIG_DIR/datastore_server-service.properties ~/sprint/datastore_server/etc/service.properties
 SERVER_DIR=~/sprint/openBIS-server/jetty
 WEBAPP_DIR=$SERVER_DIR/webapps/openbis
-compare_configs $CONFIG_DIR/service.properties $WEBAPP_DIR/WEB-INF/classes/service.properties
-compare_configs $CONFIG_DIR/openbis.conf $SERVER_DIR/bin/openbis.conf
+compare_configs $CONFIG_DIR/service.properties $SERVER_DIR/etc/classes/service.properties
+compare_configs $CONFIG_DIR/openbis.conf $SERVER_DIR/etc/openbis.conf
 compare_configs $CONFIG_DIR/images/ $WEBAPP_DIR/images/
 compare_configs $CONFIG_DIR/loginHeader.html $WEBAPP_DIR/loginHeader.html
 compare_configs $CONFIG_DIR/help.html $WEBAPP_DIR/help.html
diff --git a/openbis_all/source/bash/service_properties_backup.sh b/openbis_all/source/bash/service_properties_backup.sh
index 74dc5d452871ce4ee8b5fe4ce022ccada8223c92..db691f25cb9e166dd29b2a94839160fad0c82217 100644
--- a/openbis_all/source/bash/service_properties_backup.sh
+++ b/openbis_all/source/bash/service_properties_backup.sh
@@ -14,7 +14,7 @@ export DSS_SP=datastore_server-service.properties
 
 
 export CONFIG_DIR=~openbis/config
-export PRODUCTIVE=~openbis/sprint/openBIS-server/jetty/webapps/openbis/WEB-INF/classes/service.properties
+export PRODUCTIVE=~openbis/sprint/openBIS-server/jetty/etc/service.properties
 export DSS_PRODUCTIVE=~openbis/sprint/datastore_server/etc/service.properties
 
 export MAIL_LIST="manuel.kohler@bsse.ethz.ch"
diff --git a/screening/dist/tarball/installer/bin/backup-config.sh b/screening/dist/tarball/installer/bin/backup-config.sh
index 2d65840f653c33df8cc830893bedda958950f4be..d4ee602567be9132dd29f6476780ececea11c1e9 100755
--- a/screening/dist/tarball/installer/bin/backup-config.sh
+++ b/screening/dist/tarball/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/screening/dist/tarball/installer/bin/restore-config-from-backup.sh b/screening/dist/tarball/installer/bin/restore-config-from-backup.sh
index cf456fb5c4f6206cb63f856ba5c6cc7c9bc38625..a2ea71b60da005071b3a6c93e4d0c0808b4a30d2 100755
--- a/screening/dist/tarball/installer/bin/restore-config-from-backup.sh
+++ b/screening/dist/tarball/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