diff --git a/.gitignore b/.gitignore
index 0a3eb8b..8f1802d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 !/forgejo/
 !/minecraft/
 !/synapse/
+!/murmur/
 
 # include compose.yaml files
 !**/compose.yaml
diff --git a/forgejo/compose.yaml b/forgejo/compose.yaml
index b697af0..a602219 100644
--- a/forgejo/compose.yaml
+++ b/forgejo/compose.yaml
@@ -8,7 +8,9 @@ services:
     environment:
       - POSTGRES_DB=forgejo
       - POSTGRES_USER=forgejouser
-      - POSTGRES_PASSWORD=NOTSECUREPASSWORD
+      # - POSTGRES_PASSWORD=YOUR_DB_PASSWORD
+    env_file:
+      - db.env
     restart: on-failure
   forgejo:
     image: codeberg.org/forgejo/forgejo:1.19
@@ -22,5 +24,7 @@ services:
       - GITEA__database__HOST=db:5432
       - GITEA__database__NAME=forgejo
       - GITEA__database__USER=forgejouser
-      - GITEA__database__PASSWD=NOTSECUREPASSWORD
+      # - GITEA__database__PASSWD=YOUR_DB_PASSWORD
+    env_file:
+      - forgejo.env
     restart: on-failure
diff --git a/minecraft/compose.yaml b/minecraft/compose.yaml
index 888020a..fc9682d 100644
--- a/minecraft/compose.yaml
+++ b/minecraft/compose.yaml
@@ -30,9 +30,10 @@ services:
     environment:
       BACKUP_INTERVAL: "24h"
       RCON_HOST: "minecraft"
-      # Should be only exposed on localhost, therefore shouldn't be that secure
-      RCON_PASSWORD: "OuHtU5ecRSbdCz1EddKBqqAMwFbNLIsLQ2EBOQlaYgN0bhG0QYC33kqwmvyT9f7eAp2ohZWmQx36hkLy4uH9lw8g6WFD3yzvzY6P"
       PRUNE_BACKUPS_DAYS: "2"
+      # RCON_PASSWORD: "SAME_PASSWORD_AS_IN_server.properties"
+    env_file:
+      - backup.env
     depends_on: 
       - minecraft
     volumes:
diff --git a/murmur/compose.yaml b/murmur/compose.yaml
new file mode 100644
index 0000000..4e291b2
--- /dev/null
+++ b/murmur/compose.yaml
@@ -0,0 +1,19 @@
+version: "3"
+
+services:
+  murmur:
+    image: docker.io/mumblevoip/mumble-server:latest
+    restart: on-failure
+    environment:
+      - MUMBLE_CUSTOM_CONFIG_FILE=/data/murmur.ini
+      - MUMBLE_UID=0
+      - MUMBLE_GID=0
+      # - MUMBLE_SUPERUSER_PASSWORD=YOUR_SUPERUSER_PASSWORD
+    env_file:
+      - murmur.env
+    ports:
+      - 64738:64738
+      - 64738:64738/udp
+    volumes:
+      - ./data:/data
+
diff --git a/synapse/compose.yaml b/synapse/compose.yaml
index 668e529..2db161f 100644
--- a/synapse/compose.yaml
+++ b/synapse/compose.yaml
@@ -5,11 +5,13 @@ services:
     image: postgres
     restart: always
     volumes:
-     - $HOME/compose/synapse/data/postgresql:/var/lib/postgresql/data
+      - $HOME/compose/synapse/data/postgresql:/var/lib/postgresql/data
     environment:
-     - POSTGRES_PASSWORD=eL}wDzA$!6V&hdE~G
-     - POSTGRES_USER=synapse
-     - POSTGRES_INITDB_ARGS=--lc-collate=C --lc-ctype=C --encoding=UTF-8 --locale=en_US.UTF-8
+      - POSTGRES_USER=synapse
+      # - POSTGRES_PASSWORD=SAME_AS_IN_homeserver.yaml
+      - POSTGRES_INITDB_ARGS=--lc-collate=C --lc-ctype=C --encoding=UTF-8 --locale=en_US.UTF-8
+    env_file:
+      - postgres.env
 
   synapse:
     image: docker.io/matrixdotorg/synapse:latest