diff --git a/blueprints/plane/template.toml b/blueprints/plane/template.toml
index 932af511..a12f4564 100644
--- a/blueprints/plane/template.toml
+++ b/blueprints/plane/template.toml
@@ -1,13 +1,19 @@
 [variables]
 main_domain = "${domain}"
+db_password = "${password:32}"
+minio_password = "${password:32}"
+rabbitmq_user = "${username}"
+rabbitmq_pass = "${password:32}"
+secret_key = "${base64:48}"
 
 [config]
 env = [
-"Domain=${main_domain}",
+"Domain=${domain}",
+"WEB_URL=${Domain}",
 "PGHOST=plane-db",
 "PGDATABASE=plane",
-"POSTGRES_USER={username}",
-"POSTGRES_PASSWORD={password:32}",
+"POSTGRES_USER=${username}",
+"POSTGRES_PASSWORD=${db_password}",
 "POSTGRES_DB=plane",
 "POSTGRES_PORT=5432",
 "PGDATA=/var/lib/postgresql/data",
@@ -15,10 +21,10 @@ env = [
 "REDIS_PORT=6379",
 "REDIS_URL=redis://plane-redis:6379/",
 "MINIO_ROOT_USER=access-key",
-"MINIO_ROOT_PASSWORD=password:32",
+"MINIO_ROOT_PASSWORD=${minio_password}",
 "AWS_REGION=",
-"AWS_ACCESS_KEY_ID={username}",
-"AWS_SECRET_ACCESS_KEY=${MINIO_ROOT_PASSWORD}",
+"AWS_ACCESS_KEY_ID=${MINIO_ROOT_USER}",
+"AWS_SECRET_ACCESS_KEY=${minio_password}",
 "AWS_S3_ENDPOINT_URL=http://plane-minio:9000",
 "AWS_S3_BUCKET_NAME=uploads",
 "NGINX_PORT=80",
@@ -26,20 +32,19 @@ env = [
 "FILE_SIZE_LIMIT=5242880",
 "RABBITMQ_HOST=plane-mq",
 "RABBITMQ_PORT=5672",
-"RABBITMQ_DEFAULT_USER={username}",
-"RABBITMQ_DEFAULT_PASS={password:32}",
+"RABBITMQ_DEFAULT_USER=rabbitmq_user",
+"RABBITMQ_DEFAULT_PASS=${rabbitmq_pass}",
 "RABBITMQ_DEFAULT_VHOST=plane",
 "RABBITMQ_VHOST=plane",
 "API_BASE_URL=http://api:8000",
-"WEB_URL=${main_domain}",
 "DEBUG=0",
 "SENTRY_DSN=",
 "SENTRY_ENVIRONMENT=production",
-"CORS_ALLOWED_ORIGINS=",
+"CORS_ALLOWED_ORIGINS=https://${Domain}",
 "GUNICORN_WORKERS=1",
 "USE_MINIO=1",
 "DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@plane-db/plane",
-"SECRET_KEY={base64:48}",
+"SECRET_KEY=${secret_key}",
 "AMQP_URL=amqp://${RABBITMQ_DEFAULT_USER}:${RABBITMQ_DEFAULT_PASS}@plane-mq:5672/plane",
 "API_KEY_RATE_LIMIT=60/minute",
 "MINIO_ENDPOINT_SSL=0"