diff --git a/.env.sample b/.env.sample
index ef3f5da..c4de2de 100644
--- a/.env.sample
+++ b/.env.sample
@@ -1,6 +1,6 @@
-TYPE=calendso
+TYPE=cal
 
-DOMAIN=calendso.example.com
+DOMAIN=cal.example.com
 
 ## Domain aliases
 #EXTRA_DOMAINS=', `www.calendso.example.com`'
diff --git a/compose.yml b/compose.yml
index 3f65de3..8ce6838 100644
--- a/compose.yml
+++ b/compose.yml
@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: 3wordchant/calendso:latest
+    image: calcom.docker.scarf.sh/calcom/cal.com
     networks:
       - proxy
       - backend
@@ -14,8 +14,7 @@ services:
       - POSTGRES_PASSWORD_FILE=/run/secrets/db_password
       - POSTGRES_DB=calendso
       - POSTGRES_HOST=db
-      - "BASE_URL=${DOMAIN}"
-      - "NEXTAUTH_URL=${DOMAIN}"
+      - "NEXT_PUBLIC_WEBAPP_URL=https://${DOMAIN}"
       - NEXT_PUBLIC_TELEMETRY_KEY
       - MS_GRAPH_CLIENT_ID
       - ZOOM_CLIENT_ID
@@ -82,6 +81,9 @@ secrets:
   db_password:
     external: true
     name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
+  nextauth_secret:
+    external: true
+    name: ${STACK_NAME}_nextauth_secret_${SECRET_NEXTAUTH_SECRET_VERSION}
 
 configs:
   entrypoint_conf:
diff --git a/entrypoint.sh b/entrypoint.sh
index 110cb5c..26f599a 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -30,6 +30,7 @@ load_vars() {
 	file_env "GOOGLE_API_CREDENTIALS"
 	file_env "ZOOM_CLIENT_SECRET"
 	file_env "EMAIL_SERVER_PASSWORD"
+	file_env "NEXTAUTH_SECRET"
 
 	export "DATABASE_URL=postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOST:5432/$POSTGRES_DB"
 }
@@ -44,4 +45,4 @@ main
 
 # 3wc: upstream CMD
 # https://github.com/calendso/docker/blob/main/Dockerfile
-/app/scripts/start.sh
+/calcom/scripts/start.sh