diff --git a/baseimage/initializeBaseUbuntuImage.sh b/baseimage/initializeBaseUbuntuImage.sh
index 9fbc3f1e4..51e57e7c0 100644
--- a/baseimage/initializeBaseUbuntuImage.sh
+++ b/baseimage/initializeBaseUbuntuImage.sh
@@ -166,6 +166,8 @@ fi
 echo "==== Install nginx ===="
 apt-get -y install nginx-full
 [[ "$(nginx -v 2>&1)" == *"nginx/1.10."* ]] || die "Expecting nginx version to be 1.10.x"
+systemctl disable nginx
+systemctl stop nginx
 
 echo "==== Install build-essential ===="
 apt-get -y install build-essential rcconf
diff --git a/installer/src/server.js b/installer/src/server.js
index 0cdc914fd..d6ab5f156 100755
--- a/installer/src/server.js
+++ b/installer/src/server.js
@@ -166,7 +166,7 @@ function startSetupServer(callback) {
     gSetupServer = http.createServer(app);
     gSetupServer.on('error', console.error);
 
-    gSetupServer.listen(2021, '127.0.0.1', callback);
+    gSetupServer.listen(80, '0.0.0.0', callback);
 }
 
 function stopSetupServer(callback) {
diff --git a/setup/start.sh b/setup/start.sh
index cb2471d55..46665fd87 100755
--- a/setup/start.sh
+++ b/setup/start.sh
@@ -228,6 +228,7 @@ systemctl start cloudron.target
 sleep 2 # give systemd sometime to start the processes
 
 set_progress "85" "Reloading nginx"
+[[ systemctl is-enabled nginx ]] || systemctl enable nginx
 nginx -s reload
 
 set_progress "100" "Done"