diff --git a/deploy.nix b/deploy.nix
index c9eba144..3fdd0357 100644
--- a/deploy.nix
+++ b/deploy.nix
@@ -5,7 +5,7 @@
 }: {
   nodes = {
     mirai = {
-      hostname = "mirai";
+      hostname = "mirai.darksailor.dev";
       profiles.system = {
         sshUser = "fs0c131y";
         path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.mirai;
@@ -28,6 +28,14 @@
         user = "root";
       };
     };
+    tako = {
+      hostname = "tako.darksailor.dev";
+      profiles.system = {
+        sshUser = "root";
+        path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.tako;
+        user = "root";
+      };
+    };
     # kuro = {
     #   hostname = "kuro";
     #   interactiveSudo = true;
diff --git a/nixos/tako/configuration.nix b/nixos/tako/configuration.nix
index 5147215c..a570b49f 100644
--- a/nixos/tako/configuration.nix
+++ b/nixos/tako/configuration.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";
@@ -58,7 +58,7 @@
       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;
@@ -69,7 +69,7 @@
     distributedBuilds = true;
   };
 
-  users.users.fs0c131y = {
+  users.users.${device.user} = {
     isNormalUser = true;
     extraGroups = ["wheel" "docker" "media"];
     openssh.authorizedKeys.keyFiles = [
@@ -92,7 +92,7 @@
   # networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
 
   # Set your time zone.
-  time.timeZone = "Europe/Helsinki";
+  time.timeZone = "Asia/Singapore";
 
   # Configure network proxy if necessary
   # networking.proxy.default = "http://user:password@proxy:port/";
diff --git a/nixos/tako/disk-config.nix b/nixos/tako/disk-config.nix
index 4ce69c34..e2bcc1f4 100644
--- a/nixos/tako/disk-config.nix
+++ b/nixos/tako/disk-config.nix
@@ -3,7 +3,7 @@
     disk = {
       one = {
         type = "disk";
-        device = "/dev/nvme0n1";
+        device = "/dev/sda";
         content = {
           type = "gpt";
           partitions = {
@@ -31,7 +31,7 @@
       };
       two = {
         type = "disk";
-        device = "/dev/nvme1n1";
+        device = "/dev/sdb";
         content = {
           type = "gpt";
           partitions = {
@@ -51,7 +51,7 @@
         type = "lvm_vg";
         lvs = {
           root = {
-            size = "64G";
+            size = "128G";
             lvm_type = "mirror";
             content = {
               type = "filesystem";
@@ -72,7 +72,7 @@
             };
           };
           home = {
-            size = "256G";
+            size = "64G";
             lvm_type = "raid0";
             content = {
               type = "filesystem";
diff --git a/nixos/tako/services/default.nix b/nixos/tako/services/default.nix
index 4c2d3cac..607e5479 100644
--- a/nixos/tako/services/default.nix
+++ b/nixos/tako/services/default.nix
@@ -6,22 +6,22 @@
     ./excalidraw.nix
     ./fail2ban.nix
     ./flaresolverr.nix
-    ./games
+    # ./games
     ./gitea.nix
     ./homepage.nix
     # ./immich.nix
     ./immich.nix
     # ./llama.nix
     ./lldap.nix
-    ./monitoring.nix
-    ./nextcloud.nix
+    # ./monitoring.nix
+    # ./nextcloud.nix
     # ./paperless.nix
     ./prowlarr.nix
     ./resolved.nix
     ./searxng.nix
     ./tailscale.nix
-    ./headscale.nix
-    ./shitpost.nix
+    # ./headscale.nix
+    # ./shitpost.nix
   ];
   services = {
     nix-serve = {