diff --git a/.github/workflows/apply.yml b/.github/workflows/apply.yml
index b0e0c08..6d65479 100644
--- a/.github/workflows/apply.yml
+++ b/.github/workflows/apply.yml
@@ -98,10 +98,11 @@ jobs:
           ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
           HASH=$(printf '%s-%s' "$ACCOUNT_ID" "${{ inputs.aws_region }}" | sha1sum | cut -d' ' -f1)
           echo "S3_BUCKET=terraform-state-${HASH}" >> "$GITHUB_ENV"
+          echo "AWS_ACCOUNT_ID=${ACCOUNT_ID}" >> "$GITHUB_ENV"
 
       - name: Create drift plan
         run: |
-          jq -n --arg sha "${{ github.event.pull_request.head.sha || github.sha }}" '{sha: $sha, drift: false}' > /tmp/drift.plan.json
+          jq -n --arg sha "${{ github.event.pull_request.head.sha || github.sha }}" --arg account "$AWS_ACCOUNT_ID" '{sha: $sha, drift: false, aws_account_id: $account}' > /tmp/drift.plan.json
 
       - name: Upload drift plan to S3
         run: |
diff --git a/.github/workflows/detect-drift.yml b/.github/workflows/detect-drift.yml
index c40e34f..98d4f4e 100644
--- a/.github/workflows/detect-drift.yml
+++ b/.github/workflows/detect-drift.yml
@@ -115,12 +115,13 @@ jobs:
           ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
           HASH=$(printf '%s-%s' "$ACCOUNT_ID" "${{ inputs.aws_region }}" | sha1sum | cut -d' ' -f1)
           echo "S3_BUCKET=terraform-state-${HASH}" >> "$GITHUB_ENV"
+          echo "AWS_ACCOUNT_ID=${ACCOUNT_ID}" >> "$GITHUB_ENV"
 
       - name: Build drift plan
         run: |
           TIMESTAMP=$(date -u +%Y-%m-%dT%H:%M:%SZ)
-          jq -n --arg sha "${{ needs.fetch-baseline.outputs.sha }}" --arg drift "$TIMESTAMP" \
-            '{sha: $sha, drift: $drift}' > /tmp/drift.plan.json
+          jq -n --arg sha "${{ needs.fetch-baseline.outputs.sha }}" --arg drift "$TIMESTAMP" --arg account "$AWS_ACCOUNT_ID" \
+            '{sha: $sha, drift: $drift, aws_account_id: $account}' > /tmp/drift.plan.json
           echo "DRIFT_TIMESTAMP=${TIMESTAMP}" >> "$GITHUB_ENV"
 
       - name: Upload drift plan to S3