diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2d49562a52c..8bebe84ddd2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1014,9 +1014,9 @@ jobs:
             export TF_VAR_BOOTNODE_2_PEER_ID=$BOOTNODE_2_PEER_ID
             export TF_VAR_BOOTNODE_1_PRIVATE_KEY=$BOOTNODE_1_PRIVATE_KEY
             export TF_VAR_BOOTNODE_2_PRIVATE_KEY=$BOOTNODE_2_PRIVATE_KEY
-            deploy p2p-bootstrap
-            deploy aztec-node
-            deploy aztec-faucet
+            deploy_terraform p2p-bootstrap yarn-project/p2p-bootstrap/terraform
+            deploy_terraform aztec-node yarn-project/aztec-node/terraform
+            deploy_terraform aztec-faucet yarn-project/aztec-faucet/terraform
 
 # Repeatable config for defining the workflow below.
 defaults: &defaults
diff --git a/build-system/scripts/deploy_terraform b/build-system/scripts/deploy_terraform
index 3759cc52a0a..ce2231853aa 100755
--- a/build-system/scripts/deploy_terraform
+++ b/build-system/scripts/deploy_terraform
@@ -4,7 +4,7 @@ set -eu
 
 REPOSITORY=$1
 TF_DIR=$2
-TO_TAINT=${3}
+TO_TAINT=${3:-}
 
 if [ ! -d "$TF_DIR" ]; then
   echo "No terraform directory found at $TF_DIR. Skipping."