diff --git a/Dockerfile b/Dockerfile
index fcb81c2..97cd5d3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -120,10 +120,10 @@ COPY --from=builder /app/templates /app/templates
 COPY --from=builder /app/migrations /app/migrations
 COPY --from=builder /app/seeds /app/seeds
 
-# Copy admin panel standalone build
-COPY --from=admin-builder /app/.next/standalone /app/admin
-COPY --from=admin-builder /app/.next/static /app/admin/.next/static
-COPY --from=admin-builder /app/public /app/admin/public
+# Copy admin panel standalone build (Next.js recommended layout)
+COPY --from=admin-builder /app/.next/standalone/ /app/
+COPY --from=admin-builder /app/public /app/public
+COPY --from=admin-builder /app/.next/static /app/.next/static
 
 # Copy start script
 COPY start.sh /app/start.sh
diff --git a/start.sh b/start.sh
index 09cdab4..f312202 100644
--- a/start.sh
+++ b/start.sh
@@ -1,9 +1,13 @@
 #!/bin/bash
+set -e
 
 # Start Next.js admin panel in background on port 3000
-HOSTNAME="0.0.0.0" PORT=3000 node /app/admin/server.js &
+HOSTNAME="0.0.0.0" PORT=3000 node /app/server.js &
 
-# Wait for Next.js to start
+# Optional: small log so you know it started
+echo "Started Next.js admin on :3000" >&2
+
+# Wait a bit so proxy doesn't hit it before it's listening
 sleep 3
 
 # Start Go API (uses PORT env from Dokku, defaults to 5000)