diff --git a/apps/dispatch/Dockerfile b/apps/dispatch/Dockerfile
index d1b26014..164f38b2 100644
--- a/apps/dispatch/Dockerfile
+++ b/apps/dispatch/Dockerfile
@@ -7,33 +7,8 @@ RUN corepack enable && corepack prepare pnpm@latest --activate
 
 RUN pnpm add -g turbo@^2.5
 
-
-ARG NEXTAUTH_SECRET
-ARG NEXTAUTH_HUB_SECRET
-ARG NEXTAUTH_COOKIE_PREFIX
-ARG NEXT_PUBLIC_DISPATCH_SERVER_URL
-ARG NEXTAUTH_URL
-ARG NEXT_PUBLIC_HUB_URL
-ARG NEXT_PUBLIC_PUBLIC_URL
-ARG NEXT_PUBLIC_SERVICE_ID
 ARG DATABASE_URL
-ARG NEXT_PUBLIC_LIVEKIT_URL
-ARG LIVEKIT_API_KEY
-ARG LIVEKIT_API_SECRET
-
-ENV NEXTAUTH_SECRET=${NEXTAUTH_SECRET}
-ENV NEXTAUTH_HUB_SECRET=${NEXTAUTH_HUB_SECRET}
-ENV NEXTAUTH_COOKIE_PREFIX=${NEXTAUTH_COOKIE_PREFIX}
-ENV NEXT_PUBLIC_DISPATCH_SERVER_URL=${NEXT_PUBLIC_DISPATCH_SERVER_URL}
-ENV NEXTAUTH_URL=${NEXTAUTH_URL}
-ENV NEXT_PUBLIC_HUB_URL=${NEXT_PUBLIC_HUB_URL}
-ENV NEXT_PUBLIC_PUBLIC_URL=${NEXT_PUBLIC_PUBLIC_URL}
-ENV NEXT_PUBLIC_SERVICE_ID=${NEXT_PUBLIC_SERVICE_ID}
 ENV DATABASE_URL=${DATABASE_URL}
-ENV NEXT_PUBLIC_LIVEKIT_URL=${NEXT_PUBLIC_LIVEKIT_URL}
-ENV LIVEKIT_API_KEY=${LIVEKIT_API_KEY}
-ENV LIVEKIT_API_SECRET=${LIVEKIT_API_SECRET}
-
 
 FROM base AS builder
 RUN apk update
@@ -60,8 +35,7 @@ RUN pnpm install --frozen-lockfile
 COPY --from=builder /usr/app/out/full/ .
 
 COPY --from=builder /usr/app/.env.prod ./apps/dispatch/.env
-RUN cat ./apps/dispatch/.env
-RUN ls ./apps/dispatch -alR
+COPY --from=builder /usr/app/.env.prod ./packages/databse/.env
 
 RUN turbo run build
 
@@ -75,9 +49,9 @@ USER nextjs
 
 # Automatically leverage output traces to reduce image size
 # https://nextjs.org/docs/advanced-features/output-file-tracing
-COPY --from=installer --chown=nextjs:nodejs /usr/app/apps/dispatch/ ./
+COPY --from=installer --chown=nextjs:nodejs /usr/app/ ./
 
 # Expose the application port
-EXPOSE 3001
+EXPOSE 3000
 
-CMD ["pnpm", "run", "start"]
\ No newline at end of file
+CMD ["pnpm", "--dir", "apps/dispatch", "run", "start"]
\ No newline at end of file
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 18c68287..4b7bcb77 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -5,26 +5,24 @@ services:
       dockerfile: ./apps/dispatch/Dockerfile
       args:
         # alle Variablen aus .env.prod automatisch übernehmen
-        NEXTAUTH_SECRET: ${NEXTAUTH_SECRET}
-        NEXTAUTH_HUB_SECRET: ${NEXTAUTH_HUB_SECRET}
-        NEXTAUTH_COOKIE_PREFIX: ${NEXTAUTH_COOKIE_PREFIX}
-        NEXT_PUBLIC_DISPATCH_SERVER_URL: ${NEXT_PUBLIC_DISPATCH_SERVER_URL}
-        NEXTAUTH_URL: ${NEXTAUTH_URL}
-        NEXT_PUBLIC_HUB_URL: ${NEXT_PUBLIC_HUB_URL}
-        NEXT_PUBLIC_PUBLIC_URL: ${NEXT_PUBLIC_PUBLIC_URL}
-        NEXT_PUBLIC_SERVICE_ID: ${NEXT_PUBLIC_SERVICE_ID}
+        # NEXTAUTH_SECRET: ${NEXTAUTH_SECRET}
+        # NEXTAUTH_HUB_SECRET: ${NEXTAUTH_HUB_SECRET}
+        # NEXTAUTH_COOKIE_PREFIX: ${NEXTAUTH_COOKIE_PREFIX}
+        # NEXT_PUBLIC_DISPATCH_SERVER_URL: ${NEXT_PUBLIC_DISPATCH_SERVER_URL}
+        # NEXTAUTH_URL: ${NEXTAUTH_URL}
+        # NEXT_PUBLIC_HUB_URL: ${NEXT_PUBLIC_HUB_URL}
+        # NEXT_PUBLIC_PUBLIC_URL: ${NEXT_PUBLIC_PUBLIC_URL}
+        # NEXT_PUBLIC_SERVICE_ID: ${NEXT_PUBLIC_SERVICE_ID}
         DATABASE_URL: ${DATABASE_URL}
-        NEXT_PUBLIC_LIVEKIT_URL: ${NEXT_PUBLIC_LIVEKIT_URL}
-        LIVEKIT_API_KEY: ${LIVEKIT_API_KEY}
-        LIVEKIT_API_SECRET: ${LIVEKIT_API_SECRET}
+      # NEXT_PUBLIC_LIVEKIT_URL: ${NEXT_PUBLIC_LIVEKIT_URL}
+      # LIVEKIT_API_KEY: ${LIVEKIT_API_KEY}
+      # LIVEKIT_API_SECRET: ${LIVEKIT_API_SECRET}
     container_name: dispatch
     ports:
-      - "3001:3001"
+      - "3000:3000"
     env_file:
       - ./apps/dispatch/.env
-    depends_on:
-      postgres:
-        condition: service_healthy
+
     networks:
       - postgres_network
   postgres:
diff --git a/packages/database/prisma/schema/schema.prisma b/packages/database/prisma/schema/schema.prisma
index 168e021c..0d714da9 100644
--- a/packages/database/prisma/schema/schema.prisma
+++ b/packages/database/prisma/schema/schema.prisma
@@ -5,9 +5,8 @@
 // Try Prisma Accelerate: https://pris.ly/cli/accelerate-init
 
 generator client {
-  provider        = "prisma-client-js"
-  previewFeatures = ["prismaSchemaFolder"]
-  output          = "../../generated/client"
+  provider = "prisma-client-js"
+  output   = "../../generated/client"
 }
 
 generator zod {