diff --git a/flake.nix b/flake.nix
index 006b1ff..599929b 100755
--- a/flake.nix
+++ b/flake.nix
@@ -60,28 +60,28 @@
 				homeManagerModules = import ./modules/home-manager;
         
         nixosConfigurations = {
-          makise = inputs.nixpkgs.lib.nixosSystem {
+          cl-00-00 = inputs.nixpkgs.lib.nixosSystem {
             specialArgs = { inherit inputs outputs; };
             modules = [
-              ./hosts/makise/system/system.nix
+              ./hosts/cl-00-00/system/system.nix
             ];
           };
         };
 
         homeConfigurations = {
-          "kurisu@makise" = inputs.home-manager.lib.homeManagerConfiguration {
+          "kurisu@cl-00-00" = inputs.home-manager.lib.homeManagerConfiguration {
             pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
             extraSpecialArgs = { inherit inputs outputs; };
             modules = [
-              ./hosts/makise/homes/kurisu/home.nix
+              ./hosts/cl-00-00/homes/kurisu/home.nix
             ];
           };
 
-          "admin@makise" = inputs.home-manager.lib.homeManagerConfiguration {
+          "admin@cl-00-00" = inputs.home-manager.lib.homeManagerConfiguration {
             pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
             extraSpecialArgs = { inherit inputs outputs; };
             modules = [
-              ./hosts/makise/homes/admin/default.nix
+              ./hosts/cl-00-00/homes/admin/default.nix
             ];
           };
         };
diff --git a/hosts/makise/.sops.yaml b/hosts/cl-00-00/.sops.yaml
similarity index 65%
rename from hosts/makise/.sops.yaml
rename to hosts/cl-00-00/.sops.yaml
index d6e981f..ef8cc6e 100755
--- a/hosts/makise/.sops.yaml
+++ b/hosts/cl-00-00/.sops.yaml
@@ -1,9 +1,9 @@
 keys:
-  - &host_makise age1pj86dmk8j5tne0r7zu09v3x40xjdae6mhvrzyw5squ9px96z9p0suj89f8
+  - &host_cl-00-00 age1pj86dmk8j5tne0r7zu09v3x40xjdae6mhvrzyw5squ9px96z9p0suj89f8
   - &user_kurisu age1w3n63wg0pkjy300hsaw6uvd6ell7hpkfpd7knjsp637u2dcjx3nql654fm
 creation_rules:
   - path_regex: secrets/[^/]+\.(yaml|json|env|ini)$
     key_groups:
     - age:
-      - *host_makise
+      - *host_cl-00-00
       - *user_kurisu
diff --git a/hosts/makise/homes/admin/default.nix b/hosts/cl-00-00/homes/admin/default.nix
similarity index 100%
rename from hosts/makise/homes/admin/default.nix
rename to hosts/cl-00-00/homes/admin/default.nix
diff --git a/hosts/makise/homes/kurisu/configuration/default.nix b/hosts/cl-00-00/homes/kurisu/configuration/default.nix
similarity index 100%
rename from hosts/makise/homes/kurisu/configuration/default.nix
rename to hosts/cl-00-00/homes/kurisu/configuration/default.nix
diff --git a/hosts/makise/homes/kurisu/configuration/git.nix b/hosts/cl-00-00/homes/kurisu/configuration/git.nix
similarity index 100%
rename from hosts/makise/homes/kurisu/configuration/git.nix
rename to hosts/cl-00-00/homes/kurisu/configuration/git.nix
diff --git a/hosts/makise/homes/kurisu/home.nix b/hosts/cl-00-00/homes/kurisu/home.nix
similarity index 100%
rename from hosts/makise/homes/kurisu/home.nix
rename to hosts/cl-00-00/homes/kurisu/home.nix
diff --git a/hosts/makise/secrets/default.yaml b/hosts/cl-00-00/secrets/default.yaml
similarity index 100%
rename from hosts/makise/secrets/default.yaml
rename to hosts/cl-00-00/secrets/default.yaml
diff --git a/hosts/makise/system/configuration/default.nix b/hosts/cl-00-00/system/configuration/default.nix
similarity index 100%
rename from hosts/makise/system/configuration/default.nix
rename to hosts/cl-00-00/system/configuration/default.nix
diff --git a/hosts/makise/system/configuration/forgejo.nix b/hosts/cl-00-00/system/configuration/forgejo.nix
similarity index 100%
rename from hosts/makise/system/configuration/forgejo.nix
rename to hosts/cl-00-00/system/configuration/forgejo.nix
diff --git a/hosts/makise/system/configuration/gc.nix b/hosts/cl-00-00/system/configuration/gc.nix
similarity index 100%
rename from hosts/makise/system/configuration/gc.nix
rename to hosts/cl-00-00/system/configuration/gc.nix
diff --git a/hosts/makise/system/configuration/postgres.nix b/hosts/cl-00-00/system/configuration/postgres.nix
similarity index 100%
rename from hosts/makise/system/configuration/postgres.nix
rename to hosts/cl-00-00/system/configuration/postgres.nix
diff --git a/hosts/makise/system/configuration/sops.nix b/hosts/cl-00-00/system/configuration/sops.nix
similarity index 100%
rename from hosts/makise/system/configuration/sops.nix
rename to hosts/cl-00-00/system/configuration/sops.nix
diff --git a/hosts/makise/system/configuration/ssh.nix b/hosts/cl-00-00/system/configuration/ssh.nix
similarity index 100%
rename from hosts/makise/system/configuration/ssh.nix
rename to hosts/cl-00-00/system/configuration/ssh.nix
diff --git a/hosts/makise/system/configuration/traefik.nix b/hosts/cl-00-00/system/configuration/traefik.nix
similarity index 100%
rename from hosts/makise/system/configuration/traefik.nix
rename to hosts/cl-00-00/system/configuration/traefik.nix
diff --git a/hosts/makise/system/configuration/users.nix b/hosts/cl-00-00/system/configuration/users.nix
similarity index 100%
rename from hosts/makise/system/configuration/users.nix
rename to hosts/cl-00-00/system/configuration/users.nix
diff --git a/hosts/makise/system/disk-configuration.nix b/hosts/cl-00-00/system/disk-configuration.nix
similarity index 100%
rename from hosts/makise/system/disk-configuration.nix
rename to hosts/cl-00-00/system/disk-configuration.nix
diff --git a/hosts/makise/system/hardware-configuration.nix b/hosts/cl-00-00/system/hardware-configuration.nix
similarity index 100%
rename from hosts/makise/system/hardware-configuration.nix
rename to hosts/cl-00-00/system/hardware-configuration.nix
diff --git a/hosts/makise/system/impermanence-configuration.nix b/hosts/cl-00-00/system/impermanence-configuration.nix
similarity index 100%
rename from hosts/makise/system/impermanence-configuration.nix
rename to hosts/cl-00-00/system/impermanence-configuration.nix
diff --git a/hosts/makise/system/system.nix b/hosts/cl-00-00/system/system.nix
similarity index 100%
rename from hosts/makise/system/system.nix
rename to hosts/cl-00-00/system/system.nix
diff --git a/scripts/rebuild-system.sh b/scripts/rebuild-system.sh
index d6f5474..7e893ae 100755
--- a/scripts/rebuild-system.sh
+++ b/scripts/rebuild-system.sh
@@ -5,10 +5,6 @@
 # USAGE:
 #   rebuild-system.sh             # Rebuild system with current hostname
 #   rebuild-system.sh hostname    # Rebuild specific system
-#
-# EXAMPLES:
-#   rebuild-system.sh
-#   rebuild-system.sh makise
 
 if [ ! -z $1 ]; then
   export HOST=$1