diff --git a/env.template b/env.template
index a3999b0..4af58f5 100644
--- a/env.template
+++ b/env.template
@@ -8,8 +8,9 @@
 # ----------------------------------------------------------------------------
 # PostgreSQL Database Configuration
 # ----------------------------------------------------------------------------
+# WARNING: Change these default passwords in production!
 POSTGRES_USER=postgres
-POSTGRES_PASSWORD=your_secure_password_change_this
+POSTGRES_PASSWORD=postgres
 POSTGRES_DB=brainkb
 POSTGRES_PORT=5432
 
@@ -19,7 +20,7 @@ POSTGRES_PORT=5432
 DB_NAME=brainkb
 # make sure it matches with postgres db username and password
 DB_USER=postgres
-DB_PASSWORD=your_secure_password_change_this
+DB_PASSWORD=postgres
 # do not change unless you update the docker
 DB_HOST=postgres
 DB_PORT=5432
@@ -29,8 +30,9 @@ DB_PORT=5432
 # ----------------------------------------------------------------------------
 DJANGO_SUPERUSER_USERNAME=admin
 DJANGO_SUPERUSER_EMAIL=admin@brainkb.org
-DJANGO_SUPERUSER_PASSWORD=your_secure_password_change_this
-BRAINYPEDIA_APITOKEN_MANAGER_SECRET_KEY=your-django-secret-key-change-this-in-production
+DJANGO_SUPERUSER_PASSWORD=admin
+# WARNING: Change this secret key in production! Use Django's get_random_secret_key()
+BRAINYPEDIA_APITOKEN_MANAGER_SECRET_KEY=django-insecure-default-key-change-in-production
 
 # ----------------------------------------------------------------------------
 # JWT Configuration (for query_service and ml_service)
@@ -41,7 +43,7 @@ JWT_POSTGRES_DATABASE_PORT=5432
 
 # make sure it matches with postgres db username and password
 JWT_POSTGRES_DATABASE_USER=postgres
-JWT_POSTGRES_DATABASE_PASSWORD=your_secure_password_change_this
+JWT_POSTGRES_DATABASE_PASSWORD=postgres
 # ----------------------------------------------------------------------------
 # Do not change the following
 # ----------------------------------------------------------------------------
@@ -56,8 +58,9 @@ JWT_ALGORITHM=HS256
 # ----------------------------------------------------------------------------
 # Each service has its own JWT secret key to prevent tokens from one service
 # from being used to authenticate with another service
-QUERY_SERVICE_JWT_SECRET_KEY=your-query-service-jwt-secret-key-change-this-in-production
-ML_SERVICE_JWT_SECRET_KEY=your-ml-service-jwt-secret-key-change-this-in-production
+# WARNING: Change these JWT secret keys in production! Use strong random values
+QUERY_SERVICE_JWT_SECRET_KEY=query-service-jwt-secret-key-default
+ML_SERVICE_JWT_SECRET_KEY=ml-service-jwt-secret-key-default
 
 # ----------------------------------------------------------------------------
 # Are not used, kept it for future
@@ -80,8 +83,9 @@ PGADMIN_PORT=5051
 # ----------------------------------------------------------------------------
 # Oxigraph SPARQL Database Configuration
 # ----------------------------------------------------------------------------
+# WARNING: Change these default passwords in production!
 OXIGRAPH_USER=admin
-OXIGRAPH_PASSWORD=your_oxigraph_password_change_this
+OXIGRAPH_PASSWORD=admin
 
 # ----------------------------------------------------------------------------
 # Query Service Configuration
@@ -91,7 +95,7 @@ ENV_STATE=production
 LOGTAIL_API_KEY=
 # this is your oxigraph username and password
 GRAPHDATABASE_USERNAME=admin
-GRAPHDATABASE_PASSWORD=your_oxigraph_password_change_this
+GRAPHDATABASE_PASSWORD=admin
 # ----------------------------------------------------------------------------
 # Do not change the following, unless you use different graphdb/update docker
 # ----------------------------------------------------------------------------
@@ -106,8 +110,9 @@ WEB_CONCURRENCY=6
 # ----------------------------------------------------------------------------
 # pgAdmin Configuration (Optional - for PostgreSQL management)
 # ----------------------------------------------------------------------------
+# WARNING: Change these default passwords in production!
 PGADMIN_DEFAULT_EMAIL=admin@brainkb.org
-PGADMIN_DEFAULT_PASSWORD=your_secure_password_change_this
+PGADMIN_DEFAULT_PASSWORD=admin
 PGADMIN_SERVER_NAME=BrainKB PostgreSQL