diff --git a/overlays/proton-cachyos/default.nix b/overlays/proton-cachyos/default.nix
index 485ff05..b7fcff4 100644
--- a/overlays/proton-cachyos/default.nix
+++ b/overlays/proton-cachyos/default.nix
@@ -5,15 +5,15 @@
 _final: prev: {
   ${namespace} = prev.${namespace} // {
     proton-cachyos-v3 = prev.${namespace}.proton-cachyos.override {
-      versionFilename = "cachyos-v3-version.json";
+      variant = "cachyos-v3";
       tarballSuffix = "-x86_64_v3.tar.xz";
     };
     proton-cachyos-v2 = prev.${namespace}.proton-cachyos.override {
-      versionFilename = "cachyos-v2-version.json";
+      variant = "cachyos-v2";
       tarballSuffix = "-x86_64_v2.tar.xz";
     };
     proton-cachyos-v1 = prev.${namespace}.proton-cachyos.override {
-      versionFilename = "cachyos-version.json";
+      variant = "cachyos";
       tarballSuffix = "-x86_64.tar.xz";
     };
   };
diff --git a/packages/arm-trusted-firmware/default.nix b/packages/arm-trusted-firmware/default.nix
index fffbb0c..9489a9a 100644
--- a/packages/arm-trusted-firmware/default.nix
+++ b/packages/arm-trusted-firmware/default.nix
@@ -1,21 +1,21 @@
 {
   stdenv,
-  fetchFromGitHub,
   lib,
-  pkgs,
+  namespace,
   MODEL ? "5",
   DEBUG ? "0",
   TFA_FLAGS ? "",
 }:
 let
   inherit (lib.trivial) importJSON;
+  inherit (lib.${namespace}) versioning;
+
   versionSpec = importJSON ./version.json;
-  versioning = import ../../lib/versioning.nix { inherit lib pkgs; };
   selected = versioning.selectVariant versionSpec null null;
   sources = versioning.mkAllSources selected;
   fw = selected.sources.fw;
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "arm-trusted-firmware";
   version = if fw ? tag then fw.tag else fw.rev;
 
diff --git a/packages/edk2/default.nix b/packages/edk2/default.nix
index 83bae28..ff7a6d1 100644
--- a/packages/edk2/default.nix
+++ b/packages/edk2/default.nix
@@ -1,6 +1,5 @@
 {
   stdenv,
-  fetchFromGitHub,
   lib,
   MODEL ? "5",
   RELEASE_TYPE ? "RELEASE",
@@ -18,11 +17,11 @@
 }:
 let
   inherit (lib.trivial) importJSON;
+  inherit (lib.${namespace}) versioning;
 
   pname = "edk2";
   version = "stable202511";
   versionSpec = importJSON ./version.json;
-  versioning = import ../../lib/versioning.nix { inherit lib pkgs; };
   selected = versioning.selectVariant versionSpec (if MODEL == "5" then "mjallen" else null) null;
   sources = versioning.mkAllSources selected;
 
diff --git a/packages/librepods-beta/default.nix b/packages/librepods-beta/default.nix
index 4286431..fbd8b5f 100644
--- a/packages/librepods-beta/default.nix
+++ b/packages/librepods-beta/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   rustPlatform,
-  fetchFromGitHub,
   pkg-config,
   makeWrapper,
   autoPatchelfHook,
@@ -14,12 +13,13 @@
   expat,
   fontconfig,
   freetype,
-  pkgs,
+  namespace,
 }:
 let
   inherit (lib.trivial) importJSON;
+  inherit (lib.${namespace}) versioning;
+
   versionSpec = importJSON ./version.json;
-  versioning = import ../../lib/versioning.nix { inherit lib pkgs; };
   selected = versioning.selectVariant versionSpec null null;
   sources = versioning.mkAllSources selected;
 in
diff --git a/packages/librepods/default.nix b/packages/librepods/default.nix
index 276704c..cb9339c 100644
--- a/packages/librepods/default.nix
+++ b/packages/librepods/default.nix
@@ -7,13 +7,13 @@
   openssl,
   python3,
   libpulseaudio,
-  fetchFromGitHub,
-  pkgs,
+  namespace,
 }:
 let
   inherit (lib.trivial) importJSON;
+  inherit (lib.${namespace}) versioning;
+
   versionSpec = importJSON ./version.json;
-  versioning = import ../../lib/versioning.nix { inherit lib pkgs; };
   selected = versioning.selectVariant versionSpec null null;
   sources = versioning.mkAllSources selected;
 in
diff --git a/packages/linux-cachyos/default.nix b/packages/linux-cachyos/default.nix
index 698026e..31fef16 100644
--- a/packages/linux-cachyos/default.nix
+++ b/packages/linux-cachyos/default.nix
@@ -8,12 +8,14 @@
   inputs ? { },
   # 2. Make 'self' optional, defaulting to inputs.self (handles both Overlay and Snowfall cases)
   self ? inputs.self,
+  namespace,
   ...
 }@args: # 3. Rename this capture from 'inputs' to 'args' to avoid variable name collision
 
 let
   inherit (stdenv) isx86_64 isAarch64 isLinux;
   inherit (lib.trivial) importJSON;
+  inherit (lib.${namespace}) versioning;
 
   arch = (if isx86_64 then "x86_64" else "aarch64");
 
@@ -21,7 +23,6 @@ let
   #                   Source Versions                    #
   # ######################################################
   versionSpec = importJSON ./version.json;
-  versioning = import ../../lib/versioning.nix { inherit lib pkgs; };
   mkVersions = selected:
     let
       s = selected.sources;
diff --git a/packages/proton-cachyos/default.nix b/packages/proton-cachyos/default.nix
index bc9d90d..4d9a023 100644
--- a/packages/proton-cachyos/default.nix
+++ b/packages/proton-cachyos/default.nix
@@ -4,7 +4,7 @@
   lib,
   fetchurl,
   fetchzip,
-  pkgs,
+  namespace,
   # Repo metadata
   owner ? "CachyOS",
   repo ? "proton-cachyos",
@@ -22,10 +22,9 @@
 }:
 let
   inherit (lib.trivial) importJSON;
+  inherit (lib.${namespace}) versioning;
 
-  # Load unified version spec and select the desired variant
   versionSpec = importJSON ./version.json;
-  versioning = import ../../lib/versioning.nix { inherit lib pkgs; };
   selected = versioning.selectVariant versionSpec variant null;
   vars = selected.variables or {};
   base = vars.base;
diff --git a/packages/proton-cachyos/version.json b/packages/proton-cachyos/version.json
index d6d8f0f..141a4fe 100644
--- a/packages/proton-cachyos/version.json
+++ b/packages/proton-cachyos/version.json
@@ -23,7 +23,7 @@
       },
       "sources": {
         "proton": {
-          "hash": "sha256-e2A9jrAGUHlD8KUuGjkLUhknclBxVZVYKJFElUEs0Us="
+          "hash": "sha256-b1rbbJAGM4G89te6UVy1nFKP12fuz11ZyF0XipSeT2I="
         }
       }
     },
@@ -34,7 +34,7 @@
       },
       "sources": {
         "proton": {
-          "hash": "sha256-e2A9jrAGUHlD8KUuGjkLUhknclBxVZVYKJFElUEs0Us="
+          "hash": "sha256-OIZTF2PpbrfqYEjCpwmF4Dl/I0pyanJVzT50bkSbo3o="
         }
       }
     },
@@ -45,7 +45,7 @@
       },
       "sources": {
         "proton": {
-          "hash": "sha256-e2A9jrAGUHlD8KUuGjkLUhknclBxVZVYKJFElUEs0Us="
+          "hash": "sha256-bDlgsRNxA35YW91AsXhvA7dLsSq6cZ8Umczbw+Zj+2k="
         }
       }
     },
diff --git a/packages/raspberrypi/ffmpeg-rpi/default.nix b/packages/raspberrypi/ffmpeg-rpi/default.nix
index e503186..9cb8ccb 100644
--- a/packages/raspberrypi/ffmpeg-rpi/default.nix
+++ b/packages/raspberrypi/ffmpeg-rpi/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  fetchFromGitHub,
   ffmpeg,
   ffmpegVariant ? "small",
   withVoutEgl ? false,
@@ -9,13 +8,14 @@
   udev,
   systemd,
   withVoutDrm ? true,
-  pkgs,
+  namespace,
 }:
 
 let
   inherit (lib.trivial) importJSON;
+  inherit (lib.${namespace}) versioning;
+
   versionSpec = importJSON ./version.json;
-  versioning = import ../../../lib/versioning.nix { inherit lib pkgs; };
   selected = versioning.selectVariant versionSpec null null;
   vars = selected.variables or {};
   sources = versioning.mkAllSources selected;
diff --git a/packages/raspberrypi/libraspberrypi/default.nix b/packages/raspberrypi/libraspberrypi/default.nix
index 90ba78d..c234c44 100644
--- a/packages/raspberrypi/libraspberrypi/default.nix
+++ b/packages/raspberrypi/libraspberrypi/default.nix
@@ -1,15 +1,15 @@
 {
   lib,
   stdenv,
-  fetchFromGitHub,
   cmake,
   pkg-config,
-  pkgs,
+  namespace,
 }:
 let
   inherit (lib.trivial) importJSON;
+  inherit (lib.${namespace}) versioning;
+
   versionSpec = importJSON ./version.json;
-  versioning = import ../../../lib/versioning.nix { inherit lib pkgs; };
   selected = versioning.selectVariant versionSpec null null;
   sources = versioning.mkAllSources selected;
 in
diff --git a/packages/raspberrypi/linux-rpi/default.nix b/packages/raspberrypi/linux-rpi/default.nix
index d99b59f..fa604b2 100644
--- a/packages/raspberrypi/linux-rpi/default.nix
+++ b/packages/raspberrypi/linux-rpi/default.nix
@@ -2,18 +2,18 @@
   # ccacheStdenv,
   stdenv,
   lib,
-  fetchFromGitHub,
   buildLinux,
-  pkgs,
   rpiVersion ? 5,
+  namespace,
   ...
 }@args:
 
 let
   # stdenv = ccacheStdenv;
   inherit (lib.trivial) importJSON;
+  inherit (lib.${namespace}) versioning;
+
   versionSpec = importJSON ./version.json;
-  versioning = import ../../../lib/versioning.nix { inherit lib pkgs; };
   selected = versioning.selectVariant versionSpec null null;
   vars = selected.variables or {};
   sources = versioning.mkAllSources selected;
diff --git a/packages/raspberrypi/raspberryPiWirelessFirmware/default.nix b/packages/raspberrypi/raspberryPiWirelessFirmware/default.nix
index fc80279..5130927 100644
--- a/packages/raspberrypi/raspberryPiWirelessFirmware/default.nix
+++ b/packages/raspberrypi/raspberryPiWirelessFirmware/default.nix
@@ -1,13 +1,13 @@
 {
   lib,
   stdenvNoCC,
-  fetchFromGitHub,
-  pkgs,
+  namespace,
 }:
 let
   inherit (lib.trivial) importJSON;
+  inherit (lib.${namespace}) versioning;
+  
   versionSpec = importJSON ./version.json;
-  versioning = import ../../../lib/versioning.nix { inherit lib pkgs; };
   selected = versioning.selectVariant versionSpec null null;
   sources = versioning.mkAllSources selected;
 in
diff --git a/packages/raspberrypi/raspberrypi-overlays/default.nix b/packages/raspberrypi/raspberrypi-overlays/default.nix
index 89a9d16..9190fb5 100644
--- a/packages/raspberrypi/raspberrypi-overlays/default.nix
+++ b/packages/raspberrypi/raspberrypi-overlays/default.nix
@@ -1,19 +1,19 @@
 {
   lib,
   stdenvNoCC,
-  fetchFromGitHub,
-  pkgs,
+  namespace,
 }:
 let
   inherit (lib.trivial) importJSON;
+  inherit (lib.${namespace}) versioning;
+
   versionSpec = importJSON ./version.json;
-  versioning = import ../../../lib/versioning.nix { inherit lib pkgs; };
   selected = versioning.selectVariant versionSpec null null;
   vars = selected.variables or {};
   sources = versioning.mkAllSources selected;
 in
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation {
   # NOTE: this should be updated with linux_rpi
   pname = "raspberrypi-dtoverlays";
   version = vars.version;
@@ -29,10 +29,10 @@ stdenvNoCC.mkDerivation rec {
   dontBuild = true;
   dontFixup = true;
 
-  meta = with lib; {
+  meta = {
     description = "Overlays for the Raspberry Pi board";
     homepage = "https://github.com/raspberrypi/linux";
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     # Hash mismatch on source, mystery.
     # Maybe due to https://github.com/NixOS/nix/issues/847
     broken = stdenvNoCC.hostPlatform.isDarwin;
diff --git a/packages/raspberrypi/raspberrypi-utils/default.nix b/packages/raspberrypi/raspberrypi-utils/default.nix
index 547ada6..070c687 100644
--- a/packages/raspberrypi/raspberrypi-utils/default.nix
+++ b/packages/raspberrypi/raspberrypi-utils/default.nix
@@ -3,15 +3,15 @@
 {
   lib,
   stdenv,
-  fetchFromGitHub,
   cmake,
   dtc,
-  pkgs,
+  namespace,
 }:
 let
   inherit (lib.trivial) importJSON;
+  inherit (lib.${namespace}) versioning;
+
   versionSpec = importJSON ./version.json;
-  versioning = import ../../../lib/versioning.nix { inherit lib pkgs; };
   selected = versioning.selectVariant versionSpec null null;
   sources = versioning.mkAllSources selected;
 in
diff --git a/packages/raspberrypi/raspberrypifw/default.nix b/packages/raspberrypi/raspberrypifw/default.nix
index 8376ba9..8ea2887 100644
--- a/packages/raspberrypi/raspberrypifw/default.nix
+++ b/packages/raspberrypi/raspberrypifw/default.nix
@@ -1,18 +1,18 @@
 {
   lib,
   stdenvNoCC,
-  fetchFromGitHub,
-  pkgs,
+  namespace,
 }:
 let
   inherit (lib.trivial) importJSON;
+  inherit (lib.${namespace}) versioning;
+
   versionSpec = importJSON ./version.json;
-  versioning = import ../../../lib/versioning.nix { inherit lib pkgs; };
   selected = versioning.selectVariant versionSpec null null;
   vars = selected.variables or {};
   sources = versioning.mkAllSources selected;
 in
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation {
   # NOTE: this should be updated with linux_rpi
   pname = "raspberrypi-firmware";
   version = vars.version;
diff --git a/packages/raspberrypi/uefi-rpi4/default.nix b/packages/raspberrypi/uefi-rpi4/default.nix
index f34e245..6cd7ba7 100644
--- a/packages/raspberrypi/uefi-rpi4/default.nix
+++ b/packages/raspberrypi/uefi-rpi4/default.nix
@@ -1,13 +1,13 @@
 {
   lib,
   stdenvNoCC,
-  fetchzip,
-  pkgs,
+  namespace,
 }:
 let
   inherit (lib.trivial) importJSON;
+  inherit (lib.${namespace}) versioning;
+
   versionSpec = importJSON ./version.json;
-  versioning = import ../../../lib/versioning.nix { inherit lib pkgs; };
   selected = versioning.selectVariant versionSpec null null;
   vars = selected.variables or {};
   sources = versioning.mkAllSources selected;
@@ -39,6 +39,6 @@ stdenvNoCC.mkDerivation rec {
     description = "RPI4 UEFI firmware";
     homepage = "https://github.com/pftf/RPi4";
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/packages/raspberrypi/uefi-rpi5/default.nix b/packages/raspberrypi/uefi-rpi5/default.nix
index 88b22d4..4f63b85 100644
--- a/packages/raspberrypi/uefi-rpi5/default.nix
+++ b/packages/raspberrypi/uefi-rpi5/default.nix
@@ -1,13 +1,13 @@
 {
   lib,
   stdenvNoCC,
-  fetchurl,
-  pkgs,
+  namespace,
 }:
 let
   inherit (lib.trivial) importJSON;
+  inherit (lib.${namespace}) versioning;
+
   versionSpec = importJSON ./version.json;
-  versioning = import ../../../lib/versioning.nix { inherit lib pkgs; };
   selected = versioning.selectVariant versionSpec null null;
   vars = selected.variables or {};
   sources = versioning.mkAllSources selected;
@@ -91,6 +91,6 @@ stdenvNoCC.mkDerivation rec {
     description = "RPI5 UEFI firmware";
     homepage = "https://github.com/NumberOneGit/rpi5-uefi";
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/packages/system/open-remote-ssh/default.nix b/packages/system/open-remote-ssh/default.nix
index 7a8865d..44a8c1f 100644
--- a/packages/system/open-remote-ssh/default.nix
+++ b/packages/system/open-remote-ssh/default.nix
@@ -1,14 +1,15 @@
 {
   lib,
-  fetchurl,
   vscode-utils,
+  namespace,
   pkgs,
 }:
 
 let
   inherit (lib.trivial) importJSON;
+  inherit (lib.${namespace}) versioning;
+
   versionSpec = importJSON ./version.json;
-  versioning = import ../../../lib/versioning.nix { inherit lib pkgs; };
   selected = versioning.selectVariant versionSpec null null;
   vars = selected.variables or {};
   sources = versioning.mkAllSources selected;
diff --git a/packages/uboot/default.nix b/packages/uboot/default.nix
index f07c128..fddd40b 100644
--- a/packages/uboot/default.nix
+++ b/packages/uboot/default.nix
@@ -16,12 +16,14 @@
   buildPackages,
   callPackages,
   darwin,
+  namespace,
 }@pkgs:
 
 let
   inherit (lib.trivial) importJSON;
+  inherit (lib.${namespace}) versioning;
+
   versionSpec = importJSON ./version.json;
-  versioning = import ../../lib/versioning.nix { inherit lib pkgs; };
   selected = versioning.selectVariant versionSpec null null;
   sources = versioning.mkAllSources selected;
 
diff --git a/systems/x86_64-linux/matt-nixos/boot.nix b/systems/x86_64-linux/matt-nixos/boot.nix
index 345ed7e..fb4c0f7 100755
--- a/systems/x86_64-linux/matt-nixos/boot.nix
+++ b/systems/x86_64-linux/matt-nixos/boot.nix
@@ -5,7 +5,7 @@
   ...
 }:
 let
-  kernel = pkgs.${namespace}.linuxPackages_cachyos-rc-lto-znver4;
+  kernel = pkgs.${namespace}.linuxPackages_cachyos-lto-znver4;
   pkgsVersion = pkgs; # .unstable;
 in
 {