diff --git a/build_all.bat b/build_all.bat
index e4d8ec31e5..bef7956f28 100644
--- a/build_all.bat
+++ b/build_all.bat
@@ -26,4 +26,4 @@ if not exist %nim_csources% (
 )
 bin\nim.exe c --noNimblePath --skipUserCfg --skipParentCfg --hints:off koch
 koch boot -d:release --skipUserCfg --skipParentCfg --hints:off
-koch tools --skipUserCfg --hints:off
+koch tools --skipUserCfg --skipParentCfg --hints:off
diff --git a/build_all.sh b/build_all.sh
index ddb8891a1f..83848f41a1 100755
--- a/build_all.sh
+++ b/build_all.sh
@@ -13,5 +13,5 @@ nimBuildCsourcesIfNeeded "$@"
 
 echo_run bin/nim c --noNimblePath --skipUserCfg --skipParentCfg --hints:off koch
 echo_run ./koch boot -d:release --skipUserCfg --skipParentCfg --hints:off
-echo_run ./koch tools --skipUserCfg --hints:off
+echo_run ./koch tools --skipUserCfg --skipParentCfg --hints:off
 
diff --git a/koch.nim b/koch.nim
index 3ada1314bf..d6972e65cb 100644
--- a/koch.nim
+++ b/koch.nim
@@ -11,7 +11,7 @@
 
 const
   # examples of possible values for repos: Head, ea82b54
-  NimbleStableCommit = "4e7e646b9819b72044e5262c2800e9f7ccfd1b16" # 0.16.4
+  NimbleStableCommit = "123f97a5e4ee9ba35720c0869e19a047c43c797e" # 0.16.4
   AtlasStableCommit = "5faec3e9a33afe99a7d22377dd1b45a5391f5504"
   ChecksumsStableCommit = "bd9bf4eaea124bf8d01e08f92ac1b14c6879d8d3"
   SatStableCommit = "faf1617f44d7632ee9601ebc13887644925dcc01"
diff --git a/tools/ci_generate.nim b/tools/ci_generate.nim
index a9635d02db..a461be5915 100644
--- a/tools/ci_generate.nim
+++ b/tools/ci_generate.nim
@@ -44,7 +44,7 @@ proc genBuildExtras(echoRun, koch, nim: string): string =
   result = fmt"""
 {echoRun}{nim} c --noNimblePath --skipUserCfg --skipParentCfg --hints:off koch
 {echoRun}{koch} boot -d:release --skipUserCfg --skipParentCfg --hints:off
-{echoRun}{koch} tools --skipUserCfg --hints:off
+{echoRun}{koch} tools --skipUserCfg --skipParentCfg --hints:off
 """
 
 proc genWindowsScript(buildAll: bool): string =