diff --git a/hosts/hamilton/configuration.nix b/hosts/hamilton/configuration.nix
index 6116e66..d0dfd65 100644
--- a/hosts/hamilton/configuration.nix
+++ b/hosts/hamilton/configuration.nix
@@ -1,8 +1,9 @@
-{ pkgs, baseDomain, ... }: {
+{ pkgs, baseDomain, config, ... }: {
   cj.deployment.environment = "prod";
 
   imports = [
     ./hardware-config.nix
+    ../../services/matrix
   ];
 
   system.stateVersion = "23.05";
@@ -28,4 +29,13 @@
       ipv6.addresses = [ { address = "2a01:4f8:1c1e:b564::1"; prefixLength = 64; } ];
     };
   };
+
+  # This is specific to every host!
+  systemd.mounts = [{
+    what = "/dev/disk/by-id/scsi-0HC_Volume_7628580";
+    where = config.services.matrix-synapse.settings.media_store_path;
+    type = "ext4";
+    options = "discard,nofail,defaults";
+    wantedBy = [ "multi-user.target" ];
+  }];
 }
diff --git a/hosts/shirley/configuration.nix b/hosts/shirley/configuration.nix
index a72dcda..e54f044 100644
--- a/hosts/shirley/configuration.nix
+++ b/hosts/shirley/configuration.nix
@@ -6,7 +6,6 @@
     ../../services/mumble.nix
     ../../services/website.nix
     ../../services/vaultwarden.nix
-    ../../services/matrix
     ../../services/dokuwiki.nix
     ../../services/freescout.nix
     ../../services/hedgedoc.nix
@@ -28,13 +27,4 @@
       ipv6.addresses = [ { address = "2a01:4f8:c0c:83eb::1"; prefixLength = 64; } ];
     };
   };
-
-  # This is specific to every host!
-  systemd.mounts = [{
-    what = "/dev/disk/by-id/scsi-0HC_Volume_7628580";
-    where = config.services.matrix-synapse.settings.media_store_path;
-    type = "ext4";
-    options = "discard,nofail,defaults";
-    wantedBy = [ "multi-user.target" ];
-  }];
 }
diff --git a/secrets/hamilton/secrets.yaml b/secrets/hamilton/secrets.yaml
index 07c129a..d364e24 100644
--- a/secrets/hamilton/secrets.yaml
+++ b/secrets/hamilton/secrets.yaml
@@ -1,4 +1,5 @@
-placeholder: ENC[AES256_GCM,data:rzHtxg==,iv:cCQcC7FZJkGC1YIKNdqiTU+7W6YJ8hJlwT5XwdTyu/k=,tag:AfZlrP54Yh6U8l7bwCT3Bg==,type:bool]
+synapse:
+    registration_shared_secret: ENC[AES256_GCM,data:3mcyn8+8bfRQTJf8a6CwfO/v10W1PvM3D6POq52BV49N1KVBSs27aGq6YZFzR0H9vF5qUGXGRzk+zdNk+GK0Lw==,iv:54ZI2SGGXOQstRU0C89sJlWluC0XnxNLqrjt/ad0MzQ=,tag:gD9h+nIOz049GlaRjgX5Aw==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -14,8 +15,8 @@ sops:
             aWQ2QW05a1lrbTZZci9VMldpVzNCZFkKCJwEd5TkZaIb2M1E149/NEUB1E5E8gLu
             YSDnb7eKfx8auWCEVCMiHx6POdpVvwxKnxUWHEnUBIMHhx+Y1MSclg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-08-12T08:45:36Z"
-    mac: ENC[AES256_GCM,data:pjGhTGsY7I7AF2Pd2fINT0PzJOWSF6TvE26NTC6xNwJ2fnL+opANJnLkdRpZFw7rXVqGdjvZmtYV/Z4MZTH3n5NRM9cg/sQ1kRLS6LIgGFd0xqxhCE26gArquOSqbWb7BU9vyq9A4XFqi9Jx0yjP9+ywYOjrIuVN7OHDyWsN4sU=,iv:3nSB6qNHq9HRa1YCHDGRopiArXPWob10/ON8Y7rMeKc=,tag:2FElWlRUskM+Z/DlfeAs1w==,type:str]
+    lastmodified: "2023-08-13T10:27:18Z"
+    mac: ENC[AES256_GCM,data:BL1UtpKeieAGoexQsOPqoIasANvWjsy+7AaPCeKwev3CUWtPXwwMfsmtkPlQMggEpf5iUjNH74GJBMKKU9SKWhUwxGY7ph5VVYsF0uHlsToKNBK7H8wjtu1Bm8XqRkku/cqCu8/X5ixYx9y3hdKy7UNd8gMHJOkEriA+8J/zZrE=,iv:dE7q8JkxqdnlQcYmwj404mSWLqupxBIiQzIZSAibI+U=,tag:hj2/LhROne6S7YQ4xBMKyA==,type:str]
     pgp:
         - created_at: "2023-08-12T09:39:58Z"
           enc: |-