diff --git a/src/system/modules/forgejo/default.nix b/src/system/modules/forgejo/default.nix
index f9a3eca..b3af3e2 100644
--- a/src/system/modules/forgejo/default.nix
+++ b/src/system/modules/forgejo/default.nix
@@ -10,24 +10,24 @@ in
   config = mkIf cfg.enable {
     users = {
       users = {
-        "git" = {
+        "${config.services.forgejo.user}" = {
           description = "Git server system user";
           isSystemUser = true;
-          group = "git";
+          group = "${config.services.forgejo.user}";
           extraGroups = mkIf nginx.enable [
             "web"
           ];
         };
-        "nginx" = {
+        "${config.services.nginx.user}" = {
           extraGroups = mkIf nginx.enable [
-            "git"
+            "${config.services.forgejo.group}"
           ];
         };
       };
       groups = {
-        "git" = {
+        "${config.services.forgejo.group}" = {
           members = [
-            "git"
+            "${config.services.forgejo.user}"
           ];
         };
       };
@@ -36,7 +36,7 @@ in
     services.forgejo = rec {
       enable = true;
       user = "git";
-      group = "git";
+      group = user;
       stateDir = "/var/lib/forgejo";
       
       settings = {
diff --git a/src/system/modules/nginx/default.nix b/src/system/modules/nginx/default.nix
index bb35cca..61c717d 100644
--- a/src/system/modules/nginx/default.nix
+++ b/src/system/modules/nginx/default.nix
@@ -10,26 +10,26 @@ in
   config = mkIf cfg.enable {
     users = {
       users = {
-        "nginx" = {
+        "${config.services.nginx.user}" = {
           description = "Web server system user";
           isSystemUser = true;
-          group = mkForce "web";
+          group = mkForce "${config.services.nginx.group}";
         };
         "btc" = {
           extraGroups = mkIf module.bitcoin.enable [
-            "web"
+            "${config.services.nginx.group}"
           ];
         };
-        "git" = {
+        "${config.services.forgejo.user}" = {
           extraGroups = mkIf module.forgejo.enable [
-            "web"
+            "${config.services.nginx.group}"
           ];
         };
       };
       groups = {
-        "web" = {
+        "${config.services.nginx.group}" = {
           members = [
-            "nginx"
+            "${config.services.nginx.user}"
           ];
         };
       };
@@ -56,6 +56,9 @@ in
 
     services.nginx = {
       enable = true;
+      user = "nginx";
+      group = "web";
+
       virtualHosts = 
       let
         certPath = config.security.acme.certs."ramos.codes".directory;
@@ -66,7 +69,6 @@ in
           inherit sslCertificate sslCertificateKey;
           forceSSL = true;
         }) hosts;
-
       in withSSL
       {
         "git.ramos.codes" = mkIf module.forgejo.enable {