diff --git a/docker-compose.yaml b/docker-compose.yaml
index 5e6c4cf..895a06e 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -10,15 +10,34 @@ services:
     ports:
       - 5432:5432
   calendso:
-    build: .
+    build:
+      context: .
+      dockerfile: Dockerfile
+      args:
+        - BASE_URL=${BASE_URL}
+        - NEXT_PUBLIC_APP_URL=${NEXT_PUBLIC_APP_URL}
+    image: calendso/docker
     restart: always
     ports:
       - 3000:3000
+    env_file: .env
+    environment:
+      - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DATABASE_HOST}/${POSTGRES_DB}
+    depends_on:
+      - db
+  studio:
+    image: calendso/docker
+    restart: always
+    ports:
       - 5555:5555
     env_file: .env
     environment:
       - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DATABASE_HOST}/${POSTGRES_DB}
     depends_on:
       - db
+    command:
+      - npx
+      - prisma
+      - studio
 volumes:
   database-data:
\ No newline at end of file