diff --git a/modules/programs/gitea/default.nix b/modules/programs/gitea/default.nix
index 6840c3d..abcdf95 100644
--- a/modules/programs/gitea/default.nix
+++ b/modules/programs/gitea/default.nix
@@ -9,16 +9,6 @@ in {
     group = config.services.gitea.user;
   };
 
-  services.postgresql = {
-    ensureDatabases = [config.services.gitea.user];
-    ensureUsers = [
-      {
-        name = config.services.gitea.database.user;
-        ensureDBOwnership = true;
-      }
-    ];
-  };
-
   services.gitea = {
     enable = true;
     lfs.enable = true;
@@ -27,6 +17,7 @@ in {
     database = {
       type = "postgres";
       passwordFile = config.age.secrets.gitea.path;
+      name = config.services.gitea.user;
       user = config.services.gitea.user;
     };
 
@@ -64,6 +55,15 @@ in {
     };
   };
 
+  users.users.git = {
+    description = "Gitea Service";
+    hme = config.services.gitea.stateDir;
+    useDefaultShell = true;
+    group = "git";
+    isSystemUser = true;
+  };
+  users.groups.git = {};
+
   security.acme = {
     acceptTerms = true;
     email = "chinmaydpai@gmail.com";