diff --git a/renovate.json b/renovate.json
index 9b71c32a3..1c93bfadd 100644
--- a/renovate.json
+++ b/renovate.json
@@ -53,18 +53,6 @@
         "software.amazon.eventstream:*"
       ]
     },
-    {
-      "groupName": "jetty",
-      "matchPackageNames": [
-        "org.eclipse.jetty*"
-      ]
-    },
-    {
-      "groupName": "bouncycastle",
-      "matchPackageNames": [
-        "org.bouncycastle*"
-      ]
-    },
     {
       "groupName": "jersey",
       "matchPackageNames": [
@@ -75,7 +63,8 @@
     {
       "groupName": "pdfbox",
       "matchPackageNames": [
-        "*pdfbox*"
+        "org.apache.pdfbox:*",
+        "de.rototor.pdfbox:*"
       ]
     },
     {
@@ -84,25 +73,6 @@
         "com.sun.xml*"
       ]
     },
-    {
-      "groupName": "jackson",
-      "matchPackageNames": [
-        "com.fasterxml.jackson*"
-      ]
-    },
-    {
-      "groupName": "netty",
-      "matchPackageNames": [
-        "io.netty*",
-        "com.typesafe.netty*"
-      ]
-    },
-    {
-      "groupName": "log4j",
-      "matchPackageNames": [
-        "org.apache.logging.log4j*"
-      ]
-    },
     {
       "groupName": "apache-commons",
       "matchPackageNames": [
@@ -119,6 +89,13 @@
         "org.hamcrest:*",
         "junit:*"
       ]
+    },
+    {
+      "description": "Only offer Guava versions with the same flavor suffix (-jre or -android) as the current one; see https://docs.renovatebot.com/modules/versioning/regex/",
+      "matchPackageNames": [
+        "com.google.guava:guava"
+      ],
+      "versioning": "regex:^(?<major>\\d+)(\\.(?<minor>\\d+))?(\\.(?<patch>\\d+))?(-(?<compatibility>.*))?$"
     }
   ]
 }