diff --git a/config/hosts/matrix/default.nix b/config/hosts/matrix/default.nix
index 27528b7..9b4da42 100644
--- a/config/hosts/matrix/default.nix
+++ b/config/hosts/matrix/default.nix
@@ -3,6 +3,7 @@
   imports = [
     ./configuration.nix
     ./hardware-configuration.nix
+    ./mas.nix
     ./postgresql.nix
     ./matrix-synapse.nix
     ./nginx.nix
diff --git a/config/hosts/matrix/mas.nix b/config/hosts/matrix/mas.nix
new file mode 100644
index 0000000..4750b5f
--- /dev/null
+++ b/config/hosts/matrix/mas.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    matrix-authentication-service
+  ];
+}
diff --git a/config/hosts/matrix/postgresql.nix b/config/hosts/matrix/postgresql.nix
index 03b753a..06d10e2 100644
--- a/config/hosts/matrix/postgresql.nix
+++ b/config/hosts/matrix/postgresql.nix
@@ -8,6 +8,11 @@
         TEMPLATE template0
         LC_COLLATE = "C"
         LC_CTYPE = "C";
+      CREATE ROLE "mas_user" WITH LOGIN PASSWORD 'mas';
+      CREATE DATABASE "mas" WITH OWNER "mas_user"
+        TEMPLATE template0
+        LC_COLLATE = "C"
+        LC_CTYPE = "C";
     '';
   };
 }