diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 7a35e2b99..28ba12fcc 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -21,6 +21,7 @@ jobs:
           trunk-token: ${{ secrets.TRUNK_TOKEN }}
 
   trunk_upgrade:
+    # See: https://github.com/trunk-io/trunk-action/blob/v1/readme.md#automatic-upgrades
     name: Trunk Upgrade (PR)
     runs-on: ubuntu-latest
     permissions:
@@ -30,6 +31,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      # See https://github.com/trunk-io/trunk-action/blob/v1/readme.md#automatic-upgrades
       - name: Trunk Upgrade
         uses: trunk-io/trunk-action/upgrade@v1
+        with:
+          base: master
diff --git a/.github/workflows/trunk_annotate.pr.yml b/.github/workflows/trunk_annotate_pr.yml
similarity index 100%
rename from .github/workflows/trunk_annotate.pr.yml
rename to .github/workflows/trunk_annotate_pr.yml
diff --git a/.github/workflows/trunk_check.yml b/.github/workflows/trunk_check.yml
index 6ed905bc8..2e74ab25f 100644
--- a/.github/workflows/trunk_check.yml
+++ b/.github/workflows/trunk_check.yml
@@ -20,3 +20,5 @@ jobs:
 
       - name: Trunk Check
         uses: trunk-io/trunk-action@v1
+        with:
+          save-annotations: true
diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
index f2393592c..12b8608f2 100644
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -1,37 +1,35 @@
 version: 0.1
 cli:
-  version: 1.22.8
+  version: 1.22.10
 plugins:
   sources:
     - id: trunk
-      ref: v1.6.6
+      ref: v1.6.7
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
-    - prettier@3.4.2
-    - trufflehog@3.86.1
+    - prettier@3.5.1
+    - trufflehog@3.88.10
     - yamllint@1.35.1
-    - bandit@1.8.0
-    - checkov@3.2.334
+    - bandit@1.8.3
+    - checkov@3.2.372
     - terrascan@1.19.9
-    - trivy@0.58.0
-    #- trufflehog@3.63.2-rc0
+    - trivy@0.59.1
     - taplo@0.9.3
-    - ruff@0.8.3
-    - isort@5.13.2
-    - markdownlint@0.43.0
-    - oxipng@9.1.3
+    - ruff@0.9.6
+    - isort@6.0.0
+    - markdownlint@0.44.0
+    - oxipng@9.1.4
     - svgo@3.3.2
-    - actionlint@1.7.4
-    - flake8@7.1.1
+    - actionlint@1.7.7
+    - flake8@7.1.2
     - hadolint@2.12.1-beta
     - shfmt@3.6.0
     - shellcheck@0.10.0
-    - black@24.10.0
+    - black@25.1.0
     - git-diff-check
-    - gitleaks@8.21.2
+    - gitleaks@8.23.3
     - clang-format@16.0.3
-    #- prettier@3.3.3
   ignore:
     - linters: [ALL]
       paths: