diff --git a/examples/snippets/.github/workflows/atmos-components-updater.yml b/examples/snippets/.github/workflows/atmos-components-updater.yml
index 89f54cae5..fd0b03a15 100644
--- a/examples/snippets/.github/workflows/atmos-components-updater.yml
+++ b/examples/snippets/.github/workflows/atmos-components-updater.yml
@@ -9,7 +9,9 @@ on:
 jobs:
   update:
     environment: atmos
-    runs-on: ["self-hosted", "default"]
+    runs-on:
+      - self-hosted
+      - terraform
     steps:
       - name: "Checkout source code at current commit"
         uses: actions/checkout@v4
diff --git a/examples/snippets/.github/workflows/atmos-terraform-apply-matrix.yaml b/examples/snippets/.github/workflows/atmos-terraform-apply-matrix.yaml
index 888e1836d..8748c7271 100644
--- a/examples/snippets/.github/workflows/atmos-terraform-apply-matrix.yaml
+++ b/examples/snippets/.github/workflows/atmos-terraform-apply-matrix.yaml
@@ -31,7 +31,9 @@ jobs:
   atmos-apply:
     if: ${{ inputs.stacks != '{include:[]}' }}
     name: ${{ matrix.stack_slug }}
-    runs-on: ["self-hosted", "terraform"]
+    runs-on: 
+      - self-hosted
+      - terraform
     strategy:
       max-parallel: 10
       fail-fast: false # Don't fail fast to avoid locking TF State
diff --git a/examples/snippets/.github/workflows/atmos-terraform-apply.yaml b/examples/snippets/.github/workflows/atmos-terraform-apply.yaml
index 3132a922f..fb2d6ed3d 100644
--- a/examples/snippets/.github/workflows/atmos-terraform-apply.yaml
+++ b/examples/snippets/.github/workflows/atmos-terraform-apply.yaml
@@ -34,7 +34,9 @@ jobs:
     name: Determine Affected Stacks
     if: needs.pr.outputs.no-apply == 'false'
     needs: ["pr"]
-    runs-on: ["self-hosted", "terraform"]
+    runs-on: 
+      - self-hosted
+      - terraform
     steps:
       - id: affected
         uses: cloudposse/github-action-atmos-affected-stacks@v4
diff --git a/examples/snippets/.github/workflows/atmos-terraform-dispatch.yaml b/examples/snippets/.github/workflows/atmos-terraform-dispatch.yaml
index f36c3d30e..1b1831946 100644
--- a/examples/snippets/.github/workflows/atmos-terraform-dispatch.yaml
+++ b/examples/snippets/.github/workflows/atmos-terraform-dispatch.yaml
@@ -28,7 +28,9 @@ permissions:
 
 jobs:
   dispatch-id:
-    runs-on: ["self-hosted", "terraform"]
+    runs-on: 
+      - self-hosted
+      - terraform
     steps:
       - name: echo Distinct ID ${{ github.event.inputs.distinct_id }}
         run: echo ${{ github.event.inputs.distinct_id }}
diff --git a/examples/snippets/.github/workflows/atmos-terraform-drift-detection.yaml b/examples/snippets/.github/workflows/atmos-terraform-drift-detection.yaml
index 0f6ccb51b..0a630491e 100644
--- a/examples/snippets/.github/workflows/atmos-terraform-drift-detection.yaml
+++ b/examples/snippets/.github/workflows/atmos-terraform-drift-detection.yaml
@@ -17,7 +17,9 @@ permissions:
 jobs:
   select-components:
     name: Select Components
-    runs-on: ["self-hosted", "terraform"]
+    runs-on: 
+      - self-hosted
+      - terraform
     steps:
       - name: Selected Components
         id: components
@@ -52,7 +54,7 @@ jobs:
     needs: ["plan-atmos-components"]
     if: always()
     name: Reconcile issues
-    runs-on: ["self-hosted", "terraform"]
+    runs-on: ['self-hosted', 'terraform']
     steps:
       - name: Drift Detection
         uses: cloudposse/github-action-atmos-terraform-drift-detection@v2
diff --git a/examples/snippets/.github/workflows/atmos-terraform-drift-remediation.yaml b/examples/snippets/.github/workflows/atmos-terraform-drift-remediation.yaml
index 7f6c6b441..e7599a8bb 100644
--- a/examples/snippets/.github/workflows/atmos-terraform-drift-remediation.yaml
+++ b/examples/snippets/.github/workflows/atmos-terraform-drift-remediation.yaml
@@ -16,7 +16,9 @@ jobs:
   remediate-drift:
     if: github.event.action == 'labeled' && contains(github.event.issue.labels.*.name, 'apply')
     name: Remediate Drift
-    runs-on: ["self-hosted", "terraform"]
+    runs-on: 
+      - self-hosted
+      - terraform
     steps:
       - uses: unfor19/install-aws-cli-action@v1
       - name: Remediate Drift
@@ -35,7 +37,7 @@ jobs:
       ) &&
       !contains(github.event.issue.labels.*.name, 'remediated')
     name: Discard Drift
-    runs-on: ["self-hosted", "terraform"]
+    runs-on: ['self-hosted', 'terraform']
     steps:
       - name: Discard Drift
         uses: cloudposse/github-action-atmos-terraform-drift-remediation@v2
diff --git a/examples/snippets/.github/workflows/atmos-terraform-plan-matrix.yaml b/examples/snippets/.github/workflows/atmos-terraform-plan-matrix.yaml
index 2a92373d8..9feac7e3f 100644
--- a/examples/snippets/.github/workflows/atmos-terraform-plan-matrix.yaml
+++ b/examples/snippets/.github/workflows/atmos-terraform-plan-matrix.yaml
@@ -41,7 +41,9 @@ jobs:
   atmos-plan:
     if: ${{ inputs.stacks != '{include:[]}' }}
     name: ${{ matrix.stack_slug }}
-    runs-on: ["self-hosted", "terraform"]
+    runs-on: 
+      - self-hosted
+      - terraform
     continue-on-error: ${{ inputs.continue-on-error == 'true' }}
     strategy:
       max-parallel: 10
diff --git a/examples/snippets/.github/workflows/atmos-terraform-plan.yaml b/examples/snippets/.github/workflows/atmos-terraform-plan.yaml
index 157bed37c..dc8379e73 100644
--- a/examples/snippets/.github/workflows/atmos-terraform-plan.yaml
+++ b/examples/snippets/.github/workflows/atmos-terraform-plan.yaml
@@ -18,7 +18,9 @@ jobs:
   atmos-affected:
     if: ${{ !contains( github.event.pull_request.labels.*.name, 'no-plan') }}
     name: Determine Affected Stacks
-    runs-on: ["self-hosted", "terraform"]
+    runs-on: 
+      - self-hosted
+      - terraform
     steps:
       - id: affected
         uses: cloudposse/github-action-atmos-affected-stacks@v4
diff --git a/examples/snippets/stacks/workflows/identity.yaml b/examples/snippets/stacks/workflows/identity.yaml
index 5de3b3b6c..e401c6154 100644
--- a/examples/snippets/stacks/workflows/identity.yaml
+++ b/examples/snippets/stacks/workflows/identity.yaml
@@ -49,6 +49,7 @@ workflows:
         type: shell
         command: |-
           set -e
+          : "${ATMOS_BASE_PATH:=.}"
           AWS_CONFIG_VERSION="1.227.0"
           printf "Updating AWS Config in $ATMOS_BASE_PATH/rootfs/usr/local/bin/aws-config\n"
           printf "Note: Rebuild Geodesic to apply script updates\n"