diff --git a/packages/reservation-platform/Containerfile b/packages/reservation-platform/Containerfile
index 5f4e1f5..fba812a 100644
--- a/packages/reservation-platform/Containerfile
+++ b/packages/reservation-platform/Containerfile
@@ -6,7 +6,6 @@ RUN mkdir -p /usr/src/app
 # Set environment variables
 ENV PORT 3000
 ENV NEXT_TELEMETRY_DISABLED=1
-ENV RUNTIME_ENVIRONMENT=development
 ENV OAUTH_CLIENT_ID=client_id
 ENV OAUTH_CLIENT_SECRET=client_secret
 
@@ -25,7 +24,7 @@ RUN pnpm install
 # Copy the rest of the application code
 COPY . /usr/src/app
 
-# Initialize Database
+# Initialize Database, if it not already exists
 RUN pnpm run db
 
 # Build the application
@@ -34,4 +33,4 @@ RUN pnpm run build
 EXPOSE 3000
 
 # Start the application
-CMD ["pnpm", "start"]
+CMD ["/bin/sh", "-c", "if [ ! -f ./db/sqlite.db ]; then pnpm db; fi && pnpm start"]
\ No newline at end of file
diff --git a/packages/reservation-platform/compose.yml b/packages/reservation-platform/compose.yml
index f3b4729..75ee42d 100644
--- a/packages/reservation-platform/compose.yml
+++ b/packages/reservation-platform/compose.yml
@@ -6,8 +6,7 @@ services:
     ports:
       - "3000:3000"
     environment:
-      NODE_ENV: development
       OAUTH_CLIENT_ID: 521f431132202fd5225d
       OAUTH_CLIENT_SECRET: 12084446d467ad4bce75ace54d881a8287321d32
-    #volumes:
-    #  - ./docker-test/db:/usr/src/app/db
+    volumes:
+      - /tmp/docker-test-db:/usr/src/app/db