diff --git a/screening/dist/admin/install.sh b/screening/dist/admin/install.sh
index a65d6e35f81b33e2e1770f29534829103ad42481..599a1369fe7276ad8617f281ce1c7fb9bf6f095e 100755
--- a/screening/dist/admin/install.sh
+++ b/screening/dist/admin/install.sh
@@ -10,13 +10,15 @@ fi
 source $BASE/env
 
 ROOT_DIR=$BASE/../servers
-CONFIG=$BASE/../config
-BACKUP_DIR=$BASE/../old
+BACKUP_DIR=$BASE/../backup
+
+mkdir -p $ROOT_DIR
+mkdir -p $BACKUP_DIR
 
 echo Restoring empty screening database
 USER=`whoami`
 psql -U postgres -c "create database $OPENBIS_DB with owner $USER template = template0 encoding = 'UNICODE'"
-psql -U $USER -d $OPENBIS_DB -f $CONFIG/empty-screening-database.sql
+psql -U $USER -d $OPENBIS_DB -f $ROOT_DIR/empty-screening-database.sql
 
 echo Installing openBIS Datastore Server
 unzip $ROOT_DIR/datastore*.zip
@@ -25,8 +27,6 @@ echo Installing openBIS Application Server
 unzip $ROOT_DIR/openBIS-*.zip -d $ROOT_DIR
 $ROOT_DIR/openBIS-server/install.sh $ROOT_DIR/openBIS-server
 
-$BASE/restore-config-from-backup.sh $CONFIG
-
 mv $ROOT_DIR/*.zip $BACKUP_DIR/
 $BASE/bisup.sh
 sleep 20
diff --git a/screening/dist/admin/svn-update.sh b/screening/dist/admin/svn-update.sh
index d4d4b3b65c1995a191896ed1b3c82778c1808a38..043311ba1cbe3ceaa981cab5336dd49a8c440def 100755
--- a/screening/dist/admin/svn-update.sh
+++ b/screening/dist/admin/svn-update.sh
@@ -7,7 +7,7 @@ if [ ${BASE#/} == ${BASE} ]; then
     BASE="`pwd`/${BASE}"
 fi
 
-source $BASE/env
+alias rm='rm'
 
 SVN=svncisd.ethz.ch/repos/cisd/screening/trunk/dist/admin
 cd $BASE
diff --git a/screening/dist/admin/upgrade.sh b/screening/dist/admin/upgrade.sh
index cd8476c5f335a03e4e8fc3f3dfab1ccf160cfa21..2f7a551dff2e6a8a714d2adb4e292c9955105b31 100755
--- a/screening/dist/admin/upgrade.sh
+++ b/screening/dist/admin/upgrade.sh
@@ -10,7 +10,7 @@ fi
 source $BASE/env
 
 ROOT_DIR=$BASE/../servers
-BACKUP_DIR=$BASE/../old
+BACKUP_DIR=$BASE/../backup
 
 $BASE/alldown.sh