diff --git a/renovate.json b/renovate.json
index 51449912d..83a5345e9 100644
--- a/renovate.json
+++ b/renovate.json
@@ -4,13 +4,14 @@
     "config:recommended"
   ],
   "schedule": [
-    "before 6am on the first day of the month"
+    "monthly"
   ],
   "timezone": "America/New_York",
-  "minimumReleaseAge": "2 days",
+  "minimumReleaseAge": "14 days",
   "prConcurrentLimit": 10,
   "prHourlyLimit": 2,
   "automerge": false,
+  "rebaseWhen": "conflicted",
   "major": {
     "dependencyDashboardApproval": true
   },
@@ -38,14 +39,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": [
@@ -56,33 +49,51 @@
     {
       "groupName": "jetty",
       "matchPackageNames": [
-        "org.eclipse.jetty*"
+        "org.eclipse.jetty:*"
+      ]
+    },
+    {
+      "groupName": "bouncycastle",
+      "matchPackageNames": [
+        "org.bouncycastle:*"
       ]
     },
     {
       "groupName": "jersey",
       "matchPackageNames": [
-        "org.glassfish.jersey*",
-        "org.glassfish.hk2*"
+        "org.glassfish.jersey:*",
+        "org.glassfish.hk2:*"
+      ]
+    },
+    {
+      "groupName": "pdfbox",
+      "matchPackageNames": [
+        "*pdfbox*"
+      ]
+    },
+    {
+      "groupName": "sun-xml",
+      "matchPackageNames": [
+        "com.sun.xml:*"
       ]
     },
     {
       "groupName": "jackson",
       "matchPackageNames": [
-        "com.fasterxml.jackson*"
+        "com.fasterxml.jackson:*"
       ]
     },
     {
       "groupName": "netty",
       "matchPackageNames": [
-        "io.netty*",
-        "com.typesafe.netty*"
+        "io.netty:*",
+        "com.typesafe.netty:*"
       ]
     },
     {
       "groupName": "log4j",
       "matchPackageNames": [
-        "org.apache.logging.log4j*"
+        "org.apache.logging.log4j:*"
       ]
     },
     {
@@ -95,8 +106,8 @@
     {
       "groupName": "test-tooling",
       "matchPackageNames": [
-        "org.mockito*",
-        "net.bytebuddy*",
+        "org.mockito:*",
+        "net.bytebuddy:*",
         "org.objenesis:*",
         "org.hamcrest:*",
         "junit:*"