diff --git a/flake.nix b/flake.nix
index 693fec5..f2a418b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,9 +35,8 @@
     };
   in 
   {
-    # Laptop Configuration
     nixosConfigurations = {
-      xv-laptop = nixpkgs.lib.nixosSystem {
+      ti-clt-lpt01 = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         specialArgs = { inherit inputs; };
         modules = [
@@ -45,25 +44,10 @@
 
           inputs.nixos-hardware.nixosModules.framework-13-7040-amd
 
-          ./hosts/laptop
+          ./hosts/ti-clt-lpt01
         ];
       };
-    };
 
-    homeConfigurations = {
-      "xeovalyte@xv-laptop" = home-manager.lib.homeManagerConfiguration {
-        pkgs = nixpkgs.legacyPackages.x86_64-linux;
-        extraSpecialArgs = { inherit inputs nix-colors; };
-        modules = [
-          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
-
-          ./hosts/laptop/home.nix
-        ];
-      };
-    };
-
-    # Christa Desktop Configuration
-    nixosConfigurations = {
       ch-clt-dsk01 = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         specialArgs = { inherit inputs; };
@@ -73,22 +57,7 @@
           ./hosts/ch-clt-dsk01
         ];
       };
-    };
 
-    homeConfigurations = {
-      "kiiwy@ch-clt-dsk01" = home-manager.lib.homeManagerConfiguration {
-        pkgs = nixpkgs.legacyPackages.x86_64-linux;
-        extraSpecialArgs = { inherit inputs nix-colors; };
-        modules = [
-          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
-
-          ./hosts/ch-clt-dsk01/home.nix
-        ];
-      };
-    };
-
-    # Surface Configuration
-    nixosConfigurations = {
       xv-surface = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         specialArgs = { inherit inputs; };
@@ -101,21 +70,7 @@
           ./hosts/surface
         ];
       };
-    };
 
-    homeConfigurations = {
-      "xeovalyte@xv-surface" = home-manager.lib.homeManagerConfiguration {
-        pkgs = nixpkgs.legacyPackages.x86_64-linux;
-        extraSpecialArgs = { inherit inputs nix-colors; };
-        modules = [
-          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
-        
-          ./hosts/surface/home.nix
-        ];
-      };
-    };
-
-    nixosConfigurations = {
       xv-desktop = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         specialArgs = { inherit inputs; };
@@ -128,6 +83,36 @@
     };
 
     homeConfigurations = {
+      "xeovalyte@ti-clt-lpt01" = home-manager.lib.homeManagerConfiguration {
+        pkgs = nixpkgs.legacyPackages.x86_64-linux;
+        extraSpecialArgs = { inherit inputs nix-colors; };
+        modules = [
+          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
+
+          ./hosts/laptop/home.nix
+        ];
+      };
+
+      "kiiwy@ch-clt-dsk01" = home-manager.lib.homeManagerConfiguration {
+        pkgs = nixpkgs.legacyPackages.x86_64-linux;
+        extraSpecialArgs = { inherit inputs nix-colors; };
+        modules = [
+          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
+
+          ./hosts/ch-clt-dsk01/home.nix
+        ];
+      };
+
+      "xeovalyte@xv-surface" = home-manager.lib.homeManagerConfiguration {
+        pkgs = nixpkgs.legacyPackages.x86_64-linux;
+        extraSpecialArgs = { inherit inputs nix-colors; };
+        modules = [
+          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
+      
+          ./hosts/surface/home.nix
+        ];
+      };
+
       "xeovalyte@xv-desktop" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages.x86_64-linux;
         extraSpecialArgs = { inherit inputs nix-colors; };
@@ -138,32 +123,6 @@
         ];
       };
     };
-
-    # pm01vm01 Configuration
-    nixosConfigurations = {
-      pm01vm01 = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        specialArgs = { inherit inputs; };
-        modules = [
-          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
-
-          ./hosts/pm01vm01
-        ];
-      };
-    };
-
-    homeConfigurations = {
-      "xeovalyte@pm01vm01" = home-manager.lib.homeManagerConfiguration {
-        pkgs = nixpkgs.legacyPackages.x86_64-linux;
-        extraSpecialArgs = { inherit inputs nix-colors; };
-        modules = [
-          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
-        
-          ./hosts/pm01vm01/home.nix
-        ];
-      };
-    };
-
   };
 }
 
diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
index 5dff98c..7e0ef65 100644
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -13,8 +13,6 @@
     };
 
     settings = {
-      hostname = "xv-desktop";
-    
       applications.common.enable = true;
       applications.alacritty.enable = false;
       applications.devenv.enable = true;
@@ -51,13 +49,4 @@
 
     home.stateVersion = "24.05";
   };
-
-  options = {
-    settings.hostname = lib.mkOption {
-      type = with lib.types; str;
-      description = ''
-        Define the host of the machine
-      '';
-    };
-  };
 }
diff --git a/hosts/pm01vm01/default.nix b/hosts/pm01vm01/default.nix
deleted file mode 100644
index 54210c5..0000000
--- a/hosts/pm01vm01/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  imports = [
-    ./hardware-configuration.nix
-
-    # CLI
-    ../../modules/system/cli/common.nix
-    ../../modules/system/cli/docker.nix
-
-    # Hardware
-    ../../modules/system/hardware/firewall.nix
-    ../../modules/system/hardware/garbage-collection.nix
-    ../../modules/system/hardware/locale.nix
-  ];
-
-  nix.settings = {
-    experimental-features = [ "nix-command" "flakes" ];
-
-    substituters = [
-      "https://nix-community.cachix.org"
-    ];
-  };
-
-  # Bootloader.
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.loader.systemd-boot.enable = true;
-
-  networking.hostName = "pm01vm01"; # Define your hostname.
-
-  users.users.xeovalyte = {
-    isNormalUser = true;
-    description = "Timo Boomers";
-    extraGroups = [ "networkmanager" "wheel" ];
-  };
-
-  # Enable ssh
-  services.openssh.enable = true;
-
-  # Forward ports
-  networking.firewall = {
-    allowedTCPPorts = [ 80 443 53 ];
-    allowedUDPPorts = [ 53 ];
-  };
-
-  system.stateVersion = "24.05";
-
-}
diff --git a/hosts/pm01vm01/hardware-configuration.nix b/hosts/pm01vm01/hardware-configuration.nix
deleted file mode 100644
index 1dbc8b1..0000000
--- a/hosts/pm01vm01/hardware-configuration.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/profiles/qemu-guest.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ohci_pci" "ehci_pci" "virtio_pci" "ahci" "usbhid" "sr_mod" "virtio_blk" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/47301fe6-a7db-4ffd-854a-beddd53b6d99";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/6A5B-F811";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
-
-  swapDevices = [ ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp0s8.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-}
diff --git a/hosts/pm01vm01/home.nix b/hosts/pm01vm01/home.nix
deleted file mode 100644
index 5ab29bf..0000000
--- a/hosts/pm01vm01/home.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ pkgs, lib, config, ... }:
-
-{
-  imports = [
-    # Gui
-    ../../modules/home/gui/theming.nix
-  
-    # CLI
-    ../../modules/home/cli/common
-    ../../modules/home/cli/yazi.nix
-  ];
-
-
-  options = {
-    host = lib.mkOption {
-      type = with lib.types; str;
-      description = ''
-        Define the host of the machine
-      '';
-    };
-
-    headless = lib.mkOption {
-      type = with lib.types; bool;
-      description = ''
-        Is this machine headless?
-      '';
-    };
-  };
-
-  config = {
-    home = {
-      username = "xeovalyte";
-      homeDirectory = "/home/xeovalyte";
-    };
-
-    host = "pm01vm01";
-    headless = true;
-
-    home.packages = with pkgs; [
-    ];
-
-    # Enable home-manager
-    programs.home-manager.enable = true;
-
-    home.stateVersion = "24.05";
-  };
-
-}
diff --git a/hosts/surface/home.nix b/hosts/surface/home.nix
index 3afa6dc..59e21c4 100644
--- a/hosts/surface/home.nix
+++ b/hosts/surface/home.nix
@@ -13,8 +13,6 @@
     };
 
     settings = {
-      hostname = "xv-surface";
-    
       applications.common.enable = true;
       applications.alacritty.enable = false;
       applications.devenv.enable = false;
@@ -50,13 +48,4 @@
 
     home.stateVersion = "24.05";
   };
-
-  options = {
-    settings.hostname = lib.mkOption {
-      type = with lib.types; str;
-      description = ''
-        Define the host of the machine
-      '';
-    };
-  };
 }
diff --git a/hosts/laptop/default.nix b/hosts/ti-clt-lpt01/default.nix
similarity index 96%
rename from hosts/laptop/default.nix
rename to hosts/ti-clt-lpt01/default.nix
index 3b6b384..13270a0 100644
--- a/hosts/laptop/default.nix
+++ b/hosts/ti-clt-lpt01/default.nix
@@ -64,7 +64,7 @@
     configurationLimit = 32;
   };
 
-  networking.hostName = "xv-laptop"; # Define your hostname.
+  networking.hostName = "ti-clt-lpt01"; # Define your hostname.
 
   networking.firewall = {
     enable = true;
diff --git a/hosts/laptop/hardware-configuration.nix b/hosts/ti-clt-lpt01/hardware-configuration.nix
similarity index 100%
rename from hosts/laptop/hardware-configuration.nix
rename to hosts/ti-clt-lpt01/hardware-configuration.nix
diff --git a/hosts/laptop/home.nix b/hosts/ti-clt-lpt01/home.nix
similarity index 87%
rename from hosts/laptop/home.nix
rename to hosts/ti-clt-lpt01/home.nix
index 58e2468..fc62263 100644
--- a/hosts/laptop/home.nix
+++ b/hosts/ti-clt-lpt01/home.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ pkgs, ... }:
 
 {
   imports = [
@@ -13,8 +13,6 @@
     };
 
     settings = {
-      hostname = "xv-laptop";
-
       applications.common.enable = true;
       applications.alacritty.enable = true;
       applications.devenv.enable = true;
@@ -72,14 +70,4 @@
 
     home.stateVersion = "24.05";
   };
-
-  options = {
-    settings.hostname = lib.mkOption {
-      type = with lib.types; str;
-      description = ''
-        Define the host of the machine
-      '';
-    };
-  };
-
 }