diff --git a/.circleci/config.yml b/.circleci/config.yml
index d6833ac5c..a9df667c4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -38,11 +38,6 @@ checkout: &checkout
       chmod 0700 .ssh
       ssh-keyscan -t rsa github.com >> .ssh/known_hosts
 
-      # A read only key for cloning the repository.
-      echo $GIT_CHECKOUT_KEY | base64 -d > .ssh/id_rsa
-
-      chmod 0600 .ssh/id_rsa
-
       # IF YOU'RE CHANGING THIS, YOU ALSO WANT TO CHANGE: build-system/remote_build/remote_build
       # Shallow checkout this commit.
       mkdir -p project
@@ -700,28 +695,34 @@ jobs:
 
 # Repeatable config for defining the workflow below.
 tag_regex: &tag_regex /v[0-9]+(\.[0-9]+)*(-[a-zA-Z-]+\.[0-9]+)?/
-tag_filter: &tag_filter
-  tags:
-    only: *tag_regex
+defaults: &defaults
+  filters:
+    tags:
+      only: *tag_regex
+  context:
+    - build
 ac_test: &ac_test
   requires:
     - x86_64-linux-clang-assert
-  filters: *tag_filter
+  <<: *defaults
 yarn_project: &yarn_project
   requires:
     - yarn-project-base
-  filters: *tag_filter
+  <<: *defaults
 e2e_test: &e2e_test
   requires:
     - e2e-join
-  filters: *tag_filter
-deploy_filters: &deploy_filters
-  branches:
-    only:
-      - master
-      - stage
-  tags:
-    only: *tag_regex
+  <<: *defaults
+deploy_defaults: &deploy_defaults
+  filters:
+    branches:
+      only:
+        - master
+        - stage
+    tags:
+      only: *tag_regex
+  context:
+    - build
 
 workflows:
   system:
@@ -729,13 +730,13 @@ workflows:
       equal: [system, << pipeline.parameters.workflow >>]
     jobs:
       - wasm-linux-clang:
-          filters: *tag_filter
+          <<: *defaults
       - x86_64-linux-clang:
-          filters: *tag_filter
+          <<: *defaults
       - x86_64-linux-clang-assert:
-          filters: *tag_filter
+          <<: *defaults
       - x86_64-linux-gcc:
-          filters: *tag_filter
+          <<: *defaults
       - small-circuit-tests: *ac_test
       - tx-rollup-tests: *ac_test
       - tx-rollup-full-tests: *ac_test
@@ -757,16 +758,16 @@ workflows:
       - blockchain-vks:
           requires:
             - x86_64-linux-clang
-          filters: *tag_filter
+          <<: *defaults
       - contracts:
           requires:
             - blockchain-vks
-          filters: *tag_filter
+          <<: *defaults
       - yarn-project-base:
           requires:
             - wasm-linux-clang
             - contracts
-          filters: *tag_filter
+          <<: *defaults
       - contracts-verifier-test: *yarn_project
       - barretenberg-js: *yarn_project
       - blockchain: *yarn_project
@@ -788,7 +789,7 @@ workflows:
             - sdk
             - hummus
             - end-to-end
-          filters: *tag_filter
+          <<: *defaults
       - e2e-account: *e2e_test
       - e2e-browser: *e2e_test
       - e2e-chained-txs-with-spending-keys: *e2e_test
@@ -814,7 +815,7 @@ workflows:
             - root-rollup-tests
             - root-rollup-full-tests
             - root-verifier-tests
-          filters: *deploy_filters
+          <<: *deploy_defaults
       - yarn-join:
           requires:
             - wallet
@@ -824,7 +825,7 @@ workflows:
             - barretenberg-js
             - block-server
             - aztec-dev-cli
-          filters: *deploy_filters
+          <<: *deploy_defaults
       - deploy:
           requires:
             # Must list all projects at the end of a dependency chain.
@@ -847,4 +848,4 @@ workflows:
             - e2e-virtual-assets
             - e2e-deposit-approval
             - int-rollup-processor
-          filters: *deploy_filters
+          <<: *deploy_defaults
diff --git a/yarn-project/falafel/terraform/prod/main.tf b/yarn-project/falafel/terraform/prod/main.tf
index dab2530eb..7600d262e 100644
--- a/yarn-project/falafel/terraform/prod/main.tf
+++ b/yarn-project/falafel/terraform/prod/main.tf
@@ -241,7 +241,7 @@ resource "aws_ecs_task_definition" "falafel" {
       },
       {
         "name": "EXIT_ONLY",
-        "value": "false"
+        "value": "true"
       }
     ],
     "mountPoints": [
diff --git a/yarn-project/falafel/terraform/testnet/main.tf b/yarn-project/falafel/terraform/testnet/main.tf
index d41fd877d..a43d0ef51 100644
--- a/yarn-project/falafel/terraform/testnet/main.tf
+++ b/yarn-project/falafel/terraform/testnet/main.tf
@@ -241,7 +241,7 @@ resource "aws_ecs_task_definition" "falafel" {
       },
       {
         "name": "EXIT_ONLY",
-        "value": "false"
+        "value": "true"
       }
     ],
     "mountPoints": [