diff --git a/base.json b/base.json
index f8dcf4d..d683499 100644
--- a/base.json
+++ b/base.json
@@ -16,16 +16,16 @@
   "packageRules": [
     {
       "description": "Automerge docs theme updates",
-      "datasources": ["github-releases"],
-      "packagePatterns": [
-        "^thegeeklab/hugo-(geekdoc|geekblog)"
-      ],
-      "updateTypes": ["minor", "patch"],
+      "matchDatasources": ["github-releases"],
+      "matchPackagePatterns": ["^thegeeklab/hugo-(geekdoc|geekblog)"],
+      "matchUpdateTypes": ["minor", "patch"],
       "automerge": true
     },
     {
-      "depTypeList": ["devDependencies", "dev-dependencies"],
-      "updateTypes": ["pin", "digest", "patch", "minor"],
+      "description": "Automerge dev dependencies",
+      "groupName": "devDependencies (non-major)",
+      "matchDepTypes": ["devDependencies", "dev-dependencies"],
+      "matchUpdateTypes": ["pin", "digest", "patch", "minor"],
       "automerge": true
     }
   ],
diff --git a/docker.json b/docker.json
index 6d81426..8a7df8f 100644
--- a/docker.json
+++ b/docker.json
@@ -5,18 +5,19 @@
   "packageRules": [
     {
       "description": "Automerge digest updates (usually security patches)",
-      "datasources": ["docker"],
-      "packagePatterns": [
+      "groupName": "docker digests",
+      "matchDatasources": ["docker"],
+      "matchPackagePatterns": [
         "^((amd64|arm32v7|arm64v8)/)?(python|alpine|node|docker)",
         "^thegeeklab/(alpine|nginx)"
       ],
-      "updateTypes": ["pin", "digest"],
+      "matchUpdateTypes": ["pin", "digest"],
       "automerge": true
     },
     {
       "description": "Disable digest pinning for Docker Compose (development only)",
-      "managers": ["docker-compose"],
-      "updateTypes": ["pin", "digest"],
+      "matchManagers": ["docker-compose"],
+      "matchUpdateTypes": ["pin", "digest"],
       "enabled": false
     }
   ],