diff --git a/.github/renovate.json b/.github/renovate.json
index 1f12c11c5..70362e54a 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -72,11 +72,9 @@
         "docker/Dockerfile.devel"
       ],
       "matchStrings": [
-        "FROM golang:(?<currentValue>\\d+\\.\\d+\\.\\d+)"
+        "FROM (?<depName>\\S+):(?<currentValue>[^\\s@]+)@(?<currentDigest>sha256:[a-f0-9]{64})"
       ],
-      "depNameTemplate": "go",
-      "datasourceTemplate": "golang-version",
-      "versioningTemplate": "semver"
+      "datasourceTemplate": "docker"
     }
   ],
   "labels": [
@@ -170,8 +168,8 @@
     {
       "description": "Group all Go toolchain version bumps",
       "matchManagers": ["custom.regex"],
-      "matchPackageNames": ["go"],
-      "matchDatasources": ["golang-version"],
+      "matchPackageNames": ["go", "golang"],
+      "matchDatasources": ["golang-version", "docker"],
       "groupName": "Go toolchain",
       "groupSlug": "go-toolchain",
       "separateMajorMinor": false,