diff --git a/.github/workflows/build_systems.yml b/.github/workflows/build_systems.yml
index 63d92a1..913c677 100644
--- a/.github/workflows/build_systems.yml
+++ b/.github/workflows/build_systems.yml
@@ -14,7 +14,6 @@ jobs:
         system:
           - "bob"
           - "jeeves"
-          - "muninn"
           - "rhapsody-in-green"
     steps:
       - uses: actions/checkout@v4
diff --git a/.vscode/settings.json b/.vscode/settings.json
index c09b8fa..e35787b 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -129,7 +129,6 @@
     "mountpoints",
     "mousewheel",
     "mtxr",
-    "muninn",
     "ncdu",
     "nemo",
     "neofetch",
diff --git a/flake.nix b/flake.nix
index 3fb1fcc..584e60d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -94,12 +94,6 @@
         ];
         specialArgs = {inherit inputs outputs;};
       };
-      muninn = lib.nixosSystem {
-        modules = [
-          ./systems/muninn
-        ];
-        specialArgs = {inherit inputs outputs;};
-      };
     };
   };
 }
diff --git a/systems/muninn/default.nix b/systems/muninn/default.nix
deleted file mode 100644
index 28c1057..0000000
--- a/systems/muninn/default.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ inputs, pkgs, ... }:
-{
-  imports = [
-    ../../users/gaming
-    ../../users/richie
-    ../../common/global
-    ../../common/optional/desktop.nix
-    ../../common/optional/steam.nix
-    ../../common/optional/systemd-boot.nix
-    ../../common/optional/update.nix
-    ./hardware.nix
-    inputs.nixos-hardware.nixosModules.framework-11th-gen-intel
-  ];
-
-  environment.systemPackages = with pkgs; [
-    plex-media-player
-  ];
-
-  networking = {
-    hostName = "muninn";
-    hostId = "a43179c5";
-    firewall.enable = true;
-    networkmanager.enable = true;
-  };
-
-  hardware = {
-    pulseaudio.enable = false;
-    bluetooth = {
-      enable = true;
-      powerOnBoot = true;
-    };
-    firmware = [ pkgs.sof-firmware ];
-  };
-
-  security.rtkit.enable = true;
-
-  services = {
-    displayManager = {
-      enable = true;
-      autoLogin = {
-        user = "gaming";
-        enable = true;
-      };
-      defaultSession = "steam";
-      # defaultSession = "plasma";
-    };
-
-    openssh.ports = [ 295 ];
-
-    snapshot_manager.enable = true;
-
-    zfs = {
-      trim.enable = true;
-      autoScrub.enable = true;
-    };
-  };
-
-  system.stateVersion = "24.05";
-}
diff --git a/systems/muninn/hardware.nix b/systems/muninn/hardware.nix
deleted file mode 100644
index a07fe64..0000000
--- a/systems/muninn/hardware.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{ config, lib, modulesPath, ... }:
-
-{
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-
-  boot = {
-    initrd = {
-      availableKernelModules = [
-        "nvme"
-        "xhci_pci"
-        "thunderbolt"
-        "usb_storage"
-        "sd_mod"
-      ];
-      kernelModules = [ ];
-      luks.devices."luks-root-pool-nvme-INTEL_SSDPEKKW256G7_BTPY63820XBH256D-part2" = {
-        device = "/dev/disk/by-id/nvme-INTEL_SSDPEKKW256G7_BTPY63820XBH256D-part2";
-        bypassWorkqueues = true;
-        allowDiscards = true;
-        keyFileSize = 4096;
-        keyFile = "/dev/disk/by-id/usb-SanDisk_Ultra_T_C_4C530001020919102244-0:0";
-      };
-    };
-    kernelModules = [ "kvm-intel" ];
-    extraModulePackages = [ ];
-  };
-
-  fileSystems = {
-    "/" = lib.mkDefault {
-      device = "root_pool/root";
-      fsType = "zfs";
-    };
-
-    "/home" = {
-      device = "root_pool/home";
-      fsType = "zfs";
-    };
-
-    "/nix" = {
-      device = "root_pool/nix";
-      fsType = "zfs";
-    };
-
-    "/var" = {
-      device = "root_pool/var";
-      fsType = "zfs";
-    };
-
-    "/boot" = {
-      device = "/dev/disk/by-uuid/12CE-A600";
-      fsType = "vfat";
-      options = [
-        "fmask=0077"
-        "dmask=0077"
-      ];
-    };
-  };
-
-  swapDevices = [ ];
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
diff --git a/users/gaming/systems/muninn.nix b/users/gaming/systems/muninn.nix
deleted file mode 100644
index 1b26caf..0000000
--- a/users/gaming/systems/muninn.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  imports = [
-    ../home/global.nix
-    ../home/firefox.nix
-  ];
-}
diff --git a/users/richie/home/ssh_config.nix b/users/richie/home/ssh_config.nix
index 9ef3d37..e36226f 100644
--- a/users/richie/home/ssh_config.nix
+++ b/users/richie/home/ssh_config.nix
@@ -36,12 +36,6 @@
         identityFile = "~/.ssh/id_ed25519";
         port = 922;
       };
-      muninn = {
-        hostname = "192.168.98.52";
-        user = "richie";
-        identityFile = "~/.ssh/id_ed25519";
-        port = 295;
-      };      
     };
   };
 }
diff --git a/users/richie/systems/muninn.nix b/users/richie/systems/muninn.nix
deleted file mode 100644
index b1d9590..0000000
--- a/users/richie/systems/muninn.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  imports = [
-    ../home/global.nix
-    ../home/gui
-  ];
-}