diff --git a/flake.nix b/flake.nix
index 126e622..5654219 100644
--- a/flake.nix
+++ b/flake.nix
@@ -67,7 +67,10 @@
         })
       );
       charts_overlay = (
-        _f: _p: { inherit (top.charts) chartsMetadata; }
+        _f: _p: {
+          chartsDerivations = top.charts.chartsDerivations."${_p.stdenv.hostPlatform.system}";
+          kubelib = top.nix-kube-generators.lib;
+        }
       );
       overlays = [
         top.agenix.overlays.default
diff --git a/modules/nix-conf.nix b/modules/nix-conf.nix
index 0d5d7c8..c432e5c 100644
--- a/modules/nix-conf.nix
+++ b/modules/nix-conf.nix
@@ -49,6 +49,7 @@ in
             "https://greg-hellings.cachix.org"
             "https://nix-community.cachix.org"
             "https://cache.nixos.org"
+            "https://nixhelm.cachix.org"
           ];
         trusted-public-keys = [
           "chronicles.shire-zebra.ts.net:0qWYHn3gGllXChhAaaxKlNZtRy6yG/XJs1RFSqV3nW8="
@@ -57,6 +58,7 @@ in
           "greg-hellings.cachix.org-1:y01Jl/L5evlhxdnUW6n56AiI1k8g1wxWhTxJCe7XSco="
           "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
           "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+          "nixhelm.cachix.org-1:esqauAsR4opRF0UsGrA6H3gD21OrzMnBBYvJXeddjtY="
         ];
       };
     };
diff --git a/modules/nixos/kubernetes.nix b/modules/nixos/kubernetes.nix
index 0eba161..9e7d34f 100644
--- a/modules/nixos/kubernetes.nix
+++ b/modules/nixos/kubernetes.nix
@@ -80,11 +80,9 @@ in
         enable = true;
         autoDeployCharts = {
           external-secrets = {
-            inherit (pkgs.chartsMetadata.external-secrets.external-secrets) repo version;
             enable = true;
             createNamespace = true;
-            hash = pkgs.chartsMetadata.external-secrets.external-secrets.chartHash;
-            name = "external-secrets";
+            package = pkgs.chartsDerivations.external-secrets.external-secrets;
             targetNamespace = "external-secrets";
             values = {
               crds.create = true;
@@ -92,26 +90,22 @@ in
             };
           };
           kyverno = {
-            inherit (pkgs.chartsMetadata.kyverno.kyverno) repo version;
             enable = true;
             createNamespace = true;
-            hash = pkgs.chartsMetadata.kyverno.kyverno.chartHash;
-            name = "kyverno";
+            package = pkgs.chartsDerivations.kyverno.kyverno;
             targetNamespace = "kyverno-system";
             values = {
-              admissionController.replicas =  3;
-              backgroundController.replicas =  3;
-              cleanupController.replicas =  2;
-              reportsController.replicas =  2;
-              crds.install =  true;
+              admissionController.replicas = 3;
+              backgroundController.replicas = 3;
+              cleanupController.replicas = 2;
+              reportsController.replicas = 2;
+              crds.install = true;
             };
           };
           tailscale = {
-            inherit (pkgs.chartsMetadata.tailscale.tailscale-operator) repo version;
             enable = true;
             createNamespace = true;
-            hash = pkgs.chartsMetadata.tailscale.tailscale-operator.chartHash;
-            name = "tailscale-operator";
+            package = pkgs.chartsDerivations.tailscale.tailscale-operator;
             targetNamespace = "tailscale";
           };
         };