diff --git a/nix/configuration/hosts/hydra/optimized_build.nix b/nix/configuration/hosts/hydra/optimized_build.nix
index ab25599..f9e3c7d 100644
--- a/nix/configuration/hosts/hydra/optimized_build.nix
+++ b/nix/configuration/hosts/hydra/optimized_build.nix
@@ -18,23 +18,12 @@
         # "kvm"
         # "nixos-test"
       ];
-    }
-    (lib.mkIf (!config.me.buildingIso) {
-      nix.settings.system-features = lib.mkForce [
-        "gccarch-znver4"
-        "gccarch-x86-64-v3"
-        "gccarch-x86-64-v4"
-        "benchmark"
-        "big-parallel"
-        # "kvm"
-        # "nixos-test"
-      ];
 
-      # nixpkgs.hostPlatform = {
-      #   gcc.arch = "alderlake";
-      #   gcc.tune = "alderlake";
-      #   system = "x86_64-linux";
-      # };
+      nixpkgs.hostPlatform = {
+        gcc.arch = "znver4";
+        gcc.tune = "znver4";
+        system = "x86_64-linux";
+      };
 
       nixpkgs.overlays = [
         (
@@ -79,10 +68,6 @@
       ];
 
       boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_znver4;
-    })
-    (lib.mkIf (config.me.buildingIso) {
-      boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_13;
-      boot.supportedFilesystems = [ "zfs" ];
-    })
+    }
   ];
 }
diff --git a/nix/configuration/roles/hydra/default.nix b/nix/configuration/roles/hydra/default.nix
index 0017e80..7175424 100644
--- a/nix/configuration/roles/hydra/default.nix
+++ b/nix/configuration/roles/hydra/default.nix
@@ -22,11 +22,10 @@
       {
         services.hydra = {
           enable = true;
-          hydraURL = "http://localhost:3000"; # externally visible URL
-          notificationSender = "hydra@localhost"; # e-mail of Hydra service
+          hydraURL = "http://localhost:3000"; # Externally visible URL
+          notificationSender = "hydra@localhost"; # "From" address for hydra emails.
           # a standalone Hydra will require you to unset the buildMachinesFiles list to avoid using a nonexistant /etc/nix/machines
           buildMachinesFiles = [ ];
-          # you will probably also want, otherwise *everything* will be built from scratch
           useSubstitutes = true;
         };
 
diff --git a/nix/steam_deck/configuration/roles/pcsx2/files/PCSX2.ini b/nix/steam_deck/configuration/roles/pcsx2/files/PCSX2.ini
index a9285d6..c023fd4 100644
--- a/nix/steam_deck/configuration/roles/pcsx2/files/PCSX2.ini
+++ b/nix/steam_deck/configuration/roles/pcsx2/files/PCSX2.ini
@@ -8,7 +8,7 @@ StartFullscreen = true
 
 
 [Folders]
-Bios = ../../.persist/manual/games/ps2/bios
+Bios = ../../.persist/manual/games/sony_ps2/bios
 Snapshots = snaps
 Savestates = sstates
 MemoryCards = memcards
@@ -101,4 +101,4 @@ CheckAtStartup = false
 
 
 [GameList]
-RecursivePaths = /home/deck/.persist/manual/games/ps2/roms
+RecursivePaths = /home/deck/.persist/manual/games/sony_ps2/roms