diff --git a/lib/config/presets/internal/group.ts b/lib/config/presets/internal/group.ts
index 97898bab9ddbc5..5b928774c8f762 100644
--- a/lib/config/presets/internal/group.ts
+++ b/lib/config/presets/internal/group.ts
@@ -339,9 +339,8 @@ const staticGroups = {
       {
         commitMessageTopic: 'Node.js',
         matchDatasources: ['docker'],
-        matchDepNames: ['node'],
         matchPackageNames: [
-          '//node$/', // Ends with "node"
+          '/(^/)node$/', // node or ends with "/node, except those below"
           '!calico/node',
           '!docker.io/calico/node',
           '!kindest/node',
@@ -579,6 +578,9 @@ const staticGroups = {
       {
         groupName: 'spring boot',
         matchDepNames: ['org.springframework.boot'],
+      },
+      {
+        groupName: 'spring boot',
         matchPackageNames: ['org.springframework.boot:**'],
       },
     ],
diff --git a/lib/data/replacements.json b/lib/data/replacements.json
index f40b50a75e5bb8..4b3f9da189aae2 100644
--- a/lib/data/replacements.json
+++ b/lib/data/replacements.json
@@ -169,8 +169,10 @@
         "description": "Replace `renovate` `slim` docker tag with `latest`.",
         "matchCurrentValue": "/^slim$/",
         "matchDatasources": ["docker"],
-        "matchPackageNames": ["ghcr.io/renovatebot/renovate"],
-        "matchPackageNames": ["/^(?:docker\\.io/)?renovate/renovate$/"],
+        "matchPackageNames": [
+          "ghcr.io/renovatebot/renovate",
+          "/^(?:docker\\.io/)?renovate/renovate$/"
+        ],
         "replacementVersion": "latest"
       },
       {
@@ -178,8 +180,10 @@
         "extractVersion": "^(?<version>.+)-slim$",
         "matchCurrentValue": "/-slim$/",
         "matchDatasources": ["docker"],
-        "matchPackageNames": ["ghcr.io/renovatebot/renovate"],
-        "matchPackageNames": ["/^(?:docker\\.io/)?renovate/renovate$/"],
+        "matchPackageNames": [
+          "ghcr.io/renovatebot/renovate",
+          "/^(?:docker\\.io/)?renovate/renovate$/"
+        ],
         "versioning": "semver"
       }
     ]