diff --git a/.vscode/mcp.json b/.vscode/mcp.json
new file mode 100644
index 0000000..b603b1c
--- /dev/null
+++ b/.vscode/mcp.json
@@ -0,0 +1,10 @@
+{
+    "servers": {
+        "nixos": {
+            "command": "uvx",
+            "args": [
+                "mcp-nixos"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/systems/palatine-hill/configuration.nix b/systems/palatine-hill/configuration.nix
index c41c3e8..f3d3eb4 100644
--- a/systems/palatine-hill/configuration.nix
+++ b/systems/palatine-hill/configuration.nix
@@ -14,6 +14,7 @@
     ./haproxy
     ./hardware-changes.nix
     ./hydra.nix
+    ./mattermost.nix
     ./minio.nix
     ./networking.nix
     ./nextcloud.nix
diff --git a/systems/palatine-hill/mattermost.nix b/systems/palatine-hill/mattermost.nix
new file mode 100644
index 0000000..f4c8021
--- /dev/null
+++ b/systems/palatine-hill/mattermost.nix
@@ -0,0 +1,19 @@
+{
+  config,
+}:
+let
+  vars = import ./vars.nix;
+in
+
+{
+  services.mattermost = {
+    enable = true;
+    siteUrl = "https://mattermost.nayeonie.com"; # Set this to the URL you will be hosting the site on.
+    database = {
+      peerAuth = true; # This allows Mattermost to connect to the database without a password, which is more secure when both are on the same machine.
+      create = true;
+      driver = "postgres";
+    };
+    dataDir = "${vars.primary_mattermost}/mattermost";
+  };
+}
diff --git a/systems/palatine-hill/postgresql.nix b/systems/palatine-hill/postgresql.nix
index 0e5dc45..95ea9b7 100644
--- a/systems/palatine-hill/postgresql.nix
+++ b/systems/palatine-hill/postgresql.nix
@@ -40,6 +40,7 @@ in
       ensureDatabases = [
         "atticd"
         "alice"
+        "mattermost"
       ];
       ensureUsers = [
         {
@@ -171,6 +172,7 @@ in
           "hydra-server"
           "atticd"
           "gitea"
+          "mattermost"
         ];
       };
     };
diff --git a/systems/palatine-hill/vars.nix b/systems/palatine-hill/vars.nix
index 821c461..62a29ab 100644
--- a/systems/palatine-hill/vars.nix
+++ b/systems/palatine-hill/vars.nix
@@ -20,4 +20,5 @@ rec {
   primary_plex = "${zfs_primary}/plex";
   primary_plex_storage = "${zfs_primary}/plex_storage";
   primary_ollama = "${zfs_primary}/ollama";
+  primary_mattermost = "${zfs_primary}/mattermost";
 }