diff --git a/renovate.json b/renovate.json
index 51449912d..9c37dfb45 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,16 +1,15 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "config:recommended"
-  ],
-  "schedule": [
-    "before 6am on the first day of the month"
+    "config:recommended",
+    "schedule:monthly"
   ],
   "timezone": "America/New_York",
-  "minimumReleaseAge": "2 days",
+  "minimumReleaseAge": "14 days",
   "prConcurrentLimit": 10,
   "prHourlyLimit": 2,
   "automerge": false,
+  "rebaseWhen": "conflicted",
   "major": {
     "dependencyDashboardApproval": true
   },
@@ -38,14 +37,6 @@
         "docker"
       ]
     },
-    {
-      "description": "Catch-all: bundle minor/patch of ungrouped deps; majors stay individual. Listed BEFORE the named groups so a family's own minor/patch is overridden back into its family group (Renovate merges rules, last match wins for groupName).",
-      "matchUpdateTypes": [
-        "minor",
-        "patch"
-      ],
-      "groupName": "all-minor-and-patch"
-    },
     {
       "groupName": "aws-sdk",
       "matchPackageNames": [
@@ -59,6 +50,12 @@
         "org.eclipse.jetty*"
       ]
     },
+    {
+      "groupName": "bouncycastle",
+      "matchPackageNames": [
+        "org.bouncycastle*"
+      ]
+    },
     {
       "groupName": "jersey",
       "matchPackageNames": [
@@ -66,6 +63,18 @@
         "org.glassfish.hk2*"
       ]
     },
+    {
+      "groupName": "pdfbox",
+      "matchPackageNames": [
+        "*pdfbox*"
+      ]
+    },
+    {
+      "groupName": "sun-xml",
+      "matchPackageNames": [
+        "com.sun.xml*"
+      ]
+    },
     {
       "groupName": "jackson",
       "matchPackageNames": [