diff --git a/.gitignore b/.gitignore
index bc97865..0822e62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -221,5 +221,4 @@ __marimo__/
 
 
 ## Specific env files that may contain secrets
-api.env
-consumer.env
\ No newline at end of file
+*.env
\ No newline at end of file
diff --git a/lora-gateway/configuration/postgresql/.env.example b/lora-gateway/configuration/postgresql/.env.example
new file mode 100644
index 0000000..6913f35
--- /dev/null
+++ b/lora-gateway/configuration/postgresql/.env.example
@@ -0,0 +1,3 @@
+POSTGRES_USER=chirpstack
+POSTGRES_PASSWORD=chirpstack
+POSTGRES_DB=chirpstack
\ No newline at end of file
diff --git a/lora-gateway/docker-compose.yml b/lora-gateway/docker-compose.yml
index 36d96c0..ad58f73 100644
--- a/lora-gateway/docker-compose.yml
+++ b/lora-gateway/docker-compose.yml
@@ -66,10 +66,8 @@ services:
       - db:/var/lib/postgresql
     networks:
       - internal
-    environment:
-      - POSTGRES_USER=chirpstack
-      - POSTGRES_PASSWORD=chirpstack
-      - POSTGRES_DB=chirpstack
+    env_file: ./configuration/postgresql/.env
+
 
   redis:
     image: redis:7-alpine
diff --git a/server/docker-compose.yml b/server/docker-compose.yml
index fa3834e..ddf9cd2 100644
--- a/server/docker-compose.yml
+++ b/server/docker-compose.yml
@@ -7,7 +7,7 @@ services:
     networks:
       - lora-gateway_mqtt
       - database
-    env_file: consumer.env
+    env_file: env_files/consumer.env
 
   api:
     build: ./backend
@@ -19,7 +19,7 @@ services:
     networks:
       - public
       - database
-    env_file: api.env
+    env_file: env_files/api.env
 
   webui:
     build: ./frontend
@@ -40,10 +40,8 @@ services:
       - db:/var/lib/postgresql
     networks:
       - database
-    environment:
-      - POSTGRES_USER=simugaz
-      - POSTGRES_PASSWORD=simugaz
-      - POSTGRES_DB=simugaz
+    env_file: env_files/db.env
+      
   
   pgadmin:
     image: dpage/pgadmin4:latest
@@ -55,9 +53,7 @@ services:
       - database
     volumes:
       - ./servers.json:/pgadmin4/servers.json
-    environment:
-      PGADMIN_DEFAULT_EMAIL: admin@example.com
-      PGADMIN_DEFAULT_PASSWORD: changeme
+    env_file: env_files/pgadmin.env
     
 volumes:
   db:
diff --git a/server/api.env.example b/server/env_files/api.env.example
similarity index 100%
rename from server/api.env.example
rename to server/env_files/api.env.example
diff --git a/server/consumer.env.example b/server/env_files/consumer.env.example
similarity index 100%
rename from server/consumer.env.example
rename to server/env_files/consumer.env.example
diff --git a/server/env_files/db.env.example b/server/env_files/db.env.example
new file mode 100644
index 0000000..d8860f2
--- /dev/null
+++ b/server/env_files/db.env.example
@@ -0,0 +1,3 @@
+POSTGRES_USER=simugaz
+POSTGRES_PASSWORD=simugaz
+POSTGRES_DB=simugaz
\ No newline at end of file
diff --git a/server/env_files/pgadmin.env.example b/server/env_files/pgadmin.env.example
new file mode 100644
index 0000000..2976672
--- /dev/null
+++ b/server/env_files/pgadmin.env.example
@@ -0,0 +1,2 @@
+PGADMIN_DEFAULT_EMAIL=admin@example.com
+PGADMIN_DEFAULT_PASSWORD=changeme
\ No newline at end of file