diff --git a/docker-compose.yml b/docker-compose.yml
index 18dda74b6..6dbc013d3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -60,7 +60,7 @@ services:
     depends_on:
       - hoppscotch-backend
     ports:
-      - "3180:80"
+      - "3280:80"
       - "3100:3100"
 
   # The service that spins up all 3 services at once in one container
@@ -139,8 +139,7 @@ services:
     depends_on:
       - hoppscotch-old-backend
     ports:
-      - "3080:80"
-      - "3000:3000"
+      - "3000:8080"
 
   hoppscotch-old-sh-admin:
     container_name: hoppscotch-old-sh-admin
@@ -152,5 +151,4 @@ services:
     depends_on:
       - hoppscotch-old-backend
     ports:
-      - "3180:80"
-      - "3100:3100"
+      - "3100:8080"
diff --git a/packages/hoppscotch-selfhost-web/Caddyfile b/packages/hoppscotch-selfhost-web/Caddyfile
index fe55cbe4a..4d9382b53 100644
--- a/packages/hoppscotch-selfhost-web/Caddyfile
+++ b/packages/hoppscotch-selfhost-web/Caddyfile
@@ -1,4 +1,4 @@
-:80 :3000 {
+:8080 {
   try_files {path} /
   root * /site
   file_server
diff --git a/packages/hoppscotch-selfhost-web/Dockerfile b/packages/hoppscotch-selfhost-web/Dockerfile
index beceb5685..b43ae334d 100644
--- a/packages/hoppscotch-selfhost-web/Dockerfile
+++ b/packages/hoppscotch-selfhost-web/Dockerfile
@@ -18,5 +18,4 @@ WORKDIR /site
 COPY packages/hoppscotch-selfhost-web/Caddyfile /etc/caddy/Caddyfile
 COPY --from=builder /usr/src/app/packages/hoppscotch-selfhost-web/dist/ .
 
-EXPOSE 80
-EXPOSE 3000
+EXPOSE 8080
diff --git a/packages/hoppscotch-selfhost-web/aio.Caddyfile b/packages/hoppscotch-selfhost-web/aio.Caddyfile
new file mode 100644
index 000000000..a1e0a4b8b
--- /dev/null
+++ b/packages/hoppscotch-selfhost-web/aio.Caddyfile
@@ -0,0 +1,5 @@
+:80 :3000 {
+try_files {path} /
+root * /site
+file_server
+}
diff --git a/packages/hoppscotch-sh-admin/Caddyfile b/packages/hoppscotch-sh-admin/Caddyfile
new file mode 100644
index 000000000..4d9382b53
--- /dev/null
+++ b/packages/hoppscotch-sh-admin/Caddyfile
@@ -0,0 +1,5 @@
+:8080 {
+  try_files {path} /
+  root * /site
+  file_server
+}
diff --git a/packages/hoppscotch-sh-admin/Dockerfile b/packages/hoppscotch-sh-admin/Dockerfile
index f1224bf2b..9a1f98f38 100644
--- a/packages/hoppscotch-sh-admin/Dockerfile
+++ b/packages/hoppscotch-sh-admin/Dockerfile
@@ -18,5 +18,4 @@ WORKDIR /site
 COPY packages/hoppscotch-sh-admin/Caddyfile /etc/caddy/Caddyfile
 COPY --from=builder /usr/src/app/packages/hoppscotch-sh-admin/dist/ .
 
-EXPOSE 80
-EXPOSE 3100
+EXPOSE 8080
diff --git a/prod.Dockerfile b/prod.Dockerfile
index 622dce222..d2db84742 100644
--- a/prod.Dockerfile
+++ b/prod.Dockerfile
@@ -36,7 +36,7 @@ RUN pnpm run generate
 FROM caddy:2-alpine as app
 WORKDIR /site
 COPY --from=fe_builder /usr/src/app/packages/hoppscotch-selfhost-web/prod_run.mjs /usr
-COPY --from=fe_builder /usr/src/app/packages/hoppscotch-selfhost-web/Caddyfile /etc/caddy/Caddyfile
+COPY --from=fe_builder /usr/src/app/packages/hoppscotch-selfhost-web/aio.Caddyfile /etc/caddy/Caddyfile
 COPY --from=fe_builder /usr/src/app/packages/hoppscotch-selfhost-web/dist/ .
 RUN apk add nodejs npm
 RUN npm install -g @import-meta-env/cli
@@ -61,7 +61,7 @@ RUN apk add nodejs npm
 RUN npm install -g @import-meta-env/cli
 EXPOSE 80
 EXPOSE 3100
-CMD ["/bin/sh", "-c", "node /usr/prod_run.mjs && caddy run --config /etc/caddy/Caddyfile --adapter caddyfile"]
+CMD ["node","/usr/prod_run.mjs"]
 
 FROM backend as aio
 RUN apk add caddy tini
@@ -80,3 +80,6 @@ EXPOSE 8080
 EXPOSE 3000
 EXPOSE 3100
 EXPOSE 80
+
+
+