diff --git a/.github/workflows/activate-stack.yml b/.github/workflows/activate-stack.yml
index 44d213cd8..97a7e141b 100644
--- a/.github/workflows/activate-stack.yml
+++ b/.github/workflows/activate-stack.yml
@@ -23,7 +23,7 @@ permissions:
 jobs:
   activate-stack:
     name: Activate ${{ inputs.stack_name }} for ${{ inputs.environment }}
-    runs-on: [self-hosted, ci]
+    runs-on: codebuild-nhsd-nrlf-ci-build-project-${{ github.run_id }}-${{ github.run_attempt }}
     environment: ${{ inputs.environment }}
 
     steps:
@@ -32,18 +32,10 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - name: Setup asdf cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.asdf
-          key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
-          restore-keys: |
-            ${{ runner.os }}-asdf-
-
-      - name: Install asdf
-        uses: asdf-vm/actions/install@v3.0.2
-        with:
-          asdf_branch: v0.13.1
+      - name: Setup environment
+        run: |
+          echo "${HOME}/.asdf/bin" >> $GITHUB_PATH
+          poetry install --no-root
 
       - name: Configure Management Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -52,14 +44,6 @@ jobs:
           role-to-assume: ${{ secrets.MGMT_ROLE_ARN }}
           role-session-name: github-actions-ci-${{ inputs.environment }}-${{ github.run_id}}
 
-      - name: Install zip
-        run: sudo apt-get install zip
-
-      - name: Setup Python environment
-        run: |
-          poetry install --no-root
-          source $(poetry env info --path)/bin/activate
-
       - name: Get current environment config
         run: |
           poetry run python ./scripts/get_env_config.py all ${{ inputs.environment }}
diff --git a/.github/workflows/daily-build.yml b/.github/workflows/daily-build.yml
index 9205594af..6a5265431 100644
--- a/.github/workflows/daily-build.yml
+++ b/.github/workflows/daily-build.yml
@@ -39,13 +39,7 @@ jobs:
         run: make test
 
       - name: Build Project
-        run: |
-          echo "PATH: ${PATH}"
-          echo "HOME: ${HOME}"
-          echo "python: $(which python)"
-          echo "asdf: $(which asdf)"
-          echo "/usr/local/bin: $(ls -la /usr/local/bin)"
-          make build
+        run: make build
 
       - name: Configure Management Credentials
         uses: aws-actions/configure-aws-credentials@v4
diff --git a/.github/workflows/persistent-environment.yml b/.github/workflows/persistent-environment.yml
index 7e4016354..c4f2e49f4 100644
--- a/.github/workflows/persistent-environment.yml
+++ b/.github/workflows/persistent-environment.yml
@@ -22,7 +22,7 @@ permissions:
 jobs:
   build:
     name: Build - ${{ inputs.branch_name }}
-    runs-on: [self-hosted, ci]
+    runs-on: codebuild-nhsd-nrlf-ci-build-project-${{ github.run_id }}-${{ github.run_attempt }}
 
     steps:
       - name: Git clone - ${{ inputs.branch_name }}
@@ -30,26 +30,10 @@ jobs:
         with:
           ref: ${{ inputs.branch_name }}
 
-      - name: Setup asdf cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.asdf
-          key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
-          restore-keys: |
-            ${{ runner.os }}-asdf-
-
-      - name: Install asdf
-        uses: asdf-vm/actions/install@v3.0.2
-        with:
-          asdf_branch: v0.13.1
-
-      - name: Install zip
-        run: sudo apt-get install zip
-
-      - name: Setup Python environment
+      - name: Setup environment
         run: |
+          echo "${HOME}/.asdf/bin" >> $GITHUB_PATH
           poetry install --no-root
-          source $(poetry env info --path)/bin/activate
 
       - name: Run Linting
         run: make lint
@@ -91,7 +75,7 @@ jobs:
     name: Terraform Plan - ${{ inputs.environment }}
     needs: [build]
     environment: ${{ inputs.environment }}
-    runs-on: [self-hosted, ci]
+    runs-on: codebuild-nhsd-nrlf-ci-build-project-${{ github.run_id }}-${{ github.run_attempt }}
 
     steps:
       - name: Git clone - ${{ inputs.branch_name }}
@@ -99,18 +83,10 @@ jobs:
         with:
           ref: ${{ inputs.branch_name }}
 
-      - name: Setup asdf cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.asdf
-          key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
-          restore-keys: |
-            ${{ runner.os }}-asdf-
-
-      - name: Install asdf
-        uses: asdf-vm/actions/install@v3.0.2
-        with:
-          asdf_branch: v0.13.1
+      - name: Setup environment
+        run: |
+          echo "${HOME}/.asdf/bin" >> $GITHUB_PATH
+          poetry install --no-root
 
       - name: Configure Management Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -130,14 +106,6 @@ jobs:
           name: build-artifacts
           path: dist
 
-      - name: Install zip
-        run: sudo apt-get install zip
-
-      - name: Setup Python environment
-        run: |
-          poetry install --no-root
-          source $(poetry env info --path)/bin/activate
-
       - name: Restore NRLF permissions cache
         uses: actions/cache/restore@v4
         with:
@@ -170,7 +138,7 @@ jobs:
   terraform-apply:
     name: Terraform Apply - ${{ inputs.environment }}
     needs: [terraform-plan]
-    runs-on: [self-hosted, ci]
+    runs-on: codebuild-nhsd-nrlf-ci-build-project-${{ github.run_id }}-${{ github.run_attempt }}
     environment: ${{ inputs.environment }}
 
     steps:
@@ -179,18 +147,10 @@ jobs:
         with:
           ref: ${{ inputs.branch_name }}
 
-      - name: Setup asdf cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.asdf
-          key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
-          restore-keys: |
-            ${{ runner.os }}-asdf-
-
-      - name: Install asdf
-        uses: asdf-vm/actions/install@v3.0.2
-        with:
-          asdf_branch: v0.13.1
+      - name: Setup environment
+        run: |
+          echo "${HOME}/.asdf/bin" >> $GITHUB_PATH
+          poetry install --no-root
 
       - name: Download build artifacts
         uses: actions/download-artifact@v4
@@ -220,14 +180,6 @@ jobs:
           account=$(echo '${{ inputs.environment }}' | cut -d '-' -f1)
           make truststore-pull-server ENV=${account}
 
-      - name: Install zip
-        run: sudo apt-get install zip
-
-      - name: Setup Python environment
-        run: |
-          poetry install --no-root
-          source $(poetry env info --path)/bin/activate
-
       - name: Terraform Init
         run: |
           inactive_stack=$(poetry run python ./scripts/get_env_config.py inactive-stack ${{ inputs.environment }})
@@ -252,7 +204,7 @@ jobs:
   activate-stack:
     name: Activate - ${{ inputs.environment }}
     needs: [terraform-apply]
-    runs-on: [self-hosted, ci]
+    runs-on: codebuild-nhsd-nrlf-ci-build-project-${{ github.run_id }}-${{ github.run_attempt }}
     environment: ${{ inputs.environment }}
 
     steps:
@@ -261,18 +213,10 @@ jobs:
         with:
           ref: ${{ inputs.branch_name }}
 
-      - name: Setup asdf cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.asdf
-          key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
-          restore-keys: |
-            ${{ runner.os }}-asdf-
-
-      - name: Install asdf
-        uses: asdf-vm/actions/install@v3.0.2
-        with:
-          asdf_branch: v0.13.1
+      - name: Setup environment
+        run: |
+          echo "${HOME}/.asdf/bin" >> $GITHUB_PATH
+          poetry install --no-root
 
       - name: Configure Management Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -281,14 +225,6 @@ jobs:
           role-to-assume: ${{ secrets.MGMT_ROLE_ARN }}
           role-session-name: github-actions-ci-${{ inputs.environment }}-${{ github.run_id}}
 
-      - name: Install zip
-        run: sudo apt-get install zip
-
-      - name: Setup Python environment
-        run: |
-          poetry install --no-root
-          source $(poetry env info --path)/bin/activate
-
       - name: Activate Stack
         run: |
           inactive_stack=$(poetry run python ./scripts/get_env_config.py inactive-stack ${{ inputs.environment }})
@@ -297,7 +233,7 @@ jobs:
   post-release-verify:
     name: Verify - ${{ inputs.environment }}
     needs: [activate-stack]
-    runs-on: [self-hosted, ci]
+    runs-on: codebuild-nhsd-nrlf-ci-build-project-${{ github.run_id }}-${{ github.run_attempt }}
     environment: ${{ inputs.environment }}
 
     steps:
@@ -306,18 +242,10 @@ jobs:
         with:
           ref: ${{ inputs.branch_name }}
 
-      - name: Setup asdf cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.asdf
-          key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
-          restore-keys: |
-            ${{ runner.os }}-asdf-
-
-      - name: Install asdf
-        uses: asdf-vm/actions/install@v3.0.2
-        with:
-          asdf_branch: v0.13.1
+      - name: Setup environment
+        run: |
+          echo "${HOME}/.asdf/bin" >> $GITHUB_PATH
+          poetry install --no-root
 
       - name: Configure Management Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -326,14 +254,6 @@ jobs:
           role-to-assume: ${{ secrets.MGMT_ROLE_ARN }}
           role-session-name: github-actions-ci-${{ inputs.environment }}-${{ github.run_id}}
 
-      - name: Install zip
-        run: sudo apt-get install zip
-
-      - name: Setup Python environment
-        run: |
-          poetry install --no-root
-          source $(poetry env info --path)/bin/activate
-
       - name: "Smoke Test"
         run: |
           make ENV=${{ inputs.environment }} test-smoke-public
@@ -342,7 +262,7 @@ jobs:
     name: Rollback - ${{ inputs.environment }}
     needs: [post-release-verify]
     if: always() && ( needs.post-release-verify.result == 'failure' )
-    runs-on: [self-hosted, ci]
+    runs-on: codebuild-nhsd-nrlf-ci-build-project-${{ github.run_id }}-${{ github.run_attempt }}
     environment: ${{ inputs.environment }}
 
     steps:
@@ -351,18 +271,10 @@ jobs:
         with:
           ref: ${{ inputs.branch_name }}
 
-      - name: Setup asdf cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.asdf
-          key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
-          restore-keys: |
-            ${{ runner.os }}-asdf-
-
-      - name: Install asdf
-        uses: asdf-vm/actions/install@v3.0.2
-        with:
-          asdf_branch: v0.13.1
+      - name: Setup environment
+        run: |
+          echo "${HOME}/.asdf/bin" >> $GITHUB_PATH
+          poetry install --no-root
 
       - name: Configure Management Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -371,14 +283,6 @@ jobs:
           role-to-assume: ${{ secrets.MGMT_ROLE_ARN }}
           role-session-name: github-actions-ci-${{ inputs.environment }}-${{ github.run_id}}
 
-      - name: Install zip
-        run: sudo apt-get install zip
-
-      - name: Setup Python environment
-        run: |
-          poetry install --no-root
-          source $(poetry env info --path)/bin/activate
-
       - name: Deactivate Stack
         run: |
           inactive_stack_name=$(poetry run python ./scripts/get_env_config.py inactive-stack ${{ inputs.environment }})
diff --git a/.github/workflows/pr-env-deploy.yml b/.github/workflows/pr-env-deploy.yml
index c21dbc24d..d5ac9a878 100644
--- a/.github/workflows/pr-env-deploy.yml
+++ b/.github/workflows/pr-env-deploy.yml
@@ -19,7 +19,7 @@ permissions:
 jobs:
   set-environment-id:
     name: Set Environment ID
-    runs-on: [self-hosted, ci]
+    runs-on: codebuild-nhsd-nrlf-ci-build-project-${{ github.run_id }}-${{ github.run_attempt }}
     environment: pull-request
     steps:
       - name: Set a ID based on the branch name
@@ -44,7 +44,7 @@ jobs:
 
   build:
     name: Build Application
-    runs-on: [self-hosted, ci]
+    runs-on: codebuild-nhsd-nrlf-ci-build-project-${{ github.run_id }}-${{ github.run_attempt }}
     environment: pull-request
     steps:
       - name: Git Clone - ${{ github.event.pull_request.head.ref }}
@@ -52,26 +52,10 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.ref }}
 
-      - name: Setup asdf cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.asdf
-          key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
-          restore-keys: |
-            ${{ runner.os }}-asdf-
-
-      - name: Install asdf
-        uses: asdf-vm/actions/install@v3.0.2
-        with:
-          asdf_branch: v0.13.1
-
-      - name: Install zip
-        run: sudo apt-get install zip
-
-      - name: Setup Python environment
+      - name: Setup environment
         run: |
+          echo "${HOME}/.asdf/bin" >> $GITHUB_PATH
           poetry install --no-root
-          source $(poetry env info --path)/bin/activate
 
       - name: Run Linting
         run: make lint
@@ -121,7 +105,7 @@ jobs:
 
   deploy:
     name: Deploy PR Environment
-    runs-on: [self-hosted, ci]
+    runs-on: codebuild-nhsd-nrlf-ci-build-project-${{ github.run_id }}-${{ github.run_attempt }}
     environment: pull-request
     needs: [set-environment-id, build]
 
@@ -131,18 +115,10 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.ref }}
 
-      - name: Setup asdf cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.asdf
-          key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
-          restore-keys: |
-            ${{ runner.os }}-asdf-
-
-      - name: Install asdf
-        uses: asdf-vm/actions/install@v3.0.2
-        with:
-          asdf_branch: v0.13.1
+      - name: Setup environment
+        run: |
+          echo "${HOME}/.asdf/bin" >> $GITHUB_PATH
+          poetry install --no-root
 
       - name: Configure Management Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -167,14 +143,6 @@ jobs:
       - name: Retrieve Server Certificates
         run: make truststore-pull-server ENV=dev
 
-      - name: Install zip
-        run: sudo apt-get install zip
-
-      - name: Setup Python environment
-        run: |
-          poetry install --no-root
-          source $(poetry env info --path)/bin/activate
-
       - name: Terraform Init
         run: |
           terraform -chdir=terraform/infrastructure init
@@ -221,7 +189,7 @@ jobs:
     name: Run Integration Tests
     needs: [set-environment-id, deploy]
     environment: pull-request
-    runs-on: [self-hosted, ci]
+    runs-on: codebuild-nhsd-nrlf-ci-build-project-${{ github.run_id }}-${{ github.run_attempt }}
 
     steps:
       - name: Git Clone - ${{ github.event.pull_request.head.ref }}
@@ -229,21 +197,10 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.ref }}
 
-      - name: Setup asdf cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.asdf
-          key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
-          restore-keys: |
-            ${{ runner.os }}-asdf-
-
-      - name: Install asdf and tools
-        uses: asdf-vm/actions/install@v3.0.2
-        with:
-          asdf_branch: v0.13.1
-
-      - name: Python Dependency Install
-        run: poetry install --no-root
+      - name: Setup environment
+        run: |
+          echo "${HOME}/.asdf/bin" >> $GITHUB_PATH
+          poetry install --no-root
 
       - name: Configure Management Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -270,30 +227,17 @@ jobs:
     name: Run Smoke Tests
     needs: [set-environment-id, integration-test]
     environment: pull-request
-    runs-on: [self-hosted, ci]
+    runs-on: codebuild-nhsd-nrlf-ci-build-project-${{ github.run_id }}-${{ github.run_attempt }}
     steps:
       - name: Git Clone - ${{ github.event.pull_request.head.ref }}
         uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.ref }}
 
-      - name: Setup asdf cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.asdf
-          key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
-          restore-keys: |
-            ${{ runner.os }}-asdf-
-
-      - name: Install asdf and tools
-        uses: asdf-vm/actions/install@v3.0.2
-        with:
-          asdf_branch: v0.13.1
-
-      - name: Setup Python environment
+      - name: Setup environment
         run: |
+          echo "${HOME}/.asdf/bin" >> $GITHUB_PATH
           poetry install --no-root
-          source $(poetry env info --path)/bin/activate
 
       - name: Configure Management Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -317,7 +261,7 @@ jobs:
     name: Run Performance Tests
     needs: [set-environment-id, integration-test]
     environment: pull-request
-    runs-on: [self-hosted, ci]
+    runs-on: codebuild-nhsd-nrlf-ci-build-project-${{ github.run_id }}-${{ github.run_attempt }}
 
     steps:
       - name: Git Clone - ${{ github.event.pull_request.head.ref }}
@@ -325,23 +269,10 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.ref }}
 
-      - name: Setup asdf cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.asdf
-          key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
-          restore-keys: |
-            ${{ runner.os }}-asdf-
-
-      - name: Install asdf and tools
-        uses: asdf-vm/actions/install@v3.0.2
-        with:
-          asdf_branch: v0.13.1
-
-      - name: Setup Python environment
+      - name: Setup environment
         run: |
+          echo "${HOME}/.asdf/bin" >> $GITHUB_PATH
           poetry install --no-root
-          source $(poetry env info --path)/bin/activate
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
diff --git a/.github/workflows/pr-env-destroy.yml b/.github/workflows/pr-env-destroy.yml
index fded06408..42e5bab46 100644
--- a/.github/workflows/pr-env-destroy.yml
+++ b/.github/workflows/pr-env-destroy.yml
@@ -19,7 +19,7 @@ permissions:
 jobs:
   set-environment-id:
     name: Set Environment ID
-    runs-on: [self-hosted, ci]
+    runs-on: codebuild-nhsd-nrlf-ci-build-project-${{ github.run_id }}-${{ github.run_attempt }}
     steps:
       - name: Set a ID based on the branch name
         id: set_environment_id
@@ -46,7 +46,7 @@ jobs:
     name: Destroy PR Environment
     needs: [set-environment-id]
     environment: pull-request
-    runs-on: [self-hosted, ci]
+    runs-on: codebuild-nhsd-nrlf-ci-build-project-${{ github.run_id }}-${{ github.run_attempt }}
 
     steps:
       - name: Git Clone - ${{ github.event.pull_request.head.ref }}
@@ -54,13 +54,10 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.merged && github.event.pull_request.base.ref || github.event.pull_request.head.ref }}
 
-      - name: Setup asdf cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.asdf
-          key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
-          restore-keys: |
-            ${{ runner.os }}-asdf-
+      - name: Setup environment
+        run: |
+          echo "${HOME}/.asdf/bin" >> $GITHUB_PATH
+          poetry install --no-root
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
diff --git a/.github/workflows/rollback-stack.yml b/.github/workflows/rollback-stack.yml
index 13793ac38..954abc18b 100644
--- a/.github/workflows/rollback-stack.yml
+++ b/.github/workflows/rollback-stack.yml
@@ -18,7 +18,7 @@ permissions:
 jobs:
   rollback-stack:
     name: Rollback to inactive stack for ${{ inputs.environment }}
-    runs-on: [self-hosted, ci]
+    runs-on: codebuild-nhsd-nrlf-ci-build-project-${{ github.run_id }}-${{ github.run_attempt }}
     environment: ${{ inputs.environment }}
 
     steps:
@@ -27,18 +27,10 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - name: Setup asdf cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.asdf
-          key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
-          restore-keys: |
-            ${{ runner.os }}-asdf-
-
-      - name: Install asdf
-        uses: asdf-vm/actions/install@v3.0.2
-        with:
-          asdf_branch: v0.13.1
+      - name: Setup environment
+        run: |
+          echo "${HOME}/.asdf/bin" >> $GITHUB_PATH
+          poetry install --no-root
 
       - name: Configure Management Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -47,14 +39,6 @@ jobs:
           role-to-assume: ${{ secrets.MGMT_ROLE_ARN }}
           role-session-name: github-actions-ci-${{ inputs.environment }}-${{ github.run_id}}
 
-      - name: Install zip
-        run: sudo apt-get install zip
-
-      - name: Setup Python environment
-        run: |
-          poetry install --no-root
-          source $(poetry env info --path)/bin/activate
-
       - name: Get current environment config
         run: |
           poetry run python ./scripts/get_env_config.py all ${{ inputs.environment }}
diff --git a/.github/workflows/update-lambda-permissions.yml b/.github/workflows/update-lambda-permissions.yml
index 55214220b..6a68e371f 100644
--- a/.github/workflows/update-lambda-permissions.yml
+++ b/.github/workflows/update-lambda-permissions.yml
@@ -29,7 +29,7 @@ permissions:
 jobs:
   check-versions:
     name: Check versions
-    runs-on: [self-hosted, ci]
+    runs-on: codebuild-nhsd-nrlf-ci-build-project-${{ github.run_id }}-${{ github.run_attempt }}
 
     steps:
       - name: Git clone - ${{ github.ref }}
@@ -37,26 +37,10 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - name: Setup asdf cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.asdf
-          key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
-          restore-keys: |
-            ${{ runner.os }}-asdf-
-
-      - name: Install asdf
-        uses: asdf-vm/actions/install@v3.0.2
-        with:
-          asdf_branch: v0.13.1
-
-      - name: Install zip
-        run: sudo apt-get install zip
-
-      - name: Setup Python environment
+      - name: Setup environment
         run: |
+          echo "${HOME}/.asdf/bin" >> $GITHUB_PATH
           poetry install --no-root
-          source $(poetry env info --path)/bin/activate
 
       - name: Configure Management Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -90,7 +74,7 @@ jobs:
 
   build-permissions:
     name: Build permissions
-    runs-on: [self-hosted, ci]
+    runs-on: codebuild-nhsd-nrlf-ci-build-project-${{ github.run_id }}-${{ github.run_attempt }}
     environment: ${{ inputs.environment }}
 
     needs: [check-versions]
@@ -101,26 +85,10 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - name: Setup asdf cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.asdf
-          key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
-          restore-keys: |
-            ${{ runner.os }}-asdf-
-
-      - name: Install asdf
-        uses: asdf-vm/actions/install@v3.0.2
-        with:
-          asdf_branch: v0.13.1
-
-      - name: Install zip
-        run: sudo apt-get install zip
-
-      - name: Setup Python environment
+      - name: Setup environment
         run: |
+          echo "${HOME}/.asdf/bin" >> $GITHUB_PATH
           poetry install --no-root
-          source $(poetry env info --path)/bin/activate
 
       - name: Configure Management Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -142,7 +110,7 @@ jobs:
 
   pull-deployed-lambdas:
     name: Pull deployed lambdas
-    runs-on: [self-hosted, ci]
+    runs-on: codebuild-nhsd-nrlf-ci-build-project-${{ github.run_id }}-${{ github.run_attempt }}
     environment: ${{ inputs.environment }}
 
     needs: [check-versions]
@@ -181,7 +149,7 @@ jobs:
 
   terraform-plan:
     name: Plan changes
-    runs-on: [self-hosted, ci]
+    runs-on: codebuild-nhsd-nrlf-ci-build-project-${{ github.run_id }}-${{ github.run_attempt }}
     environment: ${{ inputs.environment }}
 
     needs: [build-permissions, pull-deployed-lambdas]
@@ -192,26 +160,10 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - name: Setup asdf cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.asdf
-          key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
-          restore-keys: |
-            ${{ runner.os }}-asdf-
-
-      - name: Install asdf
-        uses: asdf-vm/actions/install@v3.0.2
-        with:
-          asdf_branch: v0.13.1
-
-      - name: Install zip
-        run: sudo apt-get install zip
-
-      - name: Setup Python environment
+      - name: Setup environment
         run: |
+          echo "${HOME}/.asdf/bin" >> $GITHUB_PATH
           poetry install --no-root
-          source $(poetry env info --path)/bin/activate
 
       - name: Restore pulled lambda artifacts
         uses: actions/cache/restore@v4
@@ -256,7 +208,7 @@ jobs:
 
   terraform-apply:
     name: Apply permissions
-    runs-on: [self-hosted, ci]
+    runs-on: codebuild-nhsd-nrlf-ci-build-project-${{ github.run_id }}-${{ github.run_attempt }}
     environment: ${{ inputs.environment }}
 
     needs: terraform-plan
@@ -267,6 +219,11 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
+      - name: Setup environment
+        run: |
+          echo "${HOME}/.asdf/bin" >> $GITHUB_PATH
+          poetry install --no-root
+
       - name: Restore pulled lambda artifacts
         uses: actions/cache/restore@v4
         with: