diff --git a/nixosModules/gitea.nix b/nixosModules/gitea.nix
index 29434b1..234ef5f 100644
--- a/nixosModules/gitea.nix
+++ b/nixosModules/gitea.nix
@@ -24,16 +24,16 @@
     # Configure database
     services.postgresql.enable = true;
     services.postgresql = {
-      ensureDatabases = [ "gitea" ];
+      ensureDatabases = [ "git" ];
       ensureUsers = [
-        # {
-        #   name = "git";
-        #   # ensureDBOwnership = true;
-        #   # ensurePermissions."DATABASE ${config.services.gitea.database.name}" = "ALL PRIVILEGES";
-        # }
         {
-          name = "gitea";
+          name = "git";
+          # ensureDBOwnership = true;
+          # ensurePermissions."DATABASE ${config.services.gitea.database.name}" = "ALL PRIVILEGES";
         }
+        # {
+        #   name = "gitea";
+        # }
       ];
     };
 
@@ -50,11 +50,11 @@
     services.gitea = {
       enable = true;
       appName = "Kyren's Code";
-      # user = "git";
-      # group = "git";
+      user = "git";
+      group = "git";
       database = {
-        # user = "gitea";
-        # name = "gitea";
+        user = "git";
+        name = "git";
         type = "postgres";
         passwordFile = config.sops.secrets.gitea-db-password.path;
         # createDatabase = false;
diff --git a/nixosModules/stalwart.nix b/nixosModules/stalwart.nix
index 5079596..af571fc 100644
--- a/nixosModules/stalwart.nix
+++ b/nixosModules/stalwart.nix
@@ -20,7 +20,7 @@
     sops.secrets.stalwart-admin-password = { owner = "stalwart-mail"; group = "stalwart-mail"; };
     sops.secrets.stalwart-kyren-password = { owner = "stalwart-mail"; group = "stalwart-mail"; };
     sops.secrets.stalwart-eko-password = { owner = "stalwart-mail"; group = "stalwart-mail"; };
-    sops.secrets.stalwart-git-password = { owner = "stalwart-mail"; group = "gitea"; mode = "0440"; };
+    sops.secrets.stalwart-git-password = { owner = "stalwart-mail"; group = "git"; mode = "0440"; };
     sops.secrets.stalwart-postmaster-password = { owner = "stalwart-mail"; group = "stalwart-mail"; };
 
     services.nginx.virtualHosts."webadmin.kyren.codes" = {