diff --git a/blueprints/uptimekit/docker-compose.yml b/blueprints/uptimekit/docker-compose.yml
index 5b1ee730..35d46f90 100644
--- a/blueprints/uptimekit/docker-compose.yml
+++ b/blueprints/uptimekit/docker-compose.yml
@@ -1,15 +1,13 @@
 services:
   dash:
     image: ghcr.io/uptimekit/dash:latest
-    ports:
-      - "${DASH_PORT:-3000}:3000"
     env_file:
       - .env
     environment:
-      - DATABASE_URL=postgresql://postgres:postgres@db:5432/uptimekit
+      - DATABASE_URL=postgresql://postgres:${POSTGRES_PASSWORD}@db:5432/uptimekit
       - CLICKHOUSE_URL=http://clickhouse:8123
       - CLICKHOUSE_USER=default
-      - CLICKHOUSE_PASSWORD=clickhouse
+      - CLICKHOUSE_PASSWORD=${CLICKHOUSE_PASSWORD}
       - REDIS_URL=redis://redis:6379
     depends_on:
       db:
@@ -30,15 +28,13 @@ services:
 
   status-page:
     image: ghcr.io/uptimekit/status-page:latest
-    ports:
-      - "${STATUS_PAGE_PORT:-3001}:3001"
     env_file:
       - .env
     environment:
-      - DATABASE_URL=postgresql://postgres:postgres@db:5432/uptimekit
+      - DATABASE_URL=postgresql://postgres:${POSTGRES_PASSWORD}@db:5432/uptimekit
       - CLICKHOUSE_URL=http://clickhouse:8123
       - CLICKHOUSE_USER=default
-      - CLICKHOUSE_PASSWORD=clickhouse
+      - CLICKHOUSE_PASSWORD=${CLICKHOUSE_PASSWORD}
       - REDIS_URL=redis://redis:6379
     depends_on:
       db:
@@ -55,10 +51,10 @@ services:
     image: postgres:18-alpine
     environment:
       POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_DB: uptimekit
     volumes:
-      - db_data:/var/lib/postgresql/data
+      - db_data:/var/lib/postgresql
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U postgres -d uptimekit"]
       interval: 5s
@@ -80,7 +76,7 @@ services:
     environment:
       CLICKHOUSE_DB: uptimekit
       CLICKHOUSE_USER: default
-      CLICKHOUSE_PASSWORD: clickhouse
+      CLICKHOUSE_PASSWORD: ${CLICKHOUSE_PASSWORD}
       CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: 1
     user: "root"
     ulimits:
diff --git a/blueprints/uptimekit/template.toml b/blueprints/uptimekit/template.toml
index 32f3a764..45e02bad 100644
--- a/blueprints/uptimekit/template.toml
+++ b/blueprints/uptimekit/template.toml
@@ -2,6 +2,8 @@
 main_domain = "${domain}"
 second_domain = "${domain}"
 secret_base = "${base64:64}"
+db_password = "${password:32}"
+clickhouse_password = "${password:32}"
 
 [config]
 [[config.domains]]
@@ -18,7 +20,5 @@ host = "${second_domain}"
 BETTER_AUTH_SECRET = "${secret_base}"
 BETTER_AUTH_URL = "http://${main_domain}"
 NEXT_PUBLIC_URL = "http://${main_domain}"
-DASH_PORT=3000
-STATUS_PAGE_PORT=3001
-
-[[config.mounts]]
\ No newline at end of file
+POSTGRES_PASSWORD = "${db_password}"
+CLICKHOUSE_PASSWORD = "${clickhouse_password}"