diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index d6347d833..791078548 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -1,26 +1,18 @@
 name: ASF-auto-merge
 
 on:
-  check_suite:
-    types:
-      - completed
   pull_request:
-    types:
-      - edited
-      - labeled
-      - opened
-      - ready_for_review
-      - reopened
-      - synchronize
-      - unlabeled
-      - unlocked
 
 jobs:
   auto-merge:
     runs-on: ubuntu-latest
     steps:
-      - name: Auto-merge PR if deemed appropriate
-        uses: ridedott/merge-me-action@v1.6.7
+      - name: Checkout code
+        uses: actions/checkout@v2
         with:
-          GITHUB_TOKEN: ${{ secrets.ASF_GITHUB_PERSONAL_TOKEN }}
-          PRESET: DEPENDABOT_MINOR
+          submodules: recursive
+      - name: Auto-merge PR if deemed appropriate
+        uses: ahmadnassri/action-dependabot-auto-merge@v2
+        with:
+          github-token: ${{ secrets.ASF_GITHUB_PERSONAL_TOKEN }}
+          target: minor
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 35b524452..de7208f87 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -388,13 +388,3 @@ jobs:
         asset_path: out/ASF-win-x64.zip
         asset_name: ASF-win-x64.zip
         asset_content_type: application/zip
-  auto-merge:
-    needs:
-      - main
-    runs-on: ubuntu-latest
-    steps:
-      - name: Auto-merge PR if deemed appropriate
-        uses: ridedott/merge-me-action@v1.6.7
-        with:
-          GITHUB_TOKEN: ${{ secrets.ASF_GITHUB_PERSONAL_TOKEN }}
-          PRESET: DEPENDABOT_MINOR
diff --git a/ASF-ui b/ASF-ui
index b6e2c360b..dfb979a9e 160000
--- a/ASF-ui
+++ b/ASF-ui
@@ -1 +1 @@
-Subproject commit b6e2c360bc8c3553244f4f8f9e6ae4b026cbc9d6
+Subproject commit dfb979a9eee09c9ffc8ba9e8d1fee6e655685048