diff --git a/.github/renovate.json5 b/.github/renovate.json5
index d202e3241..2dbaaf112 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -57,6 +57,7 @@
       ],
       matchBaseBranches: [
         'main',
+        'v1.30',
       ],
     },
     {
@@ -73,28 +74,22 @@
         'pin',
         'pinDigest',
       ],
-    },
-    {
-      matchFileNames: [
-        'Dockerfile',
-      ],
-      matchPackageNames: [
-        'docker.io/library/ubuntu',
-      ],
-      allowedVersions: '22.04',
       matchBaseBranches: [
         'main',
+        'v1.30',
       ],
     },
     {
       matchFileNames: [
         'Dockerfile',
+        'Dockerfile.builder'
       ],
       matchPackageNames: [
         'docker.io/library/ubuntu',
       ],
       allowedVersions: '22.04',
       matchBaseBranches: [
+        'main',
         'v1.30',
       ],
     },
@@ -110,11 +105,12 @@
     {
       matchFileNames: [
         'Dockerfile.builder',
+        '.github/workflows/**'
       ],
       matchPackageNames: [
-        'docker.io/library/ubuntu',
+        'go',
       ],
-      allowedVersions: '22.04',
+      allowedVersions: '<=1.23',
       matchBaseBranches: [
         'main',
       ],
@@ -122,13 +118,14 @@
     {
       matchFileNames: [
         'Dockerfile.builder',
+        '.github/workflows/**'
       ],
       matchPackageNames: [
         'go',
       ],
-      allowedVersions: '<=1.23',
+      allowedVersions: '<=1.22',
       matchBaseBranches: [
-        'main',
+        'v1.30',
       ],
     },
     {
@@ -151,19 +148,6 @@
         'main',
       ],
     },
-    {
-      groupName: 'go 1.23.x',
-      matchFileNames: [
-        '.github/workflows/**',
-      ],
-      matchPackageNames: [
-        'go',
-      ],
-      allowedVersions: '<=1.23',
-      matchBaseBranches: [
-        'main'
-      ],
-    },
   ],
   customManagers: [
     {