diff --git a/nixos/machines/chungus/configuration.nix b/nixos/machines/chungus/configuration.nix
index a1fd32d..d6ab97f 100644
--- a/nixos/machines/chungus/configuration.nix
+++ b/nixos/machines/chungus/configuration.nix
@@ -51,10 +51,10 @@
 
     ./services-s3.nix
     ./services-vault.nix
+    ./services-forgejo.nix
 
     #./kiosk.nix
     ./trilium.nix
-    ./gitea.nix
     ./atuin.nix
 
     ./cache.nix
diff --git a/nixos/machines/chungus/gitea.nix b/nixos/machines/chungus/services-forgejo.nix
similarity index 82%
rename from nixos/machines/chungus/gitea.nix
rename to nixos/machines/chungus/services-forgejo.nix
index be2c856..6d2117d 100644
--- a/nixos/machines/chungus/gitea.nix
+++ b/nixos/machines/chungus/services-forgejo.nix
@@ -17,12 +17,11 @@
     };
   };
 
-  services.gitea = {
+  services.forgejo = {
     enable = true;
-    appName = "git.chungus.private";
-    package = pkgs.forgejo;
-    stateDir = "/srv/gitea";
+    stateDir = "/srv/forgejo";
     settings = {
+      DEFAULT.APP_NAME = "git.chungus.private";
       server.ROOT_URL = "http://git.chungus.private/";
       server.DOMAIN = "git.chungus.private";
       service.DISABLE_REGISTRATION = false;
@@ -34,6 +33,4 @@
     };
   };
 
-  # backup.dirs = [ "/srv/gitea" ];
-
 }
diff --git a/nixos/machines/orbi/service-forgejo.nix b/nixos/machines/orbi/service-forgejo.nix
index b5a68e2..10de57e 100644
--- a/nixos/machines/orbi/service-forgejo.nix
+++ b/nixos/machines/orbi/service-forgejo.nix
@@ -17,12 +17,10 @@
 
   services.forgejo = {
     enable = true;
-    appName = "git.ingolf-wagner.de";
-    #cookieSecure = true;
-    #disableRegistration = true;
     settings = {
       server.ROOT_URL = "https://git.ingolf-wagner.de/";
       server.DOMAIN = "git.ingolf-wagner.de";
+      DEFAULT.APP_NAME = "git.ingolf-wagner.de";
       service.DISABLE_REGISTRATION = true;
       session.COOKIE_SECURE = true;
       log.LEVEL = "Warn";