diff --git a/.github/workflows/branch-cleanup.yml b/.github/workflows/branch-cleanup.yml
new file mode 100644
index 000000000..0238630dc
--- /dev/null
+++ b/.github/workflows/branch-cleanup.yml
@@ -0,0 +1,11 @@
+name: branch-cleanup
+on:
+  pull_request:
+    branches:
+      - dev
+jobs:
+  cleanup-branch:
+    name: on pull request merge, delete the branch
+    runs-on: ubuntu-latest
+    steps:
+    - uses: jessfraz/branch-cleanup-action@master
\ No newline at end of file
diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml
deleted file mode 100644
index a86ab6686..000000000
--- a/.github/workflows/rebase.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-on:
-  issue_comment:
-    types: [created]
-name: Automatic Rebase
-jobs:
-  rebase:
-    name: Rebase
-    if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase')
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout the latest code
-      uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-    - name: Automatic Rebase
-      uses: cirrus-actions/rebase@1.3.1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file