diff --git a/stack_orchestrator/data/container-build/cerc-nextjs-base/Dockerfile b/stack_orchestrator/data/container-build/cerc-nextjs-base/Dockerfile
index c3c12cc6..5f9548ee 100644
--- a/stack_orchestrator/data/container-build/cerc-nextjs-base/Dockerfile
+++ b/stack_orchestrator/data/container-build/cerc-nextjs-base/Dockerfile
@@ -36,7 +36,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 # RUN su node -c "npm install -g <your-package-list-here>"
 
 # Expose port for http
-EXPOSE 3000
+EXPOSE 80
 
 COPY /scripts /scripts
 
diff --git a/stack_orchestrator/data/container-build/cerc-nextjs-base/scripts/start-serving-app.sh b/stack_orchestrator/data/container-build/cerc-nextjs-base/scripts/start-serving-app.sh
index 3692f2f6..bd254572 100755
--- a/stack_orchestrator/data/container-build/cerc-nextjs-base/scripts/start-serving-app.sh
+++ b/stack_orchestrator/data/container-build/cerc-nextjs-base/scripts/start-serving-app.sh
@@ -58,4 +58,4 @@ if [ "$CERC_NEXTJS_SKIP_GENERATE" != "true" ]; then
   fi
 fi
 
-$CERC_BUILD_TOOL start . -p ${CERC_LISTEN_PORT:-3000}
+$CERC_BUILD_TOOL start . -- -p ${CERC_LISTEN_PORT:-80}
diff --git a/stack_orchestrator/data/container-build/cerc-webapp-base/Dockerfile b/stack_orchestrator/data/container-build/cerc-webapp-base/Dockerfile
index 670c730a..331e04a1 100644
--- a/stack_orchestrator/data/container-build/cerc-webapp-base/Dockerfile
+++ b/stack_orchestrator/data/container-build/cerc-webapp-base/Dockerfile
@@ -49,7 +49,7 @@ COPY ./config.yml /config
 RUN yarn global add http-server
 
 # Expose port for http
-EXPOSE 3000
+EXPOSE 80
 
 # Default command sleeps forever so docker doesn't kill it
 CMD ["/scripts/start-serving-app.sh"]
diff --git a/stack_orchestrator/data/container-build/cerc-webapp-base/Dockerfile.webapp b/stack_orchestrator/data/container-build/cerc-webapp-base/Dockerfile.webapp
index 711eff25..bbe14939 100644
--- a/stack_orchestrator/data/container-build/cerc-webapp-base/Dockerfile.webapp
+++ b/stack_orchestrator/data/container-build/cerc-webapp-base/Dockerfile.webapp
@@ -8,4 +8,4 @@ RUN rm -rf node_modules build .next*
 RUN /scripts/build-app.sh /app build /data
 
 FROM cerc/webapp-base:local
-COPY --from=builder /data /data
+COPY --from=builder /data /data
\ No newline at end of file
diff --git a/stack_orchestrator/data/container-build/cerc-webapp-base/scripts/start-serving-app.sh b/stack_orchestrator/data/container-build/cerc-webapp-base/scripts/start-serving-app.sh
index 187c4928..365d05fb 100755
--- a/stack_orchestrator/data/container-build/cerc-webapp-base/scripts/start-serving-app.sh
+++ b/stack_orchestrator/data/container-build/cerc-webapp-base/scripts/start-serving-app.sh
@@ -4,7 +4,12 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
 fi
 
 CERC_WEBAPP_FILES_DIR="${CERC_WEBAPP_FILES_DIR:-/data}"
+CERC_ENABLE_CORS="${CERC_ENABLE_CORS:-false}"
+
+if [ "true" == "$CERC_ENABLE_CORS" ]; then
+  CERC_HTTP_EXTRA_ARGS="$CERC_HTTP_EXTRA_ARGS --cors"
+fi
 
 /scripts/apply-webapp-config.sh /config/config.yml ${CERC_WEBAPP_FILES_DIR}
 /scripts/apply-runtime-env.sh ${CERC_WEBAPP_FILES_DIR}
-http-server --cors -p 3000 ${CERC_WEBAPP_FILES_DIR}
+http-server $CERC_HTTP_EXTRA_ARGS -p ${CERC_LISTEN_PORT:-80} ${CERC_WEBAPP_FILES_DIR}
diff --git a/stack_orchestrator/deploy/webapp/run_webapp.py b/stack_orchestrator/deploy/webapp/run_webapp.py
index 4dbf234a..324e37b4 100644
--- a/stack_orchestrator/deploy/webapp/run_webapp.py
+++ b/stack_orchestrator/deploy/webapp/run_webapp.py
@@ -27,8 +27,7 @@ from dotenv import dotenv_values
 from stack_orchestrator import constants
 from stack_orchestrator.deploy.deployer_factory import getDeployer
 
-WEBAPP_PORT = 3000
-
+WEBAPP_PORT = 80
 
 @click.command()
 @click.option("--image", help="image to deploy", required=True)