diff --git a/scripts/build.sh b/scripts/build.sh
index 62b2040..45f5de4 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -4,4 +4,4 @@ set -e
 
 pdk install --frozen-lockfile
 pdk build
-pdk workspaces run eslint
+pdk eslint
diff --git a/scripts/deployAll.sh b/scripts/deployAll.sh
index c2ed15b..3761b20 100755
--- a/scripts/deployAll.sh
+++ b/scripts/deployAll.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
+
 set -e
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 ${SCRIPT_DIR}/build.sh
 
-pdk workspace @aws/threat-composer-infra run cdk deploy
+yarn workspace @aws/threat-composer-infra run cdk deploy
diff --git a/scripts/deployDev.sh b/scripts/deployDev.sh
index 534441d..e946b69 100755
--- a/scripts/deployDev.sh
+++ b/scripts/deployDev.sh
@@ -6,4 +6,4 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 ${SCRIPT_DIR}/build.sh
 
-pdk workspace @aws/threat-composer-infra run cdk deploy Dev/ThreatComposerAppStack
+yarn workspace @aws/threat-composer-infra run cdk deploy Dev/ThreatComposerAppStack