diff --git a/flake.nix b/flake.nix
index 0c9ce41..90447b1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,5 +15,10 @@
       modules = [ ./hosts/desktop/valhalla/configuration.nix ];
     };
     # environment.systemPackages = [nixos-needsreboot.packages.${nixpkgs.system}.default];
+    nixosConfigurations.katmai = nixpkgs.lib.nixosSystem {
+      # NOTE: Change this to aarch64-linux if you are on ARM
+      system = "x86_64-linux";
+      modules = [ ./hosts/desktop/katmai/configuration.nix ];
+    };
   };
 }
diff --git a/hosts/desktop/katmai/configuration.nix b/hosts/desktop/katmai/configuration.nix
new file mode 100644
index 0000000..7de534e
--- /dev/null
+++ b/hosts/desktop/katmai/configuration.nix
@@ -0,0 +1,40 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{ config, pkgs, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+      ../../../desktop
+      ../../../desktop/office.nix
+      ../../../users/owners.nix
+    ];
+
+  networking.hostName = "katmai"; # Define your hostname.
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "23.11"; # Did you read the comment?
+
+  # Automatic Garbage Collection
+  nix.gc = {
+               automatic = true;
+               dates   = "weekly";
+               options = "--delete-older-than 14d";
+  };
+  # Auto system update
+  system.autoUpgrade = {
+     enable = true;
+  };
+
+
+}
diff --git a/hosts/desktop/katmai/hardware-configuration.nix b/hosts/desktop/katmai/hardware-configuration.nix
new file mode 100644
index 0000000..4a21de4
--- /dev/null
+++ b/hosts/desktop/katmai/hardware-configuration.nix
@@ -0,0 +1,44 @@
+# 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 + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/ebd125c4-ab78-4604-a0be-826d0a3d0c03";
+      fsType = "btrfs";
+      options = [ "subvol=@" ];
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/ED13-F512";
+      fsType = "vfat";
+    };
+
+  fileSystems."/home" =
+    { device = "/dev/disk/by-uuid/f5dd6012-e88b-444d-99f6-4a468493bd13";
+      fsType = "xfs";
+    };
+
+  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.enp0s31f6.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}