diff --git a/flake.lock b/flake.lock
index d5a31e6e5..25d1d4fe3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,16 +2,16 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1735563628,
-        "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
+        "lastModified": 1740339700,
+        "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
+        "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index e0e031d62..99ca1332b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "NWaku build flake";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
     zerokit = {
       url = "github:vacp2p/zerokit?rev=4479810968b88d0ef92717524adf5edd23df1869";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -13,6 +13,9 @@
     let
       stableSystems = [
         "x86_64-linux" "aarch64-linux"
+        "x86_64-darwin" "aarch64-darwin"
+        "x86_64-windows" "i686-linux"
+        "i686-windows"
       ];
 
       forAllSystems = f: nixpkgs.lib.genAttrs stableSystems (system: f system);
@@ -36,14 +39,20 @@
 
     in rec {
       packages = forAllSystems (system: let
-        buildTarget = targets: pkgsFor.${system}.callPackage ./nix/default.nix {
-          inherit stableSystems;
-          src = self;
-          zerokitPkg = zerokit.packages.x86_64-linux.default;
-          androidArch = "aarch64-linux-android";
-        };
+        pkgs = pkgsFor.${system};
       in rec {
-        libwaku-android-arm64 = buildTarget "libwaku-android-arm64";
+        libwaku-android-arm64 = pkgs.callPackage ./nix/default.nix {
+          inherit stableSystems;
+          targets = ["libwaku-android-arm64"]; 
+          androidArch = "aarch64-linux-android";
+          zerokitPkg = zerokit.packages.${system}.zerokit-android-arm64;
+        };
+        libwaku-android-amd64 = pkgs.callPackage ./nix/default.nix { 
+          inherit stableSystems;
+          targets = ["libwaku-android-amd64"]; 
+          androidArch = "musl64";
+          zerokitPkg = zerokit.packages.${system}.zerokit-android-amd64;
+        };
         default = libwaku-android-arm64;
       });
 
diff --git a/nix/default.nix b/nix/default.nix
index d52a2cb17..9415d9459 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -2,7 +2,7 @@
   config ? {},
   pkgs ? import ./pkgs.nix { inherit config; },
   src ? ../.,
-  targets ? ["libwaku-android-amd64"],
+  targets ? ["libwaku-android-arm64"],
   verbosity ? 2,
   useSystemNim ? false,
   stableSystems ? [
@@ -49,7 +49,6 @@ in stdenv.mkDerivation rec {
       which
       lsb-release
       zerokitPkg
-      nim-unwrapped-2_0
       fakeGit
       fakeCargo
       fakeRustup
@@ -73,11 +72,6 @@ in stdenv.mkDerivation rec {
 
   preBuild = ''
     ln -s waku.nimble waku.nims
-
-    mkdir -p ./vendor/nimbus-build-system/vendor/Nim/bin/nim
-    USE_SYSTEM_NIM=1 ./vendor/nimbus-build-system/scripts/env.sh nim c vendor/nph/src/nph.nim
-    mv vendor/nph/src/nph ./vendor/nimbus-build-system/vendor/Nim/bin/nim
-
     pushd vendor/nimbus-build-system/vendor/Nim
     mkdir dist
     cp -r ${callPackage ./nimble.nix {}}    dist/nimble