diff --git a/configuration/services/wireguard.nix b/configuration/services/wireguard.nix
index bbab22e..a6b7763 100644
--- a/configuration/services/wireguard.nix
+++ b/configuration/services/wireguard.nix
@@ -27,7 +27,7 @@
           # yui
           {
             AllowedIPs = [ "10.45.249.2/32" ];
-            PublicKey = "5mlnqEVJWks5OqgeFA2bLIrvST9TlCE81Btl+j4myz0=";
+            PublicKey = "WbNuxp7tTWTVve/nyiwC1stfaJS0wORvBxiK9IFTpio=";
           }
         ];
       };
diff --git a/pkgs/crowdsec/_sources/generated.json b/pkgs/crowdsec/_sources/generated.json
new file mode 100644
index 0000000..fd61141
--- /dev/null
+++ b/pkgs/crowdsec/_sources/generated.json
@@ -0,0 +1,44 @@
+{
+    "crowdsec-firewall-bouncer": {
+        "cargoLocks": null,
+        "date": null,
+        "extract": null,
+        "name": "crowdsec-firewall-bouncer",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
+            "name": null,
+            "owner": "crowdsecurity",
+            "repo": "cs-firewall-bouncer",
+            "rev": "v0.0.34",
+            "sha256": "sha256-lDO9pwPkbI+FDTdXBv03c0p8wbkRUiIDNl1ip3AZo2g=",
+            "sparseCheckout": [],
+            "type": "github"
+        },
+        "version": "v0.0.34"
+    },
+    "crowdsec-hub": {
+        "cargoLocks": null,
+        "date": "2025-08-17",
+        "extract": null,
+        "name": "crowdsec-hub",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
+            "name": null,
+            "owner": "crowdsecurity",
+            "repo": "hub",
+            "rev": "fc59f78180f3edfce76df3e77b001c454f567d3d",
+            "sha256": "sha256-Ejx3ta05SMvV/Dj7wy2iF9QYbGoRvxPB3+QuCIoTX4Q=",
+            "sparseCheckout": [],
+            "type": "github"
+        },
+        "version": "fc59f78180f3edfce76df3e77b001c454f567d3d"
+    }
+}
\ No newline at end of file
diff --git a/pkgs/crowdsec/_sources/generated.nix b/pkgs/crowdsec/_sources/generated.nix
new file mode 100644
index 0000000..b5efc4e
--- /dev/null
+++ b/pkgs/crowdsec/_sources/generated.nix
@@ -0,0 +1,27 @@
+# This file was generated by nvfetcher, please do not modify it manually.
+{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }:
+{
+  crowdsec-firewall-bouncer = {
+    pname = "crowdsec-firewall-bouncer";
+    version = "v0.0.34";
+    src = fetchFromGitHub {
+      owner = "crowdsecurity";
+      repo = "cs-firewall-bouncer";
+      rev = "v0.0.34";
+      fetchSubmodules = false;
+      sha256 = "sha256-lDO9pwPkbI+FDTdXBv03c0p8wbkRUiIDNl1ip3AZo2g=";
+    };
+  };
+  crowdsec-hub = {
+    pname = "crowdsec-hub";
+    version = "fc59f78180f3edfce76df3e77b001c454f567d3d";
+    src = fetchFromGitHub {
+      owner = "crowdsecurity";
+      repo = "hub";
+      rev = "fc59f78180f3edfce76df3e77b001c454f567d3d";
+      fetchSubmodules = false;
+      sha256 = "sha256-Ejx3ta05SMvV/Dj7wy2iF9QYbGoRvxPB3+QuCIoTX4Q=";
+    };
+    date = "2025-08-17";
+  };
+}
diff --git a/pkgs/crowdsec/firewall-bouncer.nix b/pkgs/crowdsec/firewall-bouncer.nix
index f3156f9..cfb062a 100644
--- a/pkgs/crowdsec/firewall-bouncer.nix
+++ b/pkgs/crowdsec/firewall-bouncer.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  fetchFromGitHub,
+  sources,
   buildGoModule,
   envsubst,
   coreutils,
@@ -8,16 +8,8 @@
 let
   envsubstBin = lib.getExe envsubst;
 in
-buildGoModule (drv: {
-  pname = "crowdsec-firewall-bouncer";
-  version = "0.0.34";
-
-  src = fetchFromGitHub {
-    owner = "crowdsecurity";
-    repo = "cs-firewall-bouncer";
-    rev = drv.version;
-    hash = "sha256-lDO9pwPkbI+FDTdXBv03c0p8wbkRUiIDNl1ip3AZo2g=";
-  };
+buildGoModule {
+  inherit (sources.crowdsec-firewall-bouncer) pname version src;
 
   vendorHash = "sha256-SbpclloBgd9vffC0lBduGRqPOqmzQ0J91/KeDHCh0jo=";
 
@@ -31,4 +23,4 @@ buildGoModule (drv: {
     substituteInPlace $out/lib/systemd/system/crowdsec-firewall-bouncer.service \
       --replace-fail /bin/sleep ${coreutils}/bin/sleep
   '';
-})
+}
diff --git a/pkgs/crowdsec/hub.nix b/pkgs/crowdsec/hub.nix
index 3bc115b..1b8c9b3 100644
--- a/pkgs/crowdsec/hub.nix
+++ b/pkgs/crowdsec/hub.nix
@@ -1,17 +1 @@
-{ fetchFromGitHub, stdenvNoCC }:
-# Using `mkDerivation` so nix-update can pick up the version
-stdenvNoCC.mkDerivation (drv: {
-  pname = "crowdsec-hub";
-  version = drv.src.rev;
-
-  src = fetchFromGitHub {
-    owner = "crowdsecurity";
-    repo = "hub";
-    rev = "fc59f78180f3edfce76df3e77b001c454f567d3d";
-    hash = "sha256-Ejx3ta05SMvV/Dj7wy2iF9QYbGoRvxPB3+QuCIoTX4Q=";
-  };
-
-  installPhase = ''
-    cp -r $src $out
-  '';
-})
+{ sources }: sources.crowdsec-hub.src
diff --git a/pkgs/crowdsec/nvfetcher.toml b/pkgs/crowdsec/nvfetcher.toml
new file mode 100644
index 0000000..2287dba
--- /dev/null
+++ b/pkgs/crowdsec/nvfetcher.toml
@@ -0,0 +1,7 @@
+[crowdsec-hub]
+src.git = "https://github.com/crowdsecurity/hub.git"
+fetch.github = "crowdsecurity/hub"
+
+[crowdsec-firewall-bouncer]
+src.github = "crowdsecurity/cs-firewall-bouncer"
+fetch.github = "crowdsecurity/cs-firewall-bouncer"