diff --git a/misskey-service.nix b/misskey-service.nix
index 1c35a28..9d4f263 100644
--- a/misskey-service.nix
+++ b/misskey-service.nix
@@ -2,6 +2,24 @@
   services.postgresql = {
     enable = true;
     package = pkgs.postgresql_15;
+
+    ensureUsers = [
+      { name = "jaina"; }
+      {
+        name = "misskey";
+        ensureDbOwnership = true;
+      }
+      { name = "postgres"; }
+    ];
+    ensureDatabases = [ "misskey" ];
+
+    identMap = ''
+      # ArbitraryMapName systemUser DBUser
+         superuser_map      root      postgres
+         superuser_map      postgres  postgres
+         # Let other names login as themselves
+         superuser_map      /^(.*)$   \1
+    '';
   };
 
   services.redis.servers.misskey = {
@@ -29,7 +47,7 @@
     recommendedProxySettings = true;
 
     upstreams."misskey".extraConfig = ''
-      server unix:/var/run/misskey.sock;
+      server unix:/var/run/misskey/misskey.sock;
     '';
 
     virtualHosts."egirls.gay" = {