diff --git a/server/Dockerfile b/server/Dockerfile
index 89d28c8f..38d7be1e 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -58,8 +58,8 @@ RUN mkdir -p /var/lib/skillhub/storage && \
 
 USER app
 
-EXPOSE 8080
+EXPOSE 8000
 HEALTHCHECK --interval=10s --timeout=3s \
-  CMD wget -qO- http://localhost:8080/actuator/health || exit 1
+  CMD wget -qO- http://localhost:8000/actuator/health || exit 1
 
-ENTRYPOINT ["java", "-XX:MaxRAMPercentage=75.0", "-jar", "app.jar"]
+ENTRYPOINT ["java", "-XX:MaxRAMPercentage=75.0", "-Dserver.port=8000", "-jar", "app.jar"]
diff --git a/web/Dockerfile b/web/Dockerfile
index 86e001dc..3485713b 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -18,6 +18,6 @@ COPY nginx.conf.template /etc/nginx/templates/default.conf.template
 COPY runtime-config.js.template /usr/share/nginx/html/runtime-config.js.template
 COPY docker-entrypoint.d/30-runtime-config.sh /docker-entrypoint.d/30-runtime-config.sh
 RUN chmod +x /docker-entrypoint.d/30-runtime-config.sh
-EXPOSE 8080
+EXPOSE 8000
 HEALTHCHECK --interval=10s --timeout=3s \
-  CMD wget -qO- http://127.0.0.1:8080/nginx-health || exit 1
+  CMD wget -qO- http://127.0.0.1:8000/nginx-health || exit 1
diff --git a/web/nginx.conf.template b/web/nginx.conf.template
index 90ca5ea5..9899efb8 100644
--- a/web/nginx.conf.template
+++ b/web/nginx.conf.template
@@ -1,5 +1,5 @@
 server {
-    listen 8080;
+    listen 8000;
     server_name _;
     root /usr/share/nginx/html;
     index index.html;