diff --git a/.env.example b/apps/builder/.env.local.example
similarity index 81%
rename from .env.example
rename to apps/builder/.env.local.example
index eceef3a36..88dd2f8ff 100644
--- a/.env.example
+++ b/apps/builder/.env.local.example
@@ -1,6 +1,6 @@
-DATABASE_URL=postgresql://username:password@host:5450/typebot?schema=public
+DATABASE_URL=postgresql://postgres:@localhost:5432/typebot
 
-SECRET=q3t6v9y$B&E)H@McQfTjWnZr4u7x!z%C # 256-bits secret (can be generated here: https://www.allkeysgenerator.com/Random/Security-Encryption-Key-Generator.aspx)
+SECRET=q3t6v9y$B&E)H@McQfTjWnZr4u7x!z%C #256-bits secret (can be generated here: https://www.allkeysgenerator.com/Random/Security-Encryption-Key-Generator.aspx)
 NEXTAUTH_URL=http://localhost:3000
 
 # Used for email auth and email notifications
@@ -47,3 +47,5 @@ STRIPE_WEBHOOK_SECRET=
 
 # (Optional) Used for GIF search
 NEXT_PUBLIC_GIPHY_API_KEY=
+
+NEXT_PUBLIC_VIEWER_HOST=http://localhost:3001
diff --git a/apps/landing-page/next.config.js b/apps/landing-page/next.config.js
index 872a09615..130149c5d 100644
--- a/apps/landing-page/next.config.js
+++ b/apps/landing-page/next.config.js
@@ -61,8 +61,12 @@ module.exports = withBundleAnalyzer({
       ],
       fallback: [
         {
-          source: '/:user*',
-          destination: process.env.NEXT_PUBLIC_VIEWER_HOST + '/:user*',
+          source: '/:typebotId*',
+          destination: process.env.NEXT_PUBLIC_VIEWER_HOST + '/:typebotId*',
+        },
+        {
+          source: '/api/:path*',
+          destination: process.env.NEXT_PUBLIC_VIEWER_HOST + '/api/:path*',
         },
       ],
     }
diff --git a/apps/landing-page/package.json b/apps/landing-page/package.json
index d5fa1490e..f6cd03a80 100644
--- a/apps/landing-page/package.json
+++ b/apps/landing-page/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "typebot.io",
+  "name": "landing-page",
   "version": "1.0.0",
   "scripts": {
     "dev": "next dev -p 3002",
diff --git a/apps/viewer/.env.local.example b/apps/viewer/.env.local.example
new file mode 100644
index 000000000..f576b45de
--- /dev/null
+++ b/apps/viewer/.env.local.example
@@ -0,0 +1,3 @@
+NEXT_PUBLIC_VIEWER_HOST=http://localhost:3001
+DATABASE_URL=postgresql://postgres:@localhost:5432/typebot
+
diff --git a/docker-compose.yml b/docker-compose.yml
index a6b993f5c..9920f8215 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,8 @@ services:
     volumes:
       - db_data:/var/lib/postgresql/data
     environment:
-      POSTGRES_PASSWORD: ""
+      POSTGRES_DB: 'typebot'
+      POSTGRES_PASSWORD: ''
       POSTGRES_HOST_AUTH_METHOD: trust
 volumes:
   db_data:
diff --git a/package.json b/package.json
index 851852a31..c381b3621 100644
--- a/package.json
+++ b/package.json
@@ -9,8 +9,8 @@
   "scripts": {
     "docker:up": "docker-compose up -d",
     "db:nuke": "docker-compose down --volumes --remove-orphans",
-    "dev": "dotenv -e .env yarn docker:up && dotenv -e .env turbo run dev --parallel",
-    "build": "dotenv -e .env turbo run build",
+    "dev": "yarn docker:up && turbo run dev --parallel",
+    "build": "yarn docker:up && turbo run build",
     "test:builder": "cd apps/builder && yarn test",
     "lint": "turbo run lint"
   },
diff --git a/packages/db/.env.example b/packages/db/.env.example
new file mode 100644
index 000000000..1f7804203
--- /dev/null
+++ b/packages/db/.env.example
@@ -0,0 +1 @@
+DATABASE_URL=postgresql://postgres:@localhost:5432/typebot
diff --git a/packages/db/package.json b/packages/db/package.json
index 0934f73fe..68998a46e 100644
--- a/packages/db/package.json
+++ b/packages/db/package.json
@@ -13,7 +13,7 @@
     "@prisma/client": "^3.8.1"
   },
   "scripts": {
-    "dev": "yarn prisma db push && BROWSER=none yarn prisma studio",
+    "dev": "dotenv -e .env yarn prisma db push && BROWSER=none yarn prisma studio",
     "build": "yarn migration:push",
     "migration:push": "dotenv -e ../../.env yarn prisma db push",
     "migration:create": "dotenv -e ../../.env yarn prisma migrate dev",