diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 1cb1fd8e9..46578ad6f 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v7
 
       - name: Trunk Check
-        uses: trunk-io/trunk-action@v1
+        uses: trunk-io/trunk-action@v2.0.0
         with:
           trunk-token: ${{ secrets.TRUNK_TOKEN }}
 
@@ -34,6 +34,6 @@ jobs:
         uses: actions/checkout@v7
 
       - name: Trunk Upgrade
-        uses: trunk-io/trunk-action/upgrade@v1
+        uses: trunk-io/trunk-action/upgrade@v2.0.0
         with:
           base: develop
diff --git a/.github/workflows/trunk_annotate_pr.yml b/.github/workflows/trunk_annotate_pr.yml
deleted file mode 100644
index 4bfe27d63..000000000
--- a/.github/workflows/trunk_annotate_pr.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Annotate PR with trunk issues
-# See: https://github.com/trunk-io/trunk-action/blob/v1/readme.md#getting-inline-annotations-for-fork-prs
-
-on:
-  workflow_run:
-    workflows: [Pull Request] # Name from `trunk_check.yml`
-    types: [completed]
-
-permissions: read-all
-
-jobs:
-  trunk_check:
-    name: Trunk Code Quality Annotate
-    runs-on: ubuntu-24.04
-    permissions:
-      checks: write # For trunk to post annotations
-      contents: read # For repo checkout
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v7
-
-      - name: Trunk Check
-        uses: trunk-io/trunk-action@v1
-        with:
-          post-annotations: true
-          cache: false
diff --git a/.github/workflows/trunk_check.yml b/.github/workflows/trunk_check.yml
index 278e8db61..d2b6d704b 100644
--- a/.github/workflows/trunk_check.yml
+++ b/.github/workflows/trunk_check.yml
@@ -11,7 +11,6 @@ jobs:
     name: Trunk Check Runner
     runs-on: ubuntu-24.04
     permissions:
-      checks: write # For trunk to post annotations
       contents: read # For repo checkout
 
     steps:
@@ -19,7 +18,6 @@ jobs:
         uses: actions/checkout@v7
 
       - name: Trunk Check
-        uses: trunk-io/trunk-action@v1
+        uses: trunk-io/trunk-action@v2.0.0
         with:
-          save-annotations: true
           cache: false