diff --git a/Makefile b/Makefile
index 1067927d8..dace90e31 100644
--- a/Makefile
+++ b/Makefile
@@ -98,11 +98,11 @@ update: | waku.nims
 	@echo -e $(INFO_MSG) "Update complete!"
 
 clean:
-	@echo -e $(INFO_MSG) "Cleaning build artifacts..."
-	rm -rf build
 	@echo -e $(INFO_MSG) "Cleaning Nimble package cache..."
 	rm -rf ~/.nimble/pkgs2/*
 	rm -rf ~/.nimble/pkgcache/*
+	@echo -e $(INFO_MSG) "Cleaning build artifacts..."
+	rm -rf build
 	@echo -e $(INFO_MSG) "Clean complete!"
 
 ## Possible values: prod; debug
diff --git a/config.nims b/config.nims
index 6b12280c4..587ed1fa0 100644
--- a/config.nims
+++ b/config.nims
@@ -123,6 +123,7 @@ if defined(android):
   switch("passL", "--sysroot=" & sysRoot)
   switch("cincludes", sysRoot & "/usr/include/")
 # begin Nimble config (version 2)
+--noNimblePath
 when withDir(thisDir(), system.fileExists("nimble.paths")):
   include "nimble.paths"
 # end Nimble config
diff --git a/waku.nimble b/waku.nimble
index ea5e2e321..0982f30ff 100644
--- a/waku.nimble
+++ b/waku.nimble
@@ -42,16 +42,10 @@ requires "nimcrypto"
 requires "db_connector"
 requires "dnsclient"
 requires "nph"
-
-# FFI framework - from logos-messaging fork
-requires "https://github.com/logos-messaging/nim-ffi.git#nim_ffi_identation"
-
-# Packages with native dependencies
+requires "ffi"
 requires "eth"
 requires "libp2p"
 requires "web3"
-# nim-libbacktrace removed - optional dependency with build issues in Nimble
-# If needed, enable with USE_LIBBACKTRACE=1 and install manually
 requires "bearssl"
 requires "secp256k1"
 requires "nat_traversal"