diff --git a/nixos/mirai/configuration.nix b/nixos/mirai/configuration.nix
index be1ea087..01e69ad3 100644
--- a/nixos/mirai/configuration.nix
+++ b/nixos/mirai/configuration.nix
@@ -7,7 +7,7 @@
   imports = [
     # Include the results of the hardware scan.
     ./services
-    ./tako.nix
+    ./mirai.nix
     # ./docker.nix
   ];
 
@@ -24,7 +24,7 @@
 
   security.sudo.wheelNeedsPassword = false;
   sops = {
-    secrets."builder/tako/cache/private" = {};
+    secrets."builder/mirai/cache/private" = {};
     secrets.users = {
       sopsFile = ../../secrets/users.yaml;
       format = "yaml";
@@ -51,14 +51,14 @@
       trusted-public-keys = [
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
         "nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI="
-        # "tako:bcVPoFGBZ0i7JAKMXIqLj2GY3CulLC4kP7rQyqes1RM="
+        # "mirai:bcVPoFGBZ0i7JAKMXIqLj2GY3CulLC4kP7rQyqes1RM="
       ];
     };
     extraOptions = ''
       build-users-group = nixbld
       extra-nix-path = nixpkgs=flake:nixpkgs
       builders-use-substitutes = true
-      secret-key-files = ${config.sops.secrets."builder/tako/cache/private".path}
+      secret-key-files = ${config.sops.secrets."builder/mirai/cache/private".path}
     '';
     gc = {
       automatic = true;
@@ -86,7 +86,7 @@
   users.groups.media = {};
 
   nixpkgs.config.allowUnfree = true;
-  networking.hostName = "tako"; # Define your hostname.
+  networking.hostName = "mirai"; # Define your hostname.
   # Pick only one of the below networking options.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
   # networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
diff --git a/nixos/mirai/services/default.nix b/nixos/mirai/services/default.nix
index 7e1e13ee..478aa438 100644
--- a/nixos/mirai/services/default.nix
+++ b/nixos/mirai/services/default.nix
@@ -1,26 +1,26 @@
 {...}: {
   imports = [
-    ./atuin.nix
-    ./authelia.nix
-    ./caddy.nix
-    ./excalidraw.nix
-    ./fail2ban.nix
-    ./flaresolverr.nix
-    ./games
-    ./gitea.nix
-    ./homepage.nix
-    # ./immich.nix
-    ./immich.nix
-    # ./llama.nix
-    ./lldap.nix
-    ./nextcloud.nix
-    # ./paperless.nix
-    ./prowlarr.nix
-    ./resolved.nix
-    ./searxng.nix
+    #   ./atuin.nix
+    #   ./authelia.nix
+    #   ./caddy.nix
+    #   ./excalidraw.nix
+    #   ./fail2ban.nix
+    #   ./flaresolverr.nix
+    #   ./games
+    #   ./gitea.nix
+    #   ./homepage.nix
+    #   # ./immich.nix
+    #   ./immich.nix
+    #   # ./llama.nix
+    #   ./lldap.nix
+    #   ./nextcloud.nix
+    #   # ./paperless.nix
+    #   ./prowlarr.nix
+    #   ./resolved.nix
+    #   ./searxng.nix
     ./tailscale.nix
-    ./headscale.nix
-    ./shitpost.nix
+    #   ./headscale.nix
+    #   ./shitpost.nix
   ];
   services = {
     nix-serve = {
diff --git a/nixos/mirai/services/gitea.nix b/nixos/mirai/services/gitea.nix
index 7161ff11..4b3e3ce1 100644
--- a/nixos/mirai/services/gitea.nix
+++ b/nixos/mirai/services/gitea.nix
@@ -6,7 +6,7 @@
 }: {
   virtualisation.docker.enable = true;
   sops = {
-    # secrets."gitea/registration".owner = config.systemd.services.gitea-actions-tako.serviceConfig.User;
+    # secrets."gitea/registration".owner = config.systemd.services.gitea-actions-mirai.serviceConfig.User;
     secrets."gitea/registration" = {};
     secrets."authelia/oidc/gitea/client_secret" = {
       owner = config.systemd.services.authelia-darksailor.serviceConfig.User;
@@ -77,9 +77,9 @@
     };
     # gitea-actions-runner = {
     #   instances = {
-    #     tako = {
+    #     mirai = {
     #       enable = true;
-    #       name = "tako";
+    #       name = "mirai";
     #       url = "https://git.darksailor.dev";
     #       labels = [
     #         "ubuntu-latest:docker://catthehacker/ubuntu:full-latest"
@@ -149,7 +149,7 @@
     after = ["sops-install-secrets.service"];
   };
 
-  # systemd.services."gitea-actions-tako" = {
+  # systemd.services."gitea-actions-mirai" = {
   #   after = ["gitea.service"];
   # };
 
diff --git a/nixos/tako/services/default.nix b/nixos/tako/services/default.nix
index b4493aa1..d22f99b7 100644
--- a/nixos/tako/services/default.nix
+++ b/nixos/tako/services/default.nix
@@ -1,26 +1,26 @@
 {...}: {
   imports = [
-    ./excalidraw.nix
-    # ./fail2ban.nix
-    ./flaresolverr.nix
-    # # ./games
-    # ./gitea.nix
-    ./homepage.nix
-    # # ./llama.nix
-    # # ./monitoring.nix
-    # # ./nextcloud.nix
-    # # ./paperless.nix
-    ./prowlarr.nix
-    # ./resolved.nix
-    ./searxng.nix
+    # ./games
     # ./headscale.nix
+    # ./llama.nix
+    # ./monitoring.nix
+    # ./paperless.nix
     # ./shitpost.nix
     ./atuin.nix
-    ./caddy.nix
     ./authelia.nix
+    ./caddy.nix
+    ./excalidraw.nix
+    ./fail2ban.nix
+    ./flaresolverr.nix
+    ./gitea.nix
+    ./homepage.nix
     ./immich.nix
     ./lldap.nix
+    ./nextcloud.nix
     ./openssh.nix
+    ./prowlarr.nix
+    ./resolved.nix
+    ./searxng.nix
     ./tailscale.nix
   ];
   services = {
diff --git a/nixos/tako/services/fail2ban.nix b/nixos/tako/services/fail2ban.nix
index 349a705d..3fe07105 100644
--- a/nixos/tako/services/fail2ban.nix
+++ b/nixos/tako/services/fail2ban.nix
@@ -13,7 +13,6 @@
         maxtime = "168h"; # Do not ban for more than 1 week
         overalljails = true; # Calculate the bantime based on all the violations
       };
-      # I'm beind a CG-NAT
       ignoreIP = [
         "106.219.121.52"
       ];