diff --git a/hosts/cyberspark/system/hardware/default.nix b/hosts/cyberspark/system/hardware/default.nix
index c2f740c..35d2138 100644
--- a/hosts/cyberspark/system/hardware/default.nix
+++ b/hosts/cyberspark/system/hardware/default.nix
@@ -7,7 +7,7 @@
   boot = {
     blacklistedKernelModules = [
       "pcspkr"
-    ];               
+    ];
     initrd = {
       availableKernelModules = [
         "xhci_pci"
@@ -28,15 +28,36 @@
     };
   };
 
-  # Mounting options
   fileSystems = {
-    "/" = { 
-      device = "/dev/disk/by-uuid/8f81cab7-9381-4950-b77f-b85c5fdbad16";
-      fsType = "ext4";
+    "/" = {
+      device = "/dev/disk/by-uuid/b8b7ed47-c98c-4a49-af01-b2832dde1287";
+      fsType = "btrfs";
+      options = [ "subvol=@" ];
+    };
+    "/home" = {
+      device = "/dev/disk/by-uuid/b8b7ed47-c98c-4a49-af01-b2832dde1287";
+      fsType = "btrfs";
+      options = [ "subvol=@home" ];
+    };
+    "/nix" = {
+      device = "/dev/disk/by-uuid/b8b7ed47-c98c-4a49-af01-b2832dde1287";
+      fsType = "btrfs";
+      options = [ "subvol=@nix" ];
+    };
+    "/var" = {
+      device = "/dev/disk/by-uuid/b8b7ed47-c98c-4a49-af01-b2832dde1287";
+      fsType = "btrfs";
+      options = [ "subvol=@var" ];
+    };
+    "/.snapshots" = {
+      device = "/dev/disk/by-uuid/b8b7ed47-c98c-4a49-af01-b2832dde1287";
+      fsType = "btrfs";
+      options = [ "subvol=@snapshots" ];
     };
     "/boot" = {
-      device = "/dev/disk/by-uuid/2034-754A";
+      device = "/dev/disk/by-uuid/CD94-1D3F";
       fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
     };
     "/export/JimboNFS" = {
       device = "/dev/disk/by-uuid/713fcd92-534c-4153-8e04-e0c6fe5f6a51";
@@ -60,8 +81,8 @@
       fsType = "none";
       options = [ "bind" ];
     };
-    "/var/lib/gitea" = {
-      device = "/export/JimboNFS/System/var/lib/gitea";
+    "/var/lib/forgejo" = {
+      device = "/export/JimboNFS/System/var/lib/forgejo";
       fsType = "none";
       options = [ "bind" ];
     };
@@ -98,11 +119,10 @@
   };
 
   swapDevices = [
-    { device = "/dev/disk/by-uuid/ec422cad-bf93-4b15-b989-2c807f1073a4"; }
+    { device = "/dev/disk/by-uuid/57178cfc-3e71-4d35-8c7f-e355f9dc84df"; }
   ];
 
-  # Hardware settings
   networking.useDHCP = lib.mkDefault true;
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/modules/system/services/server/default.nix b/modules/system/services/server/default.nix
index c99b72b..8c79ef2 100644
--- a/modules/system/services/server/default.nix
+++ b/modules/system/services/server/default.nix
@@ -6,7 +6,6 @@
     ./fileserver
     ./forgejo
     ./icecast
-    ./mailserver
     ./minecraft
     ./misc
     ./mysql
diff --git a/modules/system/services/server/minecraft/common/default.nix b/modules/system/services/server/minecraft/common/default.nix
index 2528232..0e90356 100644
--- a/modules/system/services/server/minecraft/common/default.nix
+++ b/modules/system/services/server/minecraft/common/default.nix
@@ -48,8 +48,8 @@
       sha256 = "02ad0dl34vdk6b1wyflqa6wq440xrh5w7yf3z3w1x1g089myddw4";
     };
     "plugins/ProtocolLib.jar" = builtins.fetchurl {
-      url = "https://ci.dmulloy2.net/job/ProtocolLib/lastSuccessfulBuild/artifact/build/libs/ProtocolLib.jar";
-      sha256 = "16krc7pyav4khnaxkyg27i5yxsgcdkildrn4nm5bhzh1f0ngqv2s";
+      url = "https://ci.dmulloy2.net/job/ProtocolLib/733/artifact/build/libs/ProtocolLib.jar";
+      sha256 = "1gslh24kk7dcqiqxphzy8x2nrqa58f8gl5ah0iyg1ndx3pvr4z9m";
     };
     "plugins/Vault.jar" = builtins.fetchurl {
       url = "https://github.com/MilkBowl/Vault/releases/download/1.7.3/Vault.jar";
diff --git a/modules/system/services/server/minecraft/default.nix b/modules/system/services/server/minecraft/default.nix
index fb7912d..22ca690 100644
--- a/modules/system/services/server/minecraft/default.nix
+++ b/modules/system/services/server/minecraft/default.nix
@@ -6,8 +6,8 @@
     ./servers/dewdemolisher
     ./servers/johnside
     ./servers/roguecraft
-    ./servers/blockworld
-    ./servers/uberbeta
+    #./servers/blockworld
+    #./servers/uberbeta
   ];
 
   nixpkgs.overlays = [ minecraft.overlay ];