diff --git a/flake.nix b/flake.nix
index 6292626..eff5e55 100644
--- a/flake.nix
+++ b/flake.nix
@@ -118,15 +118,6 @@
         jdownloader = mkComputer {
           hostname = "jdownloader";
         };
-        k3s-master1 = mkComputer {
-          hostname = "k3s-master1";
-        };
-        k3s-node1 = mkComputer {
-          hostname = "k3s-node1";
-        };
-        k3s-node2 = mkComputer {
-          hostname = "k3s-node2";
-        };
         mail = mkComputer {
           hostname = "mail";
         };
@@ -137,12 +128,6 @@
           hostname = "nixos-management";
           home-module = "management";
         };
-        nomad-master1 = mkComputer {
-          hostname = "nomad-master1";
-        };
-        nomad-client1 = mkComputer {
-          hostname = "nomad-client1";
-        };
         pihole = mkComputer {
           hostname = "pihole";
         };
diff --git a/modules/k3s-master/default.nix b/modules/k3s-master/default.nix
deleted file mode 100644
index 8bfc7d1..0000000
--- a/modules/k3s-master/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ pkgs, ... }:
-{
-  services.k3s = {
-    enable = true;
-    role = "server";
-  };
-  environment.systemPackages = [
-    pkgs.k3s
-    pkgs.kubectl
-    pkgs.kubernetes-helm
-  ];
-  environment.variables = {
-    KUBECONFIG = "/etc/rancher/k3s/k3s.yaml";
-  };
-  networking.firewall.allowedTCPPorts = [ 6443 ];
-}
diff --git a/modules/k3s-node/default.nix b/modules/k3s-node/default.nix
deleted file mode 100644
index 117d23a..0000000
--- a/modules/k3s-node/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ inputs, ... }:
-{
-  services.k3s = {
-    enable = true;
-    role = "agent";
-    serverAddr = "https://10.7.89.130:6443";
-    tokenFile = "/etc/k3s/token.key";
-  };
-}
diff --git a/modules/nomad-client/default.nix b/modules/nomad-client/default.nix
deleted file mode 100644
index d0db9c8..0000000
--- a/modules/nomad-client/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ ... }:
-{
-  services.nomad = {
-    enable = true;
-    settings = {
-      client = {
-        enabled = true;
-        servers = [ "10.7.89.140:4647" ];
-      };
-    };
-    enableDocker = true;
-  };
-  networking.firewall = {
-    allowedTCPPorts = [ 4646 4647 4648 ];
-    allowedUDPPorts = [ 4648 ];
-  };
-}
diff --git a/modules/nomad-master/default.nix b/modules/nomad-master/default.nix
deleted file mode 100644
index 039a280..0000000
--- a/modules/nomad-master/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ ... }:
-{
-  services.nomad = {
-    enable = true;
-    settings = {
-      server = {
-        enabled = true;
-        bootstrap_expect = 1; # for demo; no fault tolerance
-      };
-    };
-  };
-  networking.firewall = {
-    allowedTCPPorts = [ 4646 4647 4648 ];
-    allowedUDPPorts = [ 4648 ];
-  };
-}
diff --git a/scripts/remote_switch.sh b/scripts/remote_switch.sh
index 016316d..072d008 100755
--- a/scripts/remote_switch.sh
+++ b/scripts/remote_switch.sh
@@ -6,19 +6,13 @@ hosts=(
  "git"
  #"heimdall"
  "jdownloader"
- #"k3s-master1"
- #"k3s-node1"
- #"k3s-node2"
  "mail"
  "nextcloud"
- #"nomad-master1"
- #"nomad-client1"
  "pihole"
  "plex"
  #"proxy"
  "restic-server"
  #"rss-bridge"
- #"test-server"
  "ttrss"
 )
 
diff --git a/systems/k3s-master1/default.nix b/systems/k3s-master1/default.nix
deleted file mode 100644
index d879d23..0000000
--- a/systems/k3s-master1/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, custom, inputs, pkgs, ... }:
-{
-  imports = [
-    (import "${inputs.self}/systems/proxmox-vm" {
-      hostname = "k3s-master1";
-      ip = "10.7.89.130";
-      inherit inputs;
-    })
-    "${inputs.self}/modules/data-share"
-    "${inputs.self}/modules/k3s-master"
-  ];
-}
diff --git a/systems/k3s-node1/default.nix b/systems/k3s-node1/default.nix
deleted file mode 100644
index ff160e9..0000000
--- a/systems/k3s-node1/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, custom, inputs, pkgs, ... }:
-{
-  imports = [
-    (import "${inputs.self}/systems/proxmox-vm" {
-      hostname = "k3s-node1";
-      ip = "10.7.89.131";
-      inherit inputs;
-    })
-    "${inputs.self}/modules/data-share"
-    "${inputs.self}/modules/k3s-node"
-  ];
-}
diff --git a/systems/k3s-node2/default.nix b/systems/k3s-node2/default.nix
deleted file mode 100644
index 59eb627..0000000
--- a/systems/k3s-node2/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, custom, inputs, pkgs, ... }:
-{
-  imports = [
-    (import "${inputs.self}/systems/proxmox-vm" {
-      hostname = "k3s-node2";
-      ip = "10.7.89.132";
-      inherit inputs;
-    })
-    "${inputs.self}/modules/data-share"
-    "${inputs.self}/modules/k3s-node"
-  ];
-}
diff --git a/systems/nomad-client1/default.nix b/systems/nomad-client1/default.nix
deleted file mode 100644
index c42bcb8..0000000
--- a/systems/nomad-client1/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, custom, inputs, pkgs, ... }:
-{
-  imports = [
-    (import "${inputs.self}/systems/proxmox-vm" {
-      hostname = "nomad-agent1";
-      ip = "10.7.89.141";
-      inherit inputs;
-    })
-    "${inputs.self}/modules/data-share"
-    "${inputs.self}/modules/nomad-client"
-  ];
-}
diff --git a/systems/nomad-master1/default.nix b/systems/nomad-master1/default.nix
deleted file mode 100644
index 68fd870..0000000
--- a/systems/nomad-master1/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, custom, inputs, pkgs, ... }:
-{
-  imports = [
-    (import "${inputs.self}/systems/proxmox-vm" {
-      hostname = "nomad-master1";
-      ip = "10.7.89.140";
-      inherit inputs;
-    })
-    "${inputs.self}/modules/data-share"
-    "${inputs.self}/modules/nomad-master"
-  ];
-}