diff --git a/blueprints/stack-auth/docker-compose.yml b/blueprints/stack-auth/docker-compose.yml
index 46ab7de..04db5f3 100644
--- a/blueprints/stack-auth/docker-compose.yml
+++ b/blueprints/stack-auth/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.8'
 
 services:
-  db:
+  stack-auth-db:
     image: postgres:latest
     container_name: stack-auth-db
     environment:
@@ -13,7 +13,7 @@ services:
     volumes:
       - stack-auth-db-data:/var/lib/postgresql/data
 
-  api:
+  stack-auth-api:
     image: stackauth/server:latest
     container_name: stack-auth-api
     environment:
@@ -22,18 +22,18 @@ services:
       - POSTGRES_DB
       - NEXT_PUBLIC_STACK_API_URL
     depends_on:
-      - db
+      - stack-auth-db
     ports:
       - "8102:8102"
     command: pnpm start:backend
 
-  dashboard:
+  stack-auth-dashboard:
     image: stackauth/dashboard:latest
     container_name: stack-auth-dashboard
     environment:
       - NEXT_PUBLIC_STACK_API_URL
     depends_on:
-      - api
+      - stack-auth-api
     ports:
       - "8101:8101"
 
diff --git a/blueprints/stack-auth/template.toml b/blueprints/stack-auth/template.toml
index 46d1f90..6285e14 100644
--- a/blueprints/stack-auth/template.toml
+++ b/blueprints/stack-auth/template.toml
@@ -1,23 +1,15 @@
 [variables]
 main_domain = "${domain}"               
 postgres_password = "${password:32}"     
-stack_auth_api_url = "http://${main_domain}:8102"
-stack_auth_dashboard_url = "http://${main_domain}:8101"
+stack_auth_api_url = "${main_domain}:8102"
+stack_auth_dashboard_url = "${main_domain}:8101"
 stack_auth_postgres_host = "db"
 
-[config]
-
-[[config.domains]]
-serviceName = "stack-auth-db"
-port = 5432
-host = "${stack_auth_postgres_host}"
-path = "/"           
-
-env = [
-    "POSTGRES_USER=postgres",
-    "POSTGRES_PASSWORD=${postgres_password}",
-    "POSTGRES_DB=stackframe",
-]
+[config.env]
+POSTGRES_USER="postgres"
+POSTGRES_PASSWORD="${postgres_password}"
+POSTGRES_DB="stackframe"
+NEXT_PUBLIC_STACK_API_URL="${stack_auth_api_url}"
 
 [[config.domains]]
 serviceName = "stack-auth-api"
@@ -25,19 +17,8 @@ port = 8102
 host = "${stack_auth_api_url}"
 path = "/"                        
 
-env = [
-    "POSTGRES_USER=postgres",
-    "POSTGRES_PASSWORD=${postgres_password}",
-    "POSTGRES_DB=stackframe",
-    "NEXT_PUBLIC_STACK_API_URL=${stack_auth_api_url}",
-]
-
 [[config.domains]]
 serviceName = "stack-auth-dashboard"
 port = 8101
 host = "${stack_auth_dashboard_url}"
-path = "/"
-
-env = [
-    "NEXT_PUBLIC_STACK_API_URL=${stack_auth_api_url}",
-]
+path = "/"
\ No newline at end of file