diff --git a/scripts/setup.sh b/scripts/setup.sh
index 84f4cf037..0cb316faf 100644
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Add yarn to the $PATH so npm cli commands do not fail
+export PATH="${PATH}:$(yarn global bin)"
+
 cd ${OKTA_HOME}/${REPO}
 
 # undo permissions change on scripts/publish.sh
@@ -12,9 +15,6 @@ git reset --hard $SHA
 git config --global user.email "oktauploader@okta.com"
 git config --global user.name "oktauploader-okta"
 
-# Use newer, faster npm
-npm install -g npm@5.0.3
-
 # Install required dependencies
 npm install -g lerna