diff --git a/modules/services/server/matrix.nix b/modules/services/server/matrix.nix
index 223c5e3..5b0b388 100644
--- a/modules/services/server/matrix.nix
+++ b/modules/services/server/matrix.nix
@@ -17,10 +17,6 @@ let
     return 200 '${builtins.toJSON data}';
   '';
 in {
-  environment.systemPackages = [
-    pkgs.mautrix-whatsapp
-  ];
-
   services.nginx = {
     enable = true;
     recommendedTlsSettings = true;
@@ -212,11 +208,13 @@ in {
                   };
               };
               logging = {
-	          min-level = "warn";
-		  writers = {
+	          min_level = "warn";
+		  writers = [
+		    {
 		      format = "pretty-colored";
 		      type = "stdout";
-		  };
+		    }
+		  ];
               };
           };
       };
@@ -260,11 +258,13 @@ in {
                   };
               };
               logging = {
-	          min-level = "warn";
-		  writers = {
+	          min_level = "warn";
+		  writers = [
+		    {
 		      format = "pretty-colored";
 		      type = "stdout";
-		  };
+		    }
+		  ];
               };
           };
       };
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 1ba880c..eff9d93 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -69,7 +69,6 @@ in
         "services/matrix/synapse.age".publicKeys = servers ++ users;
         "services/matrix/mautrix-telegram.age".publicKeys = servers ++ users;
         "services/matrix/mautrix-whatsapp.age".publicKeys = servers ++ users;
-        "services/matrix/mautrix-whatsapp.old.age".publicKeys = servers ++ users;
         "services/matrix/mautrix-signal.age".publicKeys = servers ++ users;
         "services/nextcloud/adminpassFile.age".publicKeys = servers ++ users;
         "services/nextcloud/dbpassFile.age".publicKeys = servers ++ users;
diff --git a/secrets/services/matrix/mautrix-signal.old.age b/secrets/services/matrix/mautrix-signal.old.age
deleted file mode 100644
index 626a20a..0000000
Binary files a/secrets/services/matrix/mautrix-signal.old.age and /dev/null differ
diff --git a/secrets/services/matrix/mautrix-whatsapp.old.age b/secrets/services/matrix/mautrix-whatsapp.old.age
deleted file mode 100644
index 695c1a3..0000000
Binary files a/secrets/services/matrix/mautrix-whatsapp.old.age and /dev/null differ
diff --git a/secrets/services/matrix/whatsapp-registration.age b/secrets/services/matrix/whatsapp-registration.age
deleted file mode 100644
index 3802eff..0000000
Binary files a/secrets/services/matrix/whatsapp-registration.age and /dev/null differ