diff --git a/hosts/nachtigall/apps/matrix-log-config.yaml b/hosts/nachtigall/apps/matrix/matrix-log-config.yaml
similarity index 100%
rename from hosts/nachtigall/apps/matrix-log-config.yaml
rename to hosts/nachtigall/apps/matrix/matrix-log-config.yaml
diff --git a/hosts/nachtigall/apps/mautrix-telegram.nix b/hosts/nachtigall/apps/matrix/mautrix-telegram.nix
similarity index 100%
rename from hosts/nachtigall/apps/mautrix-telegram.nix
rename to hosts/nachtigall/apps/matrix/mautrix-telegram.nix
diff --git a/hosts/nachtigall/apps/matrix.nix b/hosts/nachtigall/apps/matrix/synapse.nix
similarity index 100%
rename from hosts/nachtigall/apps/matrix.nix
rename to hosts/nachtigall/apps/matrix/synapse.nix
diff --git a/hosts/nachtigall/default.nix b/hosts/nachtigall/default.nix
index a9df98f..3dbdbcf 100644
--- a/hosts/nachtigall/default.nix
+++ b/hosts/nachtigall/default.nix
@@ -10,6 +10,7 @@
       ./nix.nix
       ./apps/nginx.nix
 
+      ./apps/forgejo.nix
       ./apps/keycloak.nix
       ./apps/nginx-mastodon.nix
       ./apps/nginx-mastodon-files.nix
@@ -17,9 +18,8 @@
       ./apps/mastodon.nix
       ./apps/opensearch.nix
       ./apps/postgresql.nix
-      ./apps/forgejo.nix
 
-      ./apps/matrix.nix
-      ./apps/mautrix-telegram.nix
+      ./apps/matrix/mautrix-telegram.nix
+      ./apps/matrix/synapse.nix
     ];
 }