diff --git a/modules/server/containers/apps/gitea.nix b/modules/server/containers/apps/gitea.nix
index c8398d9..408b4b2 100644
--- a/modules/server/containers/apps/gitea.nix
+++ b/modules/server/containers/apps/gitea.nix
@@ -88,11 +88,11 @@ in {
     trigger = "server";
     script = pkgs.writeShellScript "setup" ''
       # Define the command wrapper
-      GT="${pkgs.podman}/bin/podman --events-backend=none exec --env-file ${config.sops.secrets."CUSTOM".path} -e DOMAIN=${serverCfg.hostDomain} -u root gitea-server gitea"
+      GT="${pkgs.podman}/bin/podman --events-backend=none exec --env-file ${config.sops.secrets."CUSTOM".path} -e DOMAIN=${serverCfg.hostDomain} -u git gitea-server gitea"
+
+      $GT admin user create --username "\$DEFAULT_ADMIN_USERNAME" --password "\$DEFAULT_ADMIN_PASSWORD" --email "\$DEFAULT_ADMIN_EMAIL" --admin || true
+      $GT admin user change --username "\$DEFAULT_ADMIN_USERNAME" --admin || true
 
-      $GT admin user create --admin --username "$DEFAULT_ADMIN_USERNAME" --password "$DEFAULT_ADMIN_PASSWORD" --email "$DEFAULT_ADMIN_EMAIL" || true
-      $GT admin user change --username "$DEFAULT_ADMIN_USERNAME" --admin
-      
       echo "Completed Gitea Setup"
       '';
   };