diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml
deleted file mode 100644
index f3d297286e..0000000000
--- a/.github/workflows/cleanup.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: cleanup-workflow
-
-on:
-  workflow_run:
-    workflows:
-      - "build"
-    types: ["requested"]
-
-jobs:
-  cancel-duplicated-workflow:
-    name: "Cancel duplicated workflow"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: potiuk/cancel-workflow-runs@953e057dc81d3458935a18d1184c386b0f6b5738 # tested
-        name: "Cancel duplicate workflows"
-        with:
-          cancelMode: allDuplicates
-          token: ${{ secrets.GITHUB_TOKEN }}
-          sourceRunId: ${{ github.event.workflow_run.id }}
-          skipEventTypes: '["schedule"]'
diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml
index 48982a3809..7e69e9995f 100644
--- a/.github/workflows/pythonapp.yml
+++ b/.github/workflows/pythonapp.yml
@@ -9,6 +9,11 @@ on:
       - releasing/*
   pull_request:
 
+concurrency:
+  # automatically cancel the previously triggered workflows when there's a newer version
+  group: build-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   # caching of these jobs:
   #   - docker-py3-pip- (shared)
diff --git a/.github/workflows/setupapp.yml b/.github/workflows/setupapp.yml
index 5c011a3af1..a575ec3ad6 100644
--- a/.github/workflows/setupapp.yml
+++ b/.github/workflows/setupapp.yml
@@ -8,6 +8,11 @@ on:
       - main
       - releasing/*
 
+concurrency:
+  # automatically cancel the previously triggered workflows when there's a newer version
+  group: deploy-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   # caching of these jobs:
   #   - docker-py3-pip- (shared)