diff --git a/homelab/jafner-net/config/peertube/docker-compose.yml b/homelab/jafner-net/config/peertube/docker-compose.yml
index d0d1d9c8..6d61cc98 100644
--- a/homelab/jafner-net/config/peertube/docker-compose.yml
+++ b/homelab/jafner-net/config/peertube/docker-compose.yml
@@ -42,7 +42,8 @@ services:
     networks:
       - peertube
     env_file:
-      - .env
+      - postgres.env
+      - postgres_secrets.env
     volumes:
       - ${DOCKER_VOLUME}/db:/var/lib/postgresql/data
     restart: "no"
@@ -62,7 +63,7 @@ services:
     networks:
       - peertube
     env_file:
-      - .env
+      - postfix.env
     volumes:
       - ${DOCKER_VOLUME}/opendkim/keys:/etc/opendkim/keys
     restart: "no"
diff --git a/homelab/jafner-net/config/peertube/peertube.env b/homelab/jafner-net/config/peertube/peertube.env
index 925e4687..0a6765f2 100644
--- a/homelab/jafner-net/config/peertube/peertube.env
+++ b/homelab/jafner-net/config/peertube/peertube.env
@@ -1,11 +1,3 @@
-# Database / Postgres service configuration
-POSTGRES_USER=postgresuser
-#POSTGRES_PASSWORD=postgrespassword
-# Postgres database name "peertube"
-POSTGRES_DB=peertube
-# Editable only with a suffix :
-#POSTGRES_DB=peertube_prod
-#PEERTUBE_DB_SUFFIX=_prod
 PEERTUBE_DB_USERNAME=postgresuser
 #PEERTUBE_DB_PASSWORD=postgrespassword
 PEERTUBE_DB_SSL=false
@@ -34,14 +26,6 @@ PEERTUBE_SMTP_TLS=false
 PEERTUBE_SMTP_DISABLE_STARTTLS=false
 PEERTUBE_ADMIN_EMAIL=joey@jafner.net
 
-# Postfix service configuration
-POSTFIX_myhostname=jafner.net
-# If you need to generate a list of sub/DOMAIN keys
-# pass them as a whitespace separated string <DOMAIN>=<selector>
-OPENDKIM_DOMAINS=jafner.net=peertube
-# see https://github.com/wader/postfix-relay/pull/18
-OPENDKIM_RequireSafeKeys=no
-
 # /!\ Prefer to use the PeerTube admin interface to set the following configurations /!\
 PEERTUBE_SIGNUP_ENABLED=true
 #PEERTUBE_TRANSCODING_ENABLED=true
diff --git a/homelab/jafner-net/config/peertube/postfix.env b/homelab/jafner-net/config/peertube/postfix.env
new file mode 100644
index 00000000..1f2891ae
--- /dev/null
+++ b/homelab/jafner-net/config/peertube/postfix.env
@@ -0,0 +1,7 @@
+# Postfix service configuration
+POSTFIX_myhostname=jafner.net
+# If you need to generate a list of sub/DOMAIN keys
+# pass them as a whitespace separated string <DOMAIN>=<selector>
+OPENDKIM_DOMAINS=jafner.net=peertube
+# see https://github.com/wader/postfix-relay/pull/18
+OPENDKIM_RequireSafeKeys=no
diff --git a/homelab/jafner-net/config/peertube/postgres.env b/homelab/jafner-net/config/peertube/postgres.env
new file mode 100644
index 00000000..a89f1689
--- /dev/null
+++ b/homelab/jafner-net/config/peertube/postgres.env
@@ -0,0 +1,7 @@
+# Database / Postgres service configuration
+POSTGRES_USER=postgresuser
+#POSTGRES_PASSWORD=postgrespassword
+# Postgres database name "peertube"
+POSTGRES_DB=peertube
+# Editable only with a suffix :
+#POSTGRES_DB=peertube_prod