diff --git a/.dependabot/config.yml b/.dependabot/config.yml
deleted file mode 100644
index bf80d72ab92..00000000000
--- a/.dependabot/config.yml
+++ /dev/null
@@ -1,160 +0,0 @@
-# See https://github.com/dependabot/feedback/issues/70 for current (beta) configurability
-version: 1
-update_configs:
-  - package_manager: "java:gradle"
-    directory: "/core"
-    update_schedule: "weekly"
-
-# Explicit entry for each module
-  - package_manager: "java:gradle"
-    directory: "/modules/cassandra"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/clickhouse"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/couchbase"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/database-commons"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/dynalite"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/elasticsearch"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/influxdb"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/jdbc"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/jdbc-test"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/junit-jupiter"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/kafka"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/localstack"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/mariadb"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/mockserver"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/mssqlserver"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/mysql"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/neo4j"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/nginx"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/oracle-xe"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/postgresql"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/pulsar"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/selenium"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/spock"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-  - package_manager: "java:gradle"
-    directory: "/modules/vault"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
-
-# Examples
-  - package_manager: "java:gradle"
-    directory: "/examples"
-    update_schedule: "weekly"
-    automerged_updates:
-      - match: { dependency_type: "development", update_type: "semver:minor" }
-      - match: { dependency_type: "production", update_type: "semver:minor" }
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000000..8abda8d8c5a
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,136 @@
+version: 2
+updates:
+  - package-ecosystem: "gradle"
+    directory: "/core"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+
+# Explicit entry for each module
+  - package-ecosystem: "gradle"
+    directory: "/modules/cassandra"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/clickhouse"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/couchbase"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/database-commons"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/dynalite"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/elasticsearch"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/influxdb"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/jdbc"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/jdbc-test"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/junit-jupiter"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/kafka"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/localstack"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/mariadb"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/mockserver"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/mssqlserver"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/mysql"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/neo4j"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/nginx"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/oracle-xe"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/postgresql"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/pulsar"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/selenium"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/spock"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/vault"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+
+# Examples
+  - package-ecosystem: "gradle"
+    directory: "/examples"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10