diff --git a/screening/dist/admin/backup-config.sh b/screening/dist/admin/backup-config.sh
index bc8bdb81a10556afb936f17c1702dbb9a5a3c8bf..9cd00fa5767a9651fcc580523f1576835397f973 100755
--- a/screening/dist/admin/backup-config.sh
+++ b/screening/dist/admin/backup-config.sh
@@ -11,7 +11,7 @@ fi
 ROOT=$BASE/..
 
 cp $ROOT/openBIS-server/jetty/webapps/openbis/WEB-INF/classes/service.properties $CONF/service.properties
-cp $ROOT/datastore_server/etc/service.properties $CONF/datastore-service.properties
+cp $ROOT/datastore_server/etc/service.properties $CONF/datastore_servere-service.properties
 cp $ROOT/datastore_server/etc/tabular-data-graph.properties $CONF/tabular-data-graph.properties
 #cp $ROOT/datastore_server/etc/log.xml $CONF/log.xml
 cp $ROOT/openBIS-server/jetty/bin/passwd.sh $CONF/passwd.sh
diff --git a/screening/dist/admin/upgrade.sh b/screening/dist/admin/upgrade.sh
index b40170d0902460d5ae5b3d440c1d057306ee3ce0..fb0d987d389f424a495810e5ec128ab17196e8cd 100755
--- a/screening/dist/admin/upgrade.sh
+++ b/screening/dist/admin/upgrade.sh
@@ -36,7 +36,7 @@ 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
-cp -r $OLD_BIS/jetty/indices/ $ROOT_DIR/openBIS-server/jetty/
+cp -r $OLD_BIS/jetty/indices* $ROOT_DIR/openBIS-server/jetty/
 
 mv $ROOT_DIR/*.zip $BACKUP_DIR/
 $BASE/allup.sh
\ No newline at end of file