diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
diff --git a/setup.sh b/setup.sh
index aad3497143777d878a62eac7f0b00ac0e1c5c888..817ec84815edd1283dcdee043774b838850b1ab9 100755
--- a/setup.sh
+++ b/setup.sh
@@ -6,10 +6,8 @@
 docker-compose down
 docker-compose rm -f
 # Clear existing data
-sudo rm -Rf ./nominatimdata
-mkdir nominatimdata
-sudo rm -Rf ./photondata
-mkdir photondata
+sudo rm -Rf ./nominatimdata && mkdir nominatimdata
+sudo rm -Rf ./photondata && mkdir photondata
 
 # Build the image
 cd nominatim-3.1
diff --git a/start.sh b/start.sh
index 09aab7f2d8bd6f364af371d039b6b06e971deeee..06993a50a72921f88a969ce6565a125a1fafa2ec 100755
--- a/start.sh
+++ b/start.sh
@@ -8,21 +8,20 @@ docker-compose up -d
 ## Set up nominatim updates ###
 
 docker exec -it photon-deploy_nominatim_1 sudo -u nominatim ./src/build/utils/update.php --init-updates
+docker exec -it photon-deploy_nominatim_1 sudo -u nominatim ./src/build/utils/update.php --import-osmosis-all &
 
 ### Start continuous update ###
 
 while true; do
 	starttime=$(date +%s)
 
-	docker exec -it photon-deploy_nominatim_1 sudo -u nominatim ./src/build/utils/update.php --import-osmosis
-
 	curl http://localhost:2322/nominatim-update
 
-	# sleep a bit if updates take less than a minute
+	# sleep a bit if updates take less than 5 minutes
 	endtime=$(date +%s)
 	elapsed=$((endtime - starttime))
-	if [[ $elapsed -lt 60 ]]; then
-		sleepy=$((60 - $elapsed))
+	if [[ $elapsed -lt 300 ]]; then
+		sleepy=$((300 - $elapsed))
 		echo "Sleeping for ${sleepy}s..."
 		sleep $sleepy
 	fi