diff --git a/.env.default b/.env.default
new file mode 100644
index 000000000..68aa0a8ec
--- /dev/null
+++ b/.env.default
@@ -0,0 +1,46 @@
+# api + celeryworker
+
+DEBUG=True
+
+DATABASE_URL=postgresql://postgres@postgres/postgres
+CACHE_URL=redis://redis:6379/0
+
+DJANGO_SECRET_KEY=dev
+
+C_FORCE_ROOT=true
+PYTHONDONTWRITEBYTECODE=true
+PYTHONTRACEMALLOC=0
+
+# api
+
+FUNKWHALE_SPA_HTML_ROOT=http://nginx/
+LDAP_ENABLED=False
+BROWSABLE_API_ENABLED=True
+
+# celeryworker
+
+CELERYD_CONCURRENCY=0
+
+# api + nginx
+
+STATIC_ROOT=/staticfiles
+MEDIA_ROOT=/data/media
+
+# front
+
+HOST=0.0.0.0
+VUE_PORT=8080
+
+# nginx
+
+NGINX_MAX_BODY_SIZE=10G
+
+FUNKWHALE_API_HOST=api
+FUNKWHALE_API_PORT=5000
+
+FUNKWHALE_FRONT_IP=front
+FUNKWHALE_FRONT_PORT=${VUE_PORT}
+
+# postgres
+
+POSTGRES_HOST_AUTH_METHOD=trust
diff --git a/.env.dev b/.env.dev
deleted file mode 100644
index 008b917d4..000000000
--- a/.env.dev
+++ /dev/null
@@ -1,24 +0,0 @@
-DJANGO_ALLOWED_HOSTS=.funkwhale.test,localhost,nginx,0.0.0.0,127.0.0.1,.gitpod.io
-DJANGO_SETTINGS_MODULE=config.settings.local
-DJANGO_SECRET_KEY=dev
-C_FORCE_ROOT=true
-FUNKWHALE_HOSTNAME=localhost
-FUNKWHALE_PROTOCOL=http
-FUNKWHALE_PORT=8000
-PYTHONDONTWRITEBYTECODE=true
-VUE_PORT=8080
-MUSIC_DIRECTORY_PATH=/music
-BROWSABLE_API_ENABLED=True
-FORWARDED_PROTO=http
-LDAP_ENABLED=False
-FUNKWHALE_SPA_HTML_ROOT=http://nginx/
-PYTHONTRACEMALLOC=0
-MEDIA_ROOT=/data/media
-
-# Uncomment this if you're using traefik/https
-# FORCE_HTTPS_URLS=True
-
-# Customize to your needs
-POSTGRES_VERSION=15
-DEBUG=true
-TYPESENSE_API_KEY="apikey"
diff --git a/.env.federation b/.env.federation
new file mode 100644
index 000000000..a78c28b78
--- /dev/null
+++ b/.env.federation
@@ -0,0 +1,8 @@
+# api + celeryworker
+DJANGO_SETTINGS_MODULE=config.settings.local
+
+FUNKWHALE_DOMAIN=funkwhale.test
+FUNKWHALE_PROTOCOL=https
+
+FORCE_HTTPS_URLS=True
+EXTERNAL_REQUESTS_VERIFY_SSL=false
diff --git a/.env.local b/.env.local
new file mode 100644
index 000000000..79b0877df
--- /dev/null
+++ b/.env.local
@@ -0,0 +1,11 @@
+# api + celeryworker
+DJANGO_SETTINGS_MODULE=config.settings.local
+
+FUNKWHALE_PROTOCOL=http
+FUNKWHALE_HOSTNAME=localhost
+FUNKWHALE_PORT=8000
+
+FUNKWHALE_URL=${FUNKWHALE_PROTOCOL}://${FUNKWHALE_HOSTNAME}:${FUNKWHALE_PORT}
+
+MEDIA_URL=${FUNKWHALE_URL}/media/
+STATIC_URL=${FUNKWHALE_URL}/staticfiles/