diff --git a/metube/.env b/metube/.env
index bd77745..d9cf7ba 100644
--- a/metube/.env
+++ b/metube/.env
@@ -1,2 +1,3 @@
+# Generale
 METUBE_PORT:8081
 METUBE_DOWNLOADS:/home/docker/metube/download
\ No newline at end of file
diff --git a/metube/README.md b/metube/README.md
index 512169f..29eb485 100644
--- a/metube/README.md
+++ b/metube/README.md
@@ -27,7 +27,7 @@ MeTube è una semplice interfaccia per youtube-dl:
 * `.env` - un file contenenti le variabili environment per il docker compose
 * `docker-compose.yml` - il docker compose per creare il container
 
-Tutti i file e le cartelle devono essere forniti a mano.</br>
+Tutti i file e le cartelle devono essere creati a mano.</br>
 
 # docker-compose
 
@@ -41,12 +41,14 @@ services:
     restart: unless-stopped
     ports:
       - ${METUBE_PORT:-8081}:8081
+    env_file: .env
     volumes:
       - ${METUBE_DOWNLOADS:-/home/docker/metube/download}:/downloads
 ```
 
 `.env`
 ```bash
+# Generale
 METUBE_PORT:8081
 METUBE_DOWNLOADS:/home/docker/metube/download
 ```
diff --git a/metube/docker-compose.yml b/metube/docker-compose.yml
index cbba566..e55a17e 100644
--- a/metube/docker-compose.yml
+++ b/metube/docker-compose.yml
@@ -6,5 +6,6 @@ services:
     restart: unless-stopped
     ports:
       - ${METUBE_PORT:-8081}:8081
+    env_file: .env
     volumes:
       - ${METUBE_DOWNLOADS:-/home/docker/metube/download}:/downloads
\ No newline at end of file
diff --git a/miniflux/.env b/miniflux/.env
index 5697b79..5934c96 100644
--- a/miniflux/.env
+++ b/miniflux/.env
@@ -1,4 +1,14 @@
+# Generale
 POSTGRES_DATA:/home/docker/miniflux/db
 MINIFLUX_PORT=8080
+
+# Postgres
+POSTGRES_USER=miniflux
+POSTGRES_PASSWORD=secret
+
+# Miniflux
+DATABASE_URL=postgres://miniflux:secret@db/miniflux?sslmode=disable
+RUN_MIGRATIONS=1
+CREATE_ADMIN=1
 ADMIN_USERNAME=admin
 ADMIN_PASSWORD=password
\ No newline at end of file
diff --git a/miniflux/README.md b/miniflux/README.md
index 9b0a0af..6a07a26 100644
--- a/miniflux/README.md
+++ b/miniflux/README.md
@@ -33,7 +33,7 @@ Miniflux è un lettore di feed minimalista:
 * `.env` - un file contenenti le variabili environment per il docker compose
 * `docker-compose.yml` - il docker compose per creare il container
 
-Tutti i file e le cartelle devono essere forniti a mano.</br>
+Tutti i file e le cartelle devono essere creati a mano.</br>
 
 # docker-compose
 
@@ -45,9 +45,7 @@ services:
     container_name: miniflux-db
     image: postgres:13-alpine
     restart: always
-    environment:
-      - POSTGRES_USER=miniflux
-      - POSTGRES_PASSWORD=secret
+    env_file: .env
     volumes:
       - ${POSTGRES_DATA:-/home/docker/miniflux/db}:/var/lib/postgresql/data
       - /etc/localtime:/etc/localtime:ro
@@ -66,20 +64,25 @@ services:
       - db
     ports:
       - ${MINIFLUX_PORT:-8080}:8080
-    environment:
-      - DATABASE_URL=postgres://miniflux:secret@db/miniflux?sslmode=disable
-      - RUN_MIGRATIONS=1
-      - CREATE_ADMIN=1
-      - ADMIN_USERNAME=${ADMIN_USERNAME:-admin}
-      - ADMIN_PASSWORD=${ADMIN_PASSWORD:-password}
+    env_file: .env
     healthcheck:
       test: ["CMD", "/usr/bin/miniflux", "-healthcheck", "auto"]
 ```
 
 `.env`
 ```bash
+# Generale
 POSTGRES_DATA:/home/docker/miniflux/db
 MINIFLUX_PORT=8080
+
+# Postgres
+POSTGRES_USER=miniflux
+POSTGRES_PASSWORD=secret
+
+# Miniflux
+DATABASE_URL=postgres://miniflux:secret@db/miniflux?sslmode=disable
+RUN_MIGRATIONS=1
+CREATE_ADMIN=1
 ADMIN_USERNAME=admin
 ADMIN_PASSWORD=password
 ```
diff --git a/miniflux/docker-compose.yml b/miniflux/docker-compose.yml
index f87279d..15144d9 100644
--- a/miniflux/docker-compose.yml
+++ b/miniflux/docker-compose.yml
@@ -4,9 +4,7 @@ services:
     container_name: miniflux-db
     image: postgres:13-alpine
     restart: always
-    environment:
-      - POSTGRES_USER=miniflux
-      - POSTGRES_PASSWORD=secret
+    env_file: .env
     volumes:
       - ${POSTGRES_DATA:-/home/docker/miniflux/db}:/var/lib/postgresql/data
       - /etc/localtime:/etc/localtime:ro
@@ -24,12 +22,7 @@ services:
     depends_on:
       - db
     ports:
-      - 8080:8080
-    environment:
-      - DATABASE_URL=postgres://miniflux:secret@db/miniflux?sslmode=disable
-      - RUN_MIGRATIONS=1
-      - CREATE_ADMIN=1
-      - ADMIN_USERNAME=${ADMIN_USERNAME:-admin}
-      - ADMIN_PASSWORD=${ADMIN_PASSWORD:-password}
+      - ${MINIFLUX_PORT:-8080}:8080
+    env_file: .env
     healthcheck:
       test: ["CMD", "/usr/bin/miniflux", "-healthcheck", "auto"]
\ No newline at end of file
diff --git a/navidrome/.env b/navidrome/.env
index 6b1f828..0ee7942 100644
--- a/navidrome/.env
+++ b/navidrome/.env
@@ -1,3 +1,10 @@
+# Generale
 NAVIDROME_PORT=4533
 NAVIDROME_DATA:/home/docker/navidrome/data
-MUSIC_DIR=/home/music
\ No newline at end of file
+MUSIC_DIR=/home/music
+
+# Navidrome
+ND_SCANINTERVAL=1h
+ND_LOGLEVEL=info
+CREATE_ADMIN=1
+ND_SESSIONTIMEOUT=24h
\ No newline at end of file
diff --git a/navidrome/README.md b/navidrome/README.md
index 7649c12..91411ca 100644
--- a/navidrome/README.md
+++ b/navidrome/README.md
@@ -34,7 +34,7 @@ Navidrome è un server di gestione e streaming musicale:
 * `.env` - un file contenenti le variabili environment per il docker compose
 * `docker-compose.yml` - il docker compose per creare il container
 
-Tutti i file e le cartelle devono essere forniti a mano.</br>
+Tutti i file e le cartelle devono essere creati a mano.</br>
 
 # docker-compose
 
@@ -48,11 +48,7 @@ services:
     restart: unless-stopped
     ports:
       - ${NAVIDROME_PORT:-4533}:4533
-    environment:
-      - ND_SCANINTERVAL=1h
-      - ND_LOGLEVEL=info
-      - CREATE_ADMIN=1
-      - ND_SESSIONTIMEOUT=24h
+    env_file: .env
     volumes:
       - ${NAVIDROME_DATA:-/home/docker/navidrome/data}:/data
       - ${MUSIC_DIR:-/home/music}:/music:ro
@@ -60,9 +56,16 @@ services:
 
 `.env`
 ```bash
+# Generale
 NAVIDROME_PORT=4533
 NAVIDROME_DATA:/home/docker/navidrome/data
 MUSIC_DIR=/home/music
+
+# Navidrome
+ND_SCANINTERVAL=1h
+ND_LOGLEVEL=info
+CREATE_ADMIN=1
+ND_SESSIONTIMEOUT=24h
 ```
 
 # Reverse proxy
diff --git a/navidrome/docker-compose.yml b/navidrome/docker-compose.yml
index 39d9fc1..2355764 100644
--- a/navidrome/docker-compose.yml
+++ b/navidrome/docker-compose.yml
@@ -5,12 +5,8 @@ services:
     image: deluan/navidrome
     restart: unless-stopped
     ports:
-      - 4533:4533
-    environment:
-      - ND_SCANINTERVAL=1h
-      - ND_LOGLEVEL=info
-      - CREATE_ADMIN=1
-      - ND_SESSIONTIMEOUT=24h
+      - ${NAVIDROME_PORT:-4533}:4533
+    env_file: .env
     volumes:
       - ${NAVIDROME_DATA:-/home/docker/navidrome/data}:/data
       - ${MUSIC_DIR:-/home/music}:/music:ro
\ No newline at end of file