diff --git a/ci/flake-cron.nix b/ci/flake-cron.nix
index 685b3e92..37853b46 100644
--- a/ci/flake-cron.nix
+++ b/ci/flake-cron.nix
@@ -108,7 +108,7 @@ in {
             echo "checking that network.nodes.still build..." >&2
             if ${nodeBuildString}; then
               if [[ -n $CACHIX_SIGNING_KEY ]]; then
-                cachix push kittywitch result*/ &
+                cachix push gensokyo-infrastructure result*/ &
                 CACHIX_PUSH=$!
               fi
               git add flake.lock
@@ -140,9 +140,9 @@ in {
       publicKey = "arc.cachix.org-1:DZmhclLkB6UO0rc0rBzNpwFbbaeLfyn+fYccuAy7YVY=";
       signingKey = null;
     };
-    kittywitch = {
+    gensokyo-infrastructure = {
       enable = true;
-      publicKey = "kittywitch.cachix.org-1:KIzX/G5cuPw5WgrXad6UnrRZ8UDr7jhXzRTK/lmqyK0=";
+      publicKey = "gensokyo-infrastructure.cachix.org-1:CY6ChfQ8KTUdwWoMbo8ZWr2QCLMXUQspHAxywnS2FyI=";
       signingKey = "mewp";
     };
   };
diff --git a/ci/nodes.nix b/ci/nodes.nix
index 1f97166b..1bfa41e2 100644
--- a/ci/nodes.nix
+++ b/ci/nodes.nix
@@ -71,9 +71,9 @@ with lib; {
     enable = true;
     publicKey = "arc.cachix.org-1:DZmhclLkB6UO0rc0rBzNpwFbbaeLfyn+fYccuAy7YVY=";
   };
-  cache.cachix.kittywitch = {
+  cache.cachix.gensokyo-infrastructure = {
     enable = true;
-    publicKey = "kittywitch.cachix.org-1:KIzX/G5cuPw5WgrXad6UnrRZ8UDr7jhXzRTK/lmqyK0=";
+    publicKey = "gensokyo-infrastructure.cachix.org-1:CY6ChfQ8KTUdwWoMbo8ZWr2QCLMXUQspHAxywnS2FyI=";
     signingKey = "mewp";
   };
 }
diff --git a/flake.nix b/flake.nix
index b52198d3..1999f437 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,11 +30,11 @@
   nixConfig = {
     extra-substituters = [
       "https://arc.cachix.org"
-      "https://kittywitch.cachix.org"
+      "https://gensokyo-infrastructure.cachix.org"
     ];
     extra-trusted-public-keys = [
       "arc.cachix.org-1:DZmhclLkB6UO0rc0rBzNpwFbbaeLfyn+fYccuAy7YVY="
-      "kittywitch.cachix.org-1:KIzX/G5cuPw5WgrXad6UnrRZ8UDr7jhXzRTK/lmqyK0="
+      "gensokyo-infrastructure.cachix.org-1:CY6ChfQ8KTUdwWoMbo8ZWr2QCLMXUQspHAxywnS2FyI="
     ];
   };