diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index e0b7eaa3..6bfa91b0 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -8,8 +8,10 @@ updates:
   - package-ecosystem: 'github-actions' # See documentation for possible values
     directory: '/' # Location of package manifests
     schedule:
-      interval: 'daily'
+      interval: 'weekly'
   - package-ecosystem: "npm" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"
+    # Disable rebasing for npm pull requests
+    rebase-strategy: "disabled"
diff --git a/.mergify.yml b/.mergify.yml
index 9b1db20b..14c52541 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,16 +1,31 @@
 pull_request_rules:
-  - name: Automatic merge for trusted authors and dependabot
+  #- name: Automatic merge for trusted authors and dependabot
+  #  conditions:
+  #    - or:
+        #  - author=mtdvlpr
+        #  - author=sircharlo
+  #        - and:
+  #            - author=dependabot[bot]
+ #             - or:
+  #               - title~=^Bump [^\s]+ from ([\d]+)\..+ to \1\.
+  #               - title~=^chore\(deps\). bump [^\s]+ from ([\d]+)\..+ to \1\.
+  #               - title~=^chore\(deps-dev\). bump [^\s]+ from ([\d]+)\..+ to \1\.
+  #  actions:
+  #    update:
+  #    merge:
+ #       method: squash
+  - name: Automatically merge Dependabot PRs
     conditions:
-      - or:
-          - author=mtdvlpr
-          - author=sircharlo
-          - and:
-              - author=dependabot[bot]
-              - or:
-                 - title~=^Bump [^\s]+ from ([\d]+)\..+ to \1\.
-                 - title~=^chore\(deps\). bump [^\s]+ from ([\d]+)\..+ to \1\.
-                 - title~=^chore\(deps-dev\). bump [^\s]+ from ([\d]+)\..+ to \1\.
+      - author = dependabot[bot]
     actions:
-      update:
-      merge:
-        method: squash
\ No newline at end of file
+      #merge:
+      queue:
+
+queue_rules:
+  # If you have other queues defined, add this at the end so it is processed last
+  - name: dep-update
+    batch_size: 10
+    # Wait for up to 30 minutes for the batch to fill up
+    batch_max_wait_time: 30 min
+    queue_conditions:
+      - author = dependabot[bot]