diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index ee88b773f..ac3a77fa3 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -3,15 +3,6 @@
 
 version: 2
 updates:
-  - package-ecosystem: "gradle"
-    directory: "/"
-    schedule:
-      interval: "daily"
-      timezone: "Europe/Zurich"
-    open-pull-requests-limit: 13
-    ignore:
-      - dependency-name: "org.eclipse.persistence:eclipselink"
-      - dependency-name: "org.eclipse.persistence:org.eclipse.persistence.jpa"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
diff --git a/renovate.json b/renovate.json
index 958b385bd..3bdf82752 100644
--- a/renovate.json
+++ b/renovate.json
@@ -8,15 +8,28 @@
   "labels": ["renovate"],
   "packageRules": [{
     "description": "Limit the aws sdk to monthly updates because otherwise it PRs every day",
-    "packageNames": ["com.amazonaws:aws-java-sdk-s3"],
+    "packageNames": ["com.amazonaws:*"],
     "schedule": ["monthly"]
+  },
+  {
+    "matchPackageNames": ["org.eclipse.persistence:eclipselink"],
+    "allowedVersions": "<=2.7.10"
+  },
+  {
+    "matchPackageNames": ["org.eclipse.persistence:org.eclipse.persistence.jpa"],
+    "allowedVersions": "<=2.7.10"
+  },
+  {
+    "depTypeList": ["dependencies"],
+    "updateTypes": ["patch", "minor", "major"],
+    "groupName": "all"
   }],
   "regexManagers": [
     {
-      "fileMatch": ["\\.gradle(\\.kts)?$"],
+      "fileMatch": ["^build\\.gradle$"],
       "matchStrings": ["[\\s\\n{](mavenBom)\\s*['\"](?<depName>[a-zA-Z][-_a-zA-Z0-9.]*?:[a-zA-Z][-_a-zA-Z0-9.]*?):(?<currentValue>[a-zA-Z0-9][-.a-zA-Z0-9]*?)['\"]"],
       "datasourceTemplate": "maven",
       "versioningTemplate": "gradle"
     }
   ]
-}
+}
\ No newline at end of file