diff --git a/modules/nixos/bundles/common/default.nix b/modules/nixos/bundles/common/default.nix
index 41ebd09..7397d75 100644
--- a/modules/nixos/bundles/common/default.nix
+++ b/modules/nixos/bundles/common/default.nix
@@ -69,7 +69,7 @@ in {
           impermanence = enabled;
           postgresql = {
             databases = {
-              shiori = ["grafana" "forgejo" "vaultwarden" "terraform"];
+              tsuki = ["grafana" "forgejo" "vaultwarden" "terraform"];
             };
           };
           syncthing = {
diff --git a/modules/nixos/bundles/common/networking.nix b/modules/nixos/bundles/common/networking.nix
index 0570bd7..0f4260a 100644
--- a/modules/nixos/bundles/common/networking.nix
+++ b/modules/nixos/bundles/common/networking.nix
@@ -78,7 +78,7 @@ in {
           };
         };
 
-        shiori = {
+        tsuki = {
           dash = {
             port = 5150;
             internal = true;
@@ -103,7 +103,9 @@ in {
             port = 5301;
             internal = true;
           };
+        };
 
+        shiori = {
           blocky = {
             port = 53;
           };
diff --git a/systems/x86_64-linux/shiori/default.nix b/systems/x86_64-linux/shiori/default.nix
index d501c47..0ff75bd 100755
--- a/systems/x86_64-linux/shiori/default.nix
+++ b/systems/x86_64-linux/shiori/default.nix
@@ -17,32 +17,6 @@ in {
     bundles = {
       common = enabled;
     };
-
-    services = {
-      ci = {
-        gitea-runner = {
-          enable = true;
-          runners."default" = {
-            capacity = 4;
-          };
-        };
-        woodpecker.runners.primary = {
-          enable = true;
-          capacity = 4;
-        };
-      };
-
-      networking = {
-        cloudflared = enabled;
-        httpd = enabled;
-      };
-
-      storage = {
-        samba.mounts = {
-          "shared" = "arisu";
-        };
-      };
-    };
   };
 
   programs.nh = {
diff --git a/systems/x86_64-linux/tsuki/default.nix b/systems/x86_64-linux/tsuki/default.nix
index a6b572f..c2c7530 100755
--- a/systems/x86_64-linux/tsuki/default.nix
+++ b/systems/x86_64-linux/tsuki/default.nix
@@ -15,6 +15,32 @@ in {
     bundles = {
       common = enabled;
     };
+
+    services = {
+      ci = {
+        gitea-runner = {
+          enable = true;
+          runners."default" = {
+            capacity = 4;
+          };
+        };
+        woodpecker.runners.primary = {
+          enable = true;
+          capacity = 4;
+        };
+      };
+
+      networking = {
+        cloudflared = enabled;
+        httpd = enabled;
+      };
+
+      storage = {
+        samba.mounts = {
+          "shared" = "arisu";
+        };
+      };
+    };
   };
 
   programs.nh = {