diff --git a/.env.example b/.env.example
index c9b472200..28d377981 100644
--- a/.env.example
+++ b/.env.example
@@ -1,35 +1,61 @@
-APP_NAME="Pixelfed Prod"
-APP_ENV=production
+APP_NAME="Pixelfed"
+APP_ENV="prod"
 APP_KEY=
-APP_DEBUG=false
+APP_DEBUG="false"
 
-APP_URL=http://localhost
+#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="http://localhost"
 APP_DOMAIN="localhost"
 ADMIN_DOMAIN="localhost"
 SESSION_DOMAIN="localhost"
 TRUST_PROXIES="*"
 
-LOG_CHANNEL=stack
+# Database Configuration
+DB_CONNECTION="mysql"
+DB_HOST="127.0.0.1"
+DB_PORT="3306"
+DB_DATABASE="pixelfed"
+DB_USERNAME="pixelfed"
+DB_PASSWORD="pixelfed"
 
-DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_DATABASE=pixelfed
-DB_USERNAME=pixelfed
-DB_PASSWORD=pixelfed
-
-BROADCAST_DRIVER=log
-CACHE_DRIVER=redis
-SESSION_DRIVER=database
-QUEUE_DRIVER=redis
+# Redis Configuration
+REDIS_SCHEME="tcp"
+REDIS_HOST="127.0.0.1"
+REDIS_PASSWORD="null"
+REDIS_PORT="6379"
 
+# Laravel Configuration
+SESSION_DRIVER="database"
+CACHE_DRIVER="redis"
+QUEUE_DRIVER="redis"
+BROADCAST_DRIVER="log"
+LOG_CHANNEL="stack"
 HORIZON_PREFIX="horizon-"
 
-REDIS_SCHEME=tcp
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
+# ActivityPub Configuration
+ACTIVITY_PUB="false"
+AP_REMOTE_FOLLOW="false"
+AP_INBOX="false"
+AP_OUTBOX="false"
+AP_SHAREDINBOX="false"
 
+# Experimental Configuration
+EXP_EMC="true"
+
+## Mail Configuration (Post-Installer)
 MAIL_DRIVER=log
 MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
@@ -38,16 +64,3 @@ MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 MAIL_FROM_ADDRESS="pixelfed@example.com"
 MAIL_FROM_NAME="Pixelfed"
-
-OPEN_REGISTRATION=true
-ENFORCE_EMAIL_VERIFICATION=true
-PF_MAX_USERS=1000
-
-MAX_PHOTO_SIZE=15000
-MAX_CAPTION_LENGTH=150
-MAX_ALBUM_LENGTH=4
-
-ACTIVITY_PUB=false
-AP_REMOTE_FOLLOW=false
-AP_INBOX=false
-PF_COSTAR_ENABLED=false