diff --git a/.github/workflows/test_packages.yml b/.github/workflows/test_packages.yml
index 29c2511dc6..2cc8178274 100644
--- a/.github/workflows/test_packages.yml
+++ b/.github/workflows/test_packages.yml
@@ -7,21 +7,17 @@ on:
   schedule:
     - cron:  '0 23 * * *'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 defaults:
   run:
     shell: bash
 
 
 jobs:
-  cleanup-runs:
-    if: ${{ contains(github.event.pull_request.labels.*.name, 'test packages') || github.event_name == 'schedule' }}
-    runs-on: ubuntu-latest
-    steps:
-    - uses: rokroskar/workflow-run-cleanup-action@master
-      env:
-        GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
   test-wheel:
-    needs: cleanup-runs
     if: ${{ contains(github.event.pull_request.labels.*.name, 'test packages') || github.event_name == 'schedule' }}
     strategy:
       matrix:
@@ -70,7 +66,6 @@ jobs:
         pip install opendr-toolkit
         python -m unittest discover -s tests/sources/tools/${{ matrix.package }}
   test-docker:
-    needs: cleanup-runs
     if: ${{ contains(github.event.pull_request.labels.*.name, 'test packages') || github.event_name == 'schedule' }}
     strategy:
       matrix:
diff --git a/.github/workflows/tests_suite.yml b/.github/workflows/tests_suite.yml
index 1a4e252b04..42a98f1b37 100644
--- a/.github/workflows/tests_suite.yml
+++ b/.github/workflows/tests_suite.yml
@@ -6,20 +6,16 @@ on:
   schedule:
     - cron:  '0 23 * * *'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 defaults:
   run:
     shell: bash
 
 jobs:
-  cleanup-runs:
-    if: ${{ contains(github.event.pull_request.labels.*.name, 'test sources') || contains(github.event.pull_request.labels.*.name, 'test tools') || contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
-    runs-on: ubuntu-latest
-    steps:
-    - uses: rokroskar/workflow-run-cleanup-action@master
-      env:
-        GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
   test-sources:
-    needs: cleanup-runs
     if: ${{ contains(github.event.pull_request.labels.*.name, 'test sources') || github.event_name == 'schedule' }}
     strategy:
       matrix:
@@ -51,7 +47,6 @@ jobs:
         pip install -r tests/requirements.txt
         python -m unittest discover -s tests
   test-tools:
-    needs: cleanup-runs
     if: ${{ contains(github.event.pull_request.labels.*.name, 'test tools') || github.event_name == 'schedule' }}
     strategy:
       matrix:
@@ -115,7 +110,6 @@ jobs:
             python -m unittest discover -s tests/sources/tools/${{ matrix.package }}
         fi
   build-wheel:
-    needs: cleanup-runs
     if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
     runs-on: ubuntu-20.04
     steps:
@@ -140,7 +134,6 @@ jobs:
         path:
           dist/*.tar.gz
   build-docker:
-    needs: cleanup-runs
     if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
     runs-on: ubuntu-20.04
     steps:
diff --git a/.github/workflows/tests_suite_develop.yml b/.github/workflows/tests_suite_develop.yml
index 8b31814924..3a6fe8dada 100644
--- a/.github/workflows/tests_suite_develop.yml
+++ b/.github/workflows/tests_suite_develop.yml
@@ -6,20 +6,16 @@ on:
   schedule:
     - cron:  '0 23 * * *'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 defaults:
   run:
     shell: bash
 
 jobs:
-  cleanup-runs:
-    if: ${{ contains(github.event.pull_request.labels.*.name, 'test sources') || contains(github.event.pull_request.labels.*.name, 'test tools') || contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
-    runs-on: ubuntu-latest
-    steps:
-    - uses: rokroskar/workflow-run-cleanup-action@master
-      env:
-        GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
   test-sources:
-    needs: cleanup-runs
     if: ${{ contains(github.event.pull_request.labels.*.name, 'test sources') || github.event_name == 'schedule' }}
     strategy:
       matrix:
@@ -52,7 +48,6 @@ jobs:
         pip install -r tests/requirements.txt
         python -m unittest discover -s tests
   test-tools:
-    needs: cleanup-runs
     if: ${{ contains(github.event.pull_request.labels.*.name, 'test tools') || github.event_name == 'schedule' }}
     strategy:
       matrix:
@@ -117,7 +112,6 @@ jobs:
             python -m unittest discover -s tests/sources/tools/${{ matrix.package }}
         fi
   build-wheel:
-    needs: cleanup-runs
     if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
     runs-on: ubuntu-20.04
     steps:
@@ -143,7 +137,6 @@ jobs:
         path:
           dist/*.tar.gz
   build-docker:
-    needs: cleanup-runs
     if: ${{ contains(github.event.pull_request.labels.*.name, 'test release') || github.event_name == 'schedule' }}
     runs-on: ubuntu-20.04
     steps:
@@ -382,4 +375,4 @@ jobs:
     - name: Delete wheel artifacts
       uses: geekyeggo/delete-artifact@v1
       with:
-        name: wheel-artifact
\ No newline at end of file
+        name: wheel-artifact