diff --git a/conf/.env b/conf/.env
index 428eb8ca..8f21fa35 100644
--- a/conf/.env
+++ b/conf/.env
@@ -1,22 +1,11 @@
-# https://docs.pixelfed.org/technical-documentation/config/
+# Please refer to https://docs.pixelfed.org/technical-documentation/config/ manual to tweak these values
 
-APP_NAME="__APP__"
-APP_ENV="production"
+## General Settings
+APP_NAME=__APP__
+APP_ENV=production
+APP_DEBUG=false
+# Crypto
 APP_KEY=__APP_KEY__
-APP_DEBUG="false"
-
-# Instance Configuration
-OPEN_REGISTRATION="false"
-ENFORCE_EMAIL_VERIFICATION="false"
-PF_MAX_USERS="1000"
-OAUTH_ENABLED="true"
-
-# Media Configuration
-PF_OPTIMIZE_IMAGES="true"
-IMAGE_QUALITY="80"
-MAX_PHOTO_SIZE="15000"
-MAX_CAPTION_LENGTH="500"
-MAX_ALBUM_LENGTH="4"
 
 # Instance URL Configuration
 APP_URL=https://__DOMAIN__
@@ -25,6 +14,41 @@ ADMIN_DOMAIN="__DOMAIN__"
 SESSION_DOMAIN="${APP_DOMAIN}"
 TRUST_PROXIES="*"
 
+# Instance Configuration
+OPEN_REGISTRATION=true
+ENFORCE_EMAIL_VERIFICATION=true
+PF_MAX_USERS=1000
+OAUTH_ENABLED=true
+
+APP_TIMEZONE=UTC
+APP_LOCALE=en #TODO : can we use a Ynh setting for this ?
+
+## Pixelfed Tweaks
+LIMIT_ACCOUNT_SIZE=true
+MAX_ACCOUNT_SIZE=1000000
+MAX_PHOTO_SIZE=15000
+MAX_AVATAR_SIZE=2000
+MAX_CAPTION_LENGTH=1000
+MAX_BIO_LENGTH=800
+MAX_NAME_LENGTH=40
+MAX_ALBUM_LENGTH=4
+IMAGE_QUALITY=80
+PF_OPTIMIZE_IMAGES=true
+PF_OPTIMIZE_VIDEOS=true
+ADMIN_ENV_EDITOR=true
+ACCOUNT_DELETION=true
+ACCOUNT_DELETE_AFTER=false
+MAX_LINKS_PER_POST=20
+
+## Instance
+#INSTANCE_DESCRIPTION=
+INSTANCE_PUBLIC_HASHTAGS=false
+#INSTANCE_CONTACT_EMAIL=
+INSTANCE_PUBLIC_LOCAL_TIMELINE=false
+#BANNED_USERNAMES=
+STORIES_ENABLED=false
+RESTRICTED_INSTANCE=false
+
 # Database Configuration
 DB_CONNECTION="pgsql"
 DB_HOST="127.0.0.1"
@@ -33,7 +57,7 @@ DB_DATABASE="__DB_NAME__"
 DB_USERNAME="__DB_USER__"
 DB_PASSWORD="__DB_PWD__"
 
-# Redis Configuration
+# Redis Configuration (cache)
 REDIS_CLIENT="phpredis"
 REDIS_SCHEME="tcp"
 REDIS_HOST="127.0.0.1"
@@ -49,15 +73,15 @@ BROADCAST_DRIVER="log"
 LOG_CHANNEL="stack"
 HORIZON_PREFIX="horizon-"
 
-# ActivityPub Configuration
+## ActivityPub Configuration
 ACTIVITY_PUB="true"
 AP_REMOTE_FOLLOW="true"
 AP_INBOX="true"
-AP_OUTBOX="true"
 AP_SHAREDINBOX="true"
-
-# Experimental Configuration
-EXP_EMC="true"
+AP_OUTBOX="true"
+ATOM_FEEDS=true
+NODEINFO=true
+WEBFINGER=true
 
 ## Mail Configuration (Post-Installer)
 MAIL_DRIVER=smtp
@@ -79,3 +103,41 @@ FILESYSTEM_CLOUD=s3
 #AWS_URL=
 #AWS_ENDPOINT=
 #AWS_USE_PATH_STYLE_ENDPOINT=false
+
+
+## Experimental Configuration
+EXP_EMC="true"
+
+## Horizon
+HORIZON_DARKMODE=false
+
+## COSTAR - Confirm Object Sentiment Transform and Reduce
+PF_COSTAR_ENABLED=true
+CS_BLOCKED_DOMAINS='gab.com,gab.ai,develop.gab.com'
+CS_CW_DOMAINS='switter.at'
+CS_UNLISTED_DOMAINS='example.org,example.net,example.com'
+
+# Media
+MEDIA_EXIF_DATABASE=false
+
+## Logging
+LOG_CHANNEL=stack
+
+## Image
+IMAGE_DRIVER=imagick
+
+## Cache
+CACHE_DRIVER=redis
+
+## Purify
+RESTRICT_HTML_TYPES=true
+
+## Queue
+QUEUE_DRIVER=redis
+
+## Session
+SESSION_DRIVER=redis
+
+## Passport
+#PASSPORT_PRIVATE_KEY=
+#PASSPORT_PUBLIC_KEY=