diff --git a/flake.nix b/flake.nix
index 6b3453d..653c012 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,7 +24,7 @@
     };
   };
 
-  outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, home-manager, nix-colors, stylix, nixos-cosmic, ... }:
+  outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, modulesPath, home-manager, nix-colors, stylix, nixos-cosmic, ... }:
   let
     system = "x86_64-linux";
     overlay-unstable = final: prev: {
@@ -79,6 +79,16 @@
           ./hosts/ti-clt-dsk01
         ];
       };
+
+      th-vrt-ctr01 = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        specialArgs = { inherit inputs; };
+        modules = [
+          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
+          /etc/nixos/configuration.nix
+          ./hosts/th-vrt-ctr01
+        ];
+      };
     };
 
     homeConfigurations = {
diff --git a/hosts/th-hpr-srv01/default.nix b/hosts/th-hpr-srv01/default.nix
deleted file mode 100644
index 1f3813e..0000000
--- a/hosts/th-hpr-srv01/default.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-{ pkgs, ... }:
-
-{
-  imports = [
-    # Import hardware configuration
-    ./hardware-configuration.nix
-
-    # Import modules
-    ../../modules/system/default.nix
-  ];
-
-  settings = {
-    # display-manager = "cosmic-greeter";
-    desktop-environments = {
-      cosmic.enable = false;
-      hyprland.enable = false;
-      gnome.enable = false;
-    };
-    applications = {
-      common.enable = true;
-      steam.enable = false;
-      thunar.enable = false;
-    };
-    services = {
-      docker.enable = false;
-      quickemu.enable = true;
-      sunshine.enable = false;
-      garbage-collection.enable = true;
-      incus.enable = true;
-    };
-    hardware = {
-      fprint.enable = false;
-      printing.enable = false;
-      bluetooth.enable = false;
-      firewall.enable = true;
-      locale.enable = true;
-      nvidia.enable = false;
-    };
-  };
-
-  nix.settings = {
-    experimental-features = [ "nix-command" "flakes" ];
-
-    substituters = [
-      "https://nix-community.cachix.org"
-      "https://cosmic.cachix.org/"
-    ];
-
-    trusted-public-keys = [
-      "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="
-    ];
-  };
-
-  # Bootloader.
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.loader.grub = {
-    enable = true;
-    efiSupport = true;
-    device = "nodev";
-    configurationLimit = 32;
-  };
-
-  networking.hostName = "th-hpr-srv01"; # Define your hostname.
-
-  networking.firewall = {
-    enable = true;
-    allowedTCPPorts = [ 80 443 53 ];
-    allowedUDPPorts = [ 80 443 53 ];
-  };
-
-  users.users.timo = {
-    isNormalUser = true;
-    description = "Timo Boomers";
-    extraGroups = [ "networkmanager" "wheel" "dialout" ];
-  };
-
-  nix.settings.trusted-users = [ "root" "timo" ];
-
-  system.stateVersion = "24.05";
-}
diff --git a/hosts/th-hpr-srv01/home.nix b/hosts/th-hpr-srv01/home.nix
deleted file mode 100644
index 8ac63ea..0000000
--- a/hosts/th-hpr-srv01/home.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ pkgs, ... }:
-
-{
-  imports = [
-    # Modules
-    ../../modules/home/default.nix
-  ];
-
-  config = {
-    home = {
-      username = "timo";
-      homeDirectory = "/home/timo";
-    };
-
-    settings = {
-      applications.common.enable = false;
-      applications.alacritty.enable = false;
-      applications.devenv.enable = false;
-      applications.firefox.enable = false;
-      applications.git.enable = false;
-      applications.helix.enable = false;
-      applications.zsh.enable = true;
-      applications.ssh.enable = true;
-      applications.thunderbird.enable = false;
-      applications.yazi.enable = true;
-      applications.zellij.enable = false;
-
-      services.nextcloud-sync.enable = false;
-
-      theming.fonts.enable = false;
-      theming.stylix.enable = false;
-      theming.stylix.wallpaper = "wallpaper-2.png";
-      theming.stylix.theme = "da-one-ocean";
-
-      desktop-environments.hyprland.enable = false;
-    };
-
-    home.packages = with pkgs; [
-    ];
-
-    # Enable home-manager
-    programs.home-manager.enable = true;
-
-    home.stateVersion = "24.05";
-  };
-}
diff --git a/hosts/th-ctr-vrt01/default.nix b/hosts/th-vrt-ctr01/default.nix
similarity index 95%
rename from hosts/th-ctr-vrt01/default.nix
rename to hosts/th-vrt-ctr01/default.nix
index 0273583..1f3ce9c 100644
--- a/hosts/th-ctr-vrt01/default.nix
+++ b/hosts/th-vrt-ctr01/default.nix
@@ -1,9 +1,7 @@
-{ pkgs, ... }:
+{ ... }:
 
 {
   imports = [
-    # Import hardware configuration
-    ./hardware-configuration.nix
 
     # Import modules
     ../../modules/system/default.nix
diff --git a/hosts/th-ctr-vrt01/home.nix b/hosts/th-vrt-ctr01/home.nix
similarity index 100%
rename from hosts/th-ctr-vrt01/home.nix
rename to hosts/th-vrt-ctr01/home.nix