diff --git a/flake.nix b/flake.nix
index 632745e..6090e43 100644
--- a/flake.nix
+++ b/flake.nix
@@ -56,7 +56,7 @@
 
           ./services
           ./common
-          ./hosts/cl.nixpkgs.lahfa.xyz
+          ./hosts/cl.forkos.org
         ];
       };
     };
diff --git a/hosts/cl.nixpkgs.lahfa.xyz/default.nix b/hosts/cl.forkos.org/default.nix
similarity index 100%
rename from hosts/cl.nixpkgs.lahfa.xyz/default.nix
rename to hosts/cl.forkos.org/default.nix
diff --git a/services/gerrit/default.nix b/services/gerrit/default.nix
index e314710..7ba4fcd 100644
--- a/services/gerrit/default.nix
+++ b/services/gerrit/default.nix
@@ -83,7 +83,7 @@ in
         # pack.threads = "8";
         log.jsonLogging = true;
         log.textLogging = false;
-        sshd.advertisedAddress = "cl.nixpkgs.lahfa.xyz:29418";
+        sshd.advertisedAddress = "cl.forkos.org:29418";
         cache.web_sessions.maxAge = "3 months";
         plugins.allowRemoteAdmin = false;
         change.enableAttentionSet = true;
@@ -92,7 +92,7 @@ in
         # Configures gerrit for being reverse-proxied by nginx as per
         # https://gerrit-review.googlesource.com/Documentation/config-reverseproxy.html
         gerrit = {
-          canonicalWebUrl = "https://cl.nixpkgs.lahfa.xyz";
+          canonicalWebUrl = "https://cl.forkos.org";
           docUrl = "/Documentation";
         };
 
@@ -108,7 +108,7 @@ in
         # Auto-link other CLs
         commentlink.gerrit = {
           match = "cl/(\\d+)";
-          link = "https://cl.nixpkgs.lahfa.xyz/$1";
+          link = "https://cl.forkos.org/$1";
         };
 
         # Configures integration with Keycloak, which then integrates with a