diff --git a/.github/actions/cleanup-deployments/action.yml b/.github/actions/cleanup-deployments/action.yml
new file mode 100644
index 00000000000..25b53e22de7
--- /dev/null
+++ b/.github/actions/cleanup-deployments/action.yml
@@ -0,0 +1,40 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0 OR ISC
+
+name: 'cleanup-deployments'
+description: 'Removes deployment entries from the PR timeline created by environment-gated jobs. Marks each deployment as inactive then deletes it. Does not affect CI check results.'
+runs:
+  using: 'composite'
+  steps:
+    - uses: actions/github-script@v8
+      if: github.event_name == 'pull_request_target'
+      with:
+        script: |
+          const sha = context.payload.pull_request?.head?.sha || context.sha;
+          for (const env of ['auto-approve']) {
+            const deployments = await github.rest.repos.listDeployments({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              environment: env,
+              sha: sha,
+              per_page: 100,
+            });
+            console.log(`Found ${deployments.data.length} deployments for ${env} (sha: ${sha})`);
+            for (const d of deployments.data) {
+              try {
+                await github.rest.repos.createDeploymentStatus({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  deployment_id: d.id,
+                  state: 'inactive',
+                });
+                await github.rest.repos.deleteDeployment({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  deployment_id: d.id,
+                });
+              } catch (e) {
+                console.log(`Failed to delete deployment ${d.id}: ${e.message}`);
+              }
+            }
+          }
diff --git a/.github/workflows/android-omnibus.yml b/.github/workflows/android-omnibus.yml
index ae252ab78cd..306c866a5da 100644
--- a/.github/workflows/android-omnibus.yml
+++ b/.github/workflows/android-omnibus.yml
@@ -16,6 +16,7 @@ env:
 permissions:
   id-token: write
   contents: read
+  deployments: write
 
 jobs:
   authorization-check:
@@ -76,3 +77,14 @@ jobs:
             --release ${{ matrix.release }} \
             --shared ${{ matrix.shared }} \
             --action start-job
+
+
+  cleanup-deployments:
+    if: always()
+    needs: [device-farm]
+    runs-on: ubuntu-latest
+    permissions:
+      deployments: write
+    steps:
+      - uses: actions/checkout@v5
+      - uses: ./.github/actions/cleanup-deployments
diff --git a/.github/workflows/image-build-android.yml b/.github/workflows/image-build-android.yml
index ea8460a4cd5..b6bbeb67bfc 100644
--- a/.github/workflows/image-build-android.yml
+++ b/.github/workflows/image-build-android.yml
@@ -31,6 +31,7 @@ env:
 permissions:
   id-token: write
   contents: read
+  deployments: write
 
 jobs:
   authorization-check:
@@ -123,3 +124,14 @@ jobs:
       - name: Push Images
         run: |
           docker push ${{ steps.images.outputs.latest }}
+
+
+  cleanup-deployments:
+    if: always()
+    needs: [build, push]
+    runs-on: ubuntu-latest
+    permissions:
+      deployments: write
+    steps:
+      - uses: actions/checkout@v5
+      - uses: ./.github/actions/cleanup-deployments
diff --git a/.github/workflows/security-review.yml b/.github/workflows/security-review.yml
index 394750138b1..4187bf703b1 100644
--- a/.github/workflows/security-review.yml
+++ b/.github/workflows/security-review.yml
@@ -8,6 +8,7 @@ concurrency:
   cancel-in-progress: true
 permissions:
   contents: read
+  deployments: write
 
 jobs:
   authorize:
@@ -82,3 +83,13 @@ jobs:
             -H "Authorization: token ${GH_TOKEN}" \
             "${STATUS_URL}" \
             -d "{\"state\":\"${STATE}\",\"context\":\"security-review / report\",\"target_url\":\"${REPORT_URL}\"}"
+
+  cleanup-deployments:
+    if: always()
+    needs: [execute]
+    runs-on: ubuntu-latest
+    permissions:
+      deployments: write
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/cleanup-deployments