diff --git a/flake.lock b/flake.lock
index 9d40f285e..d5a31e6e5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -29,17 +29,17 @@
         ]
       },
       "locked": {
-        "lastModified": 1737544289,
-        "narHash": "sha256-lrSkeUHEkB30sH7VPzLJXoxqLPkj+NzDI2vrmm2L/Gg=",
+        "lastModified": 1738925277,
+        "narHash": "sha256-iDD6jnzrWQJOrhJ3T8RG9FLMq85ybeNiT0qqm60mQ/4=",
         "owner": "vacp2p",
         "repo": "zerokit",
-        "rev": "7cbb57c2b5b987750db8dbf85fa81275d7c607f7",
+        "rev": "4479810968b88d0ef92717524adf5edd23df1869",
         "type": "github"
       },
       "original": {
         "owner": "vacp2p",
-        "ref": "add-nix-flake-and-derivation",
         "repo": "zerokit",
+        "rev": "4479810968b88d0ef92717524adf5edd23df1869",
         "type": "github"
       }
     }
diff --git a/flake.nix b/flake.nix
index a37a1a3bf..e0e031d62 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,7 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
     zerokit = {
-      url = "github:vacp2p/zerokit?ref=add-nix-flake-and-derivation";
+      url = "github:vacp2p/zerokit?rev=4479810968b88d0ef92717524adf5edd23df1869";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
@@ -14,7 +14,9 @@
       stableSystems = [
         "x86_64-linux" "aarch64-linux"
       ];
+
       forAllSystems = f: nixpkgs.lib.genAttrs stableSystems (system: f system);
+
       pkgsFor = forAllSystems (
         system: import nixpkgs {
           inherit system;
@@ -31,24 +33,22 @@
           ];
         }
       );
+
     in rec {
       packages = forAllSystems (system: let
-        zerokitPkg = zerokit.packages.${system}.default;
-        buildTarget = pkgsFor.${system}.callPackage ./nix/default.nix rec {
-          inherit stableSystems zerokitPkg;
+        buildTarget = targets: pkgsFor.${system}.callPackage ./nix/default.nix {
+          inherit stableSystems;
           src = self;
+          zerokitPkg = zerokit.packages.x86_64-linux.default;
+          androidArch = "aarch64-linux-android";
         };
-        build = targets: buildTarget.override { inherit targets; };
       in rec {
-        libwaku-android-amd64 = build ["libwaku-android-amd64"];
-        libwaku-android-arm64 = build ["libwaku-android-arm64"];
-        libwaku-android-arm   = build ["libwaku-android-arm"];
-        libwaku-android-x86   = build ["libwaku-android-x86"];
-        default = libwaku-android-amd64;
+        libwaku-android-arm64 = buildTarget "libwaku-android-arm64";
+        default = libwaku-android-arm64;
       });
 
       devShells = forAllSystems (system: {
         default = pkgsFor.${system}.callPackage ./nix/shell.nix { };
       });
     };
-}
+}
\ No newline at end of file
diff --git a/nix/default.nix b/nix/default.nix
index 6ba901297..2020e6367 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -8,9 +8,8 @@
   stableSystems ? [
     "x86_64-linux" "aarch64-linux"
   ],
-  zerokitPkg ? (
-    builtins.getFlake "github:vacp2p/zerokit?ref=add-nix-flake-and-derivation"
-  ).packages.${builtins.currentSystem}.default
+  androidArch,
+  zerokitPkg,
 }:
 
 assert pkgs.lib.assertMsg ((src.submodules or true) == true)
@@ -87,6 +86,8 @@ in stdenv.mkDerivation rec {
     cp -r ${callPackage ./csources.nix {}}  csources_v2
     chmod 777 -R dist/nimble csources_v2
     popd
+    mkdir -p vendor/zerokit/target/${androidArch}/release
+    cp ${zerokitPkg}/librln.so vendor/zerokit/target/${androidArch}/release/
   '';
 
   installPhase = ''