diff --git a/hosting/single/Dockerfile b/hosting/single/Dockerfile
index eb959c5e21..208416eb8c 100644
--- a/hosting/single/Dockerfile
+++ b/hosting/single/Dockerfile
@@ -15,7 +15,7 @@ ENV SELF_HOSTED=1
 ENV CLUSTER_PORT=10000
 ENV REDIS_PASSWORD=budibase
 ENV ARCHITECTURE=amd
-ENV SERVER_PORT=4001
+ENV APP_PORT=4001
 ENV WORKER_PORT=4002
 
 RUN apt-get update
diff --git a/packages/server/src/app.ts b/packages/server/src/app.ts
index 5ee4e8772f..0c0ef68ad9 100644
--- a/packages/server/src/app.ts
+++ b/packages/server/src/app.ts
@@ -76,7 +76,7 @@ server.on("close", async () => {
   await redis.shutdown()
 })
 
-module.exports = server.listen(env.PORT || 4001, async () => {
+module.exports = server.listen(env.PORT || 0, async () => {
   console.log(`Budibase running on ${JSON.stringify(server.address())}`)
   env._set("PORT", server.address().port)
   eventEmitter.emitPort(env.PORT)