diff --git a/Makefile b/Makefile
index 3e23effa8..1067927d8 100644
--- a/Makefile
+++ b/Makefile
@@ -335,19 +335,14 @@ NPH_NIMBLE := $(NIMBLE_BIN_DIR)/nph
 
 build-nph: | build deps
 ifeq ("$(wildcard $(NPH))","")
-	@echo -e $(INFO_MSG) "Building nph from nimble package..."
-	nimble build nph -y
-	@if [ -f "$(NPH_NIMBLE)" ]; then \
-		cp "$(NPH_NIMBLE)" "$(NPH)"; \
-		echo "nph utility is available at $(NPH)"; \
-	else \
-		echo "nph binary not found at $(NPH_NIMBLE), trying alternate location..."; \
-		NPH_PKG=$$(ls -d $(NIMBLE_PKGS_DIR)/nph-* 2>/dev/null | head -1); \
-		if [ -n "$$NPH_PKG" ]; then \
-			nim c --skipParentCfg:on -o:$(NPH) $$NPH_PKG/src/nph.nim; \
-			echo "nph utility is available at $(NPH)"; \
-		fi; \
+	@echo -e $(INFO_MSG) "Installing nph via Nimble..."
+	nimble install -y nph
+	@# copy binary next to Nim compiler if not already there
+	@if [ ! -f "$(NPH)" ]; then \
+		NPH_INSTALLED=$$(command -v nph 2>/dev/null || true); \
+		[ -n "$$NPH_INSTALLED" ] && cp "$$NPH_INSTALLED" "$(NPH)"; \
 	fi
+	@echo "nph utility is available at $(NPH)"
 else
 	@echo "nph utility already exists at $(NPH)"
 endif
diff --git a/vendor/nim-ffi b/vendor/nim-ffi
deleted file mode 160000
index d7a549212..000000000
--- a/vendor/nim-ffi
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d7a5492121aad190cf549436836e2fa42e34ff9b
diff --git a/vendor/nph b/vendor/nph
deleted file mode 160000
index c6e03162d..000000000
--- a/vendor/nph
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c6e03162dc2820d3088660f644818d7040e95791
diff --git a/waku.nimble b/waku.nimble
index f812e5e1a..ea5e2e321 100644
--- a/waku.nimble
+++ b/waku.nimble
@@ -44,7 +44,7 @@ requires "dnsclient"
 requires "nph"
 
 # FFI framework - from logos-messaging fork
-requires "https://github.com/logos-messaging/nim-ffi.git >= 0.1.0"
+requires "https://github.com/logos-messaging/nim-ffi.git#nim_ffi_identation"
 
 # Packages with native dependencies
 requires "eth"