diff --git a/.env b/.env
index a6c7090..57cc712 100644
--- a/.env
+++ b/.env
@@ -1,17 +1,22 @@
 APP_HOST=0.0.0.0
 APP_PORT=8000
 
-# Generate a strong secret key
+# Generate 2 strong secret keys
 #
-# On Linux: tr -dc A-Za-z0-9_- </dev/urandom | head -c 44
-# With Python: import secrets; secrets.token_urlsafe(32)
+# In Linux terminal:
+#   tr -dc A-Za-z0-9_- </dev/urandom | head -c 44
+# Or in Python:
+#   import secrets
+#   print(secrets.token_urlsafe(32))
 #
-# If this variable is not set,
-# the key is generated automatically
-#SECRET_KEY=secret
+# If these variables are not set,
+# the keys are generated automatically
+#
+#SESSION_KEY=secret
+#CSRF_KEY=secret
 
-DB_HOST=${REPO_NAME_SNAKE}_db
+DB_HOST=${REPO_NAME_KEBAB}-db
 DB_PORT=3306
 DB_USER=${REPO_NAME_SNAKE}
-DB_PASSWORD=password
+DB_PASSWORD=password  # Generate a password using the same method
 DB_DATABASE=${REPO_NAME_SNAKE}
diff --git a/.env_db b/.env_db
index 4c307f9..93849a2 100644
--- a/.env_db
+++ b/.env_db
@@ -1,5 +1,5 @@
 MYSQL_PORT=3306
 MYSQL_RANDOM_ROOT_PASSWORD=true
 MYSQL_USER=${REPO_NAME_SNAKE}
-MYSQL_PASSWORD=password
+MYSQL_PASSWORD=password  # Must be the same as in .env
 MYSQL_DATABASE=${REPO_NAME_SNAKE}
diff --git a/.env_debug b/.env_debug
index 73c998f..d65a2f1 100644
--- a/.env_debug
+++ b/.env_debug
@@ -1,5 +1,6 @@
 DEBUG=true
-SECRET_KEY=debug
+SESSION_KEY=debug
+CSRF_KEY=debug
 
 APP_HOST=127.0.0.1
 APP_PORT=8000
diff --git a/README.md b/README.md
index a903075..4a0bfd1 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,9 @@ corresponding to your database structure
 as explained below ([Structure > Database](#database))
 7. Check if `Makefile`, `Dockerfile`, `docker-compose.yml` are correct
 8. Run the formatter and linters (`make format`, then `make check`)
-9. Edit the `version_code` file if needed,
+9. Open `.env` and `.env_db`, generate secret keys and the database password
+as explained in the comment above `SESSION_KEY=`
+10. Edit the `version_code` file if needed,
 build a docker image and [publish](#publishing-app) it
 
 ### Makefile