diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index bbd62ca..791a561 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,21 +1,27 @@
 version: 2
 updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-      day: "monday"
-      time: "04:00"
-      timezone: "Europe/Lisbon"
-    open-pull-requests-limit: 10
-    labels: ["deps","ci"]
   - package-ecosystem: "pip"
     directory: "/"
-    schedule:
-      interval: "weekly"
-      day: "monday"
-      time: "04:15"
-      timezone: "Europe/Lisbon"
-    open-pull-requests-limit: 10
-    labels: ["deps","python"]
-    versioning-strategy: increase-if-necessary
+    schedule: { interval: "weekly" }
+    open-pull-requests-limit: 2
+    groups:
+      python-dev:
+        patterns:
+          - "black"
+          - "ruff"
+          - "pytest*"
+          - "mypy*"
+      python-runtime:
+        patterns: ["*"]
+        exclude-patterns:
+          - "black"
+          - "ruff"
+          - "pytest*"
+          - "mypy*"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule: { interval: "weekly" }
+    open-pull-requests-limit: 2
+    groups:
+      gh-actions:
+        patterns: ["*"]
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..f16ba25
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,3 @@
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index db274e0..ff0cda5 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -18,3 +18,6 @@ jobs:
           config-name: release-drafter.yml
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
diff --git a/.github/workflows/semantic-pr.yml b/.github/workflows/semantic-pr.yml
index d6e1199..196e65a 100644
--- a/.github/workflows/semantic-pr.yml
+++ b/.github/workflows/semantic-pr.yml
@@ -28,3 +28,6 @@ jobs:
           requireScope: false
           subjectPattern: ^.+$
           wip: true
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true