diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml
index e5a14bd4e..e0dd37721 100644
--- a/.github/workflows/auto-approve.yml
+++ b/.github/workflows/auto-approve.yml
@@ -7,7 +7,7 @@ jobs:
   auto-approve:
     runs-on: ubuntu-20.04
     steps:
-      - uses: hmarr/auto-approve-action@v2.0.0
+      - uses: hmarr/auto-approve-action@v3.1.0
         if: github.actor == 'scala-steward'
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.mergify.yml b/.mergify.yml
index 19844db16..6d0c207d8 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -4,15 +4,21 @@ pull_request_rules:
       - author=scala-steward
     actions:
       assign:
-        users: [iravid]
+        users: ["@zio/zio-kafka"]
       label:
-        add: [dependency-update]
-
+        add: ["type: dependencies"]
+  - name: label scala-steward's breaking PRs
+    conditions:
+      - author=scala-steward
+      - "body~=(labels: library-update, semver-major)|(labels: sbt-plugin-update, semver-major)"
+    actions:
+      label:
+        add: ["type: breaking"]
   - name: merge Scala Steward's PRs
     conditions:
       - base=master
       - author=scala-steward
-      - "body~=(labels: library-update, semver-minor)|(labels: library-update, semver-patch)|(labels: sbt-plugin-update, semver-minor)|(labels: sbt-plugin-update, semver-patch)|(labels: scalafix-rule-update, semver-minor)|(labels: scalafix-rule-update, semver-patch)|(labels: test-library-update, semver-minor)|(labels: test-library-update, semver-patch)"
+      - "body~=(labels: library-update, semver-minor)|(labels: library-update, semver-patch)|(labels: sbt-plugin-update, semver-minor)|(labels: sbt-plugin-update, semver-patch)|(labels: scalafix-rule-update)|(labels: test-library-update)"
       - "status-success=license/cla"
       - "status-success=lint"
       - "status-success=test (8, 2.12.15)"