diff --git a/.env.airflow.init.sample b/.env.airflow.init.sample
index 25e08edd..f52a569e 100644
--- a/.env.airflow.init.sample
+++ b/.env.airflow.init.sample
@@ -1,4 +1,4 @@
 _AIRFLOW_DB_MIGRATE=true
 _AIRFLOW_WWW_USER_CREATE=true
+_AIRFLOW_WWW_USER_PASSWORD=airflow
 _AIRFLOW_WWW_USER_USERNAME=airflow
-_AIRFLOW_WWW_USER_PASSWORD=airflow
\ No newline at end of file
diff --git a/.env.airflow.sample b/.env.airflow.sample
index dfa9a5dc..7031c3d9 100644
--- a/.env.airflow.sample
+++ b/.env.airflow.sample
@@ -1,23 +1,20 @@
-AIRFLOW__CORE__EXECUTOR=CeleryExecutor
-AIRFLOW__DATABASE__SQL_ALCHEMY_CONN=postgresql+psycopg2://airflow:airflow@postgres/airflow
-# For backward compatibility, with Airflow <2.3
-AIRFLOW__CORE__SQL_ALCHEMY_CONN=postgresql+psycopg2://airflow:airflow@postgres/airflow
-AIRFLOW__CELERY__RESULT_BACKEND=db+postgresql://airflow:airflow@postgres/airflow
+AIRFLOW__API__AUTH_BACKENDS='airflow.api.auth.backend.basic_auth,airflow.api.auth.backend.session'
 AIRFLOW__CELERY__BROKER_URL=redis://:@redis:6379/0
-AIRFLOW__CORE__FERNET_KEY=
+AIRFLOW__CELERY__RESULT_BACKEND=db+postgresql://airflow:airflow@postgres/airflow
 AIRFLOW__CORE__DAGS_ARE_PAUSED_AT_CREATION=true
+AIRFLOW__CORE__EXECUTOR=CeleryExecutor
+AIRFLOW__CORE__FERNET_KEY=
 AIRFLOW__CORE__LOAD_EXAMPLES=true
-AIRFLOW__API__AUTH_BACKENDS='airflow.api.auth.backend.basic_auth,airflow.api.auth.backend.session'
+# For backward compatibility, with Airflow <2.3
+AIRFLOW__CORE__SQL_ALCHEMY_CONN=postgresql+psycopg2://airflow:airflow@postgres/airflow
+AIRFLOW__DATABASE__SQL_ALCHEMY_CONN=postgresql+psycopg2://airflow:airflow@postgres/airflow
 
 # Use simple http server on scheduler for health checks
 # See https://airflow.apache.org/docs/apache-airflow/stable/administration-and-deployment/logging-monitoring/check-health.html#scheduler-health-check-server
 AIRFLOW__SCHEDULER__ENABLE_HEALTH_CHECK=true
 
-NEO4J_PROTOCOL=bolt
 NEO4J_HOST=neo4j
+NEO4J_PASSWORD=neo4j123456
 NEO4J_PORT=7687
+NEO4J_PROTOCOL=bolt
 NEO4J_USER=neo4j
-NEO4J_PASSWORD=neo4j123456
-
-
-