diff --git a/Makefile b/Makefile
index 733a7940f..f331b110b 100644
--- a/Makefile
+++ b/Makefile
@@ -88,15 +88,22 @@ waku.nims:
 # This is the ONLY target that should install/update Nimble packages
 update: | waku.nims
 	@echo -e $(INFO_MSG) "Updating vendor submodules..."
-	git submodule update --init vendor/zerokit vendor/waku-rlnv2-contract vendor/nph vendor/nim-ffi
+	git submodule update --init --recursive
 	@echo -e $(INFO_MSG) "Installing/updating Nimble dependencies..."
 	nimble install --depsOnly -y
+	@echo -e $(INFO_MSG) "Setting up Nimble paths..."
+	nimble setup
 	@echo -e $(INFO_MSG) "Building nph formatter..."
 	$(MAKE) build-nph
 	@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) "Clean complete!"
 
 ## Possible values: prod; debug
 TARGET ?= prod
diff --git a/config.nims b/config.nims
index 587ed1fa0..6b12280c4 100644
--- a/config.nims
+++ b/config.nims
@@ -123,7 +123,6 @@ 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