diff --git a/docker-compose.yml b/docker-compose.yml
index 464f32d4c..e3301acf0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -59,7 +59,8 @@ services:
     depends_on:
       - hoppscotch-backend
     ports:
-      - "3100:8080"
+      - "3180:80"
+      - "3100:3100"
 
   # The service that spins up all 3 services at once in one container
   hoppscotch-aio:
@@ -150,4 +151,5 @@ services:
     depends_on:
       - hoppscotch-old-backend
     ports:
-      - "3100:8080"
+      - "3180:80"
+      - "3100:3100"
diff --git a/packages/hoppscotch-sh-admin/Dockerfile b/packages/hoppscotch-sh-admin/Dockerfile
index 9a1f98f38..f1224bf2b 100644
--- a/packages/hoppscotch-sh-admin/Dockerfile
+++ b/packages/hoppscotch-sh-admin/Dockerfile
@@ -18,4 +18,5 @@ WORKDIR /site
 COPY packages/hoppscotch-sh-admin/Caddyfile /etc/caddy/Caddyfile
 COPY --from=builder /usr/src/app/packages/hoppscotch-sh-admin/dist/ .
 
-EXPOSE 8080
+EXPOSE 80
+EXPOSE 3100
diff --git a/packages/hoppscotch-sh-admin/sh-admin-multiport-setup.Caddyfile b/packages/hoppscotch-sh-admin/sh-admin-multiport-setup.Caddyfile
index b47835dfe..ace652f6a 100644
--- a/packages/hoppscotch-sh-admin/sh-admin-multiport-setup.Caddyfile
+++ b/packages/hoppscotch-sh-admin/sh-admin-multiport-setup.Caddyfile
@@ -1,4 +1,4 @@
-:8080 {
+:80 :3100 {
   try_files {path} /
   root * /site/sh-admin-multiport-setup
   file_server
diff --git a/packages/hoppscotch-sh-admin/sh-admin-subpath-access.Caddyfile b/packages/hoppscotch-sh-admin/sh-admin-subpath-access.Caddyfile
index ecf61c2ee..d8097d82c 100644
--- a/packages/hoppscotch-sh-admin/sh-admin-subpath-access.Caddyfile
+++ b/packages/hoppscotch-sh-admin/sh-admin-subpath-access.Caddyfile
@@ -1,5 +1,5 @@
-:8080 {
-  try_files {path} /
+:80 :3100 {
+  try_files {path} /admin*
   root * /site/sh-admin-subpath-access
   file_server
 }
diff --git a/prod.Dockerfile b/prod.Dockerfile
index ed5491959..8f50679cb 100644
--- a/prod.Dockerfile
+++ b/prod.Dockerfile
@@ -55,7 +55,8 @@ COPY --from=sh_admin_builder /usr/src/app/packages/hoppscotch-sh-admin/dist /sit
 COPY --from=sh_admin_builder /usr/src/app/packages/hoppscotch-sh-admin/dist-subpath-access /site/sh-admin-subpath-access
 RUN apk add nodejs npm
 RUN npm install -g @import-meta-env/cli
-EXPOSE 8080
+EXPOSE 80
+EXPOSE 3100
 CMD ["/bin/sh", "-c", "node /usr/prod_run.mjs && caddy run --config /etc/caddy/Caddyfile --adapter caddyfile"]
 
 FROM backend as aio