diff --git a/.appveyor.yml b/.appveyor.yml
index 48a02b3..e11621e 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -3,7 +3,8 @@ version: '{build}'
 image: Visual Studio 2015
 
 cache:
-- NimBinaries
+  - NimBinaries
+  - p2pdCache
 
 matrix:
   # We always want 32 and 64-bit compilation
@@ -23,6 +24,13 @@ install:
   - IF "%PLATFORM%" == "x86" SET PATH=C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin;%PATH%
   - IF "%PLATFORM%" == "x64" SET PATH=C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin;%PATH%
 
+  # build nim from our own branch - this to avoid the day-to-day churn and
+  # regressions of the fast-paced Nim development while maintaining the
+  # flexibility to apply patches
+  - curl -O -L -s -S https://raw.githubusercontent.com/status-im/nimbus-build-system/master/scripts/build_nim.sh
+  - env MAKE="mingw32-make -j2" ARCH_OVERRIDE=%PLATFORM% bash build_nim.sh Nim csources dist/nimble NimBinaries
+  - SET PATH=%CD%\Nim\bin;%PATH%
+
   # set path for produced Go binaries
   - MKDIR goblin
   - CD goblin
@@ -31,22 +39,11 @@ install:
   - CD ..
 
   # install and build go-libp2p-daemon
-  - go version
-  - git clone https://github.com/libp2p/go-libp2p-daemon
-  - CD go-libp2p-daemon
-  - go install ./...
-  - CD ..
-
-  # build nim from our own branch - this to avoid the day-to-day churn and
-  # regressions of the fast-paced Nim development while maintaining the
-  # flexibility to apply patches
-  - curl -O -L -s -S https://raw.githubusercontent.com/status-im/nimbus-build-system/master/scripts/build_nim.sh
-  - env MAKE="mingw32-make -j2" ARCH_OVERRIDE=%PLATFORM% bash build_nim.sh Nim csources dist/nimble NimBinaries
-  - SET PATH=%CD%\Nim\bin;%PATH%
+  - curl -O -L -s -S https://raw.githubusercontent.com/status-im/nimbus-build-system/master/scripts/build_p2pd.sh
+  - bash build_p2pd.sh p2pdCache
 
 build_script:
-  - cd C:\projects\%APPVEYOR_PROJECT_SLUG%
-  - nimble install -y
+  - nimble install -y --depsOnly
 
 test_script:
   - nimble test
diff --git a/.travis.yml b/.travis.yml
index 25337f2..f794f34 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ language: go
 cache:
   directories:
     - NimBinaries
+    - p2pdCache
 
 git:
   # when multiple CI builds are queued, the tested commit needs to be in the last X commits cloned with "--depth X"
@@ -28,11 +29,9 @@ install:
   - env MAKE="make -j2" bash build_nim.sh Nim csources dist/nimble NimBinaries
   - export PATH="$PWD/Nim/bin:$GOPATH/bin:$PATH"
 
-  - git clone https://github.com/libp2p/go-libp2p-daemon
-  - cd go-libp2p-daemon
-  # - git checkout v0.0.1
-  - go install ./...
-  - cd $HOME/build/status-im/nim-libp2p
+  # install and build go-libp2p-daemon
+  - curl -O -L -s -S https://raw.githubusercontent.com/status-im/nimbus-build-system/master/scripts/build_p2pd.sh
+  - bash build_p2pd.sh p2pdCache
 
 script:
   - nimble install -y --depsOnly