diff --git a/.github/test_dependencies.yaml b/.github/test_dependencies.yaml
index 080433505d..9f297fde05 100644
--- a/.github/test_dependencies.yaml
+++ b/.github/test_dependencies.yaml
@@ -2,15 +2,15 @@ e2e:
   kind:
     # renovate: datasource=docker depName=kindest/node versioning=docker
     - 'v1.28.0'
-    # renovate: datasource=docker depName=kindest/node versioning=docker
+    # renovate: datasource=docker depName=kindest/node@only-patch packageName=kindest/node versioning=docker
     - 'v1.27.3'
-    # renovate: datasource=docker depName=kindest/node versioning=docker
+    # renovate: datasource=docker depName=kindest/node@only-patch packageName=kindest/node versioning=docker
     - 'v1.26.6'
-    # renovate: datasource=docker depName=kindest/node versioning=docker
+    # renovate: datasource=docker depName=kindest/node@only-patch packageName=kindest/node versioning=docker
     - 'v1.25.11'
-    # renovate: datasource=docker depName=kindest/node versioning=docker
+    # renovate: datasource=docker depName=kindest/node@only-patch packageName=kindest/node versioning=docker
     - 'v1.24.15'
-    # renovate: datasource=docker depName=kindest/node versioning=docker
+    # renovate: datasource=docker depName=kindest/node@only-patch packageName=kindest/node versioning=docker
     - 'v1.23.17'
   gke:
     # renovate: datasource=custom.gke-rapid depName=gke versioning=semver
@@ -24,22 +24,22 @@ e2e:
       kind: 'v1.28.0'
       # renovate: datasource=docker depName=istio/istioctl versioning=docker
       istio: '1.19.3'
-    - # renovate: datasource=docker depName=kindest/node versioning=docker
+    - # renovate: datasource=docker depName=kindest/node@only-patch packageName=kindest/node versioning=docker
       kind: 'v1.27.3'
-      # renovate: datasource=docker depName=istio/istioctl versioning=docker
+      # renovate: datasource=docker depName=istio/istioctl@only-patch packageName=istio/istioctl versioning=docker
       istio: '1.18.5'
-    - # renovate: datasource=docker depName=kindest/node versioning=docker
+    - # renovate: datasource=docker depName=kindest/node@only-patch packageName=kindest/node versioning=docker
       kind: 'v1.26.6'
-      # renovate: datasource=docker depName=istio/istioctl versioning=docker
+      # renovate: datasource=docker depName=istio/istioctl@only-patch packageName=istio/istioctl versioning=docker
       istio: '1.17.8'
-    - # renovate: datasource=docker depName=kindest/node versioning=docker
+    - # renovate: datasource=docker depName=kindest/node@only-patch packageName=kindest/node versioning=docker
       kind: 'v1.25.11'
-      # renovate: datasource=docker depName=istio/istioctl versioning=docker
+      # renovate: datasource=docker depName=istio/istioctl@only-patch packageName=istio/istioctl versioning=docker
       istio: '1.16.7'
 
 integration:
   helm:
-    # renovate: datasource=github-releases depName=kong/charts versioning=semver
+    # renovate: datasource=helm depName=kong registryUrl=https://charts.konghq.com versioning=helm
     kong: '2.29.0'
   # renovate: datasource=docker depName=kindest/node versioning=docker
   kind: 'v1.28.0'
diff --git a/renovate.json b/renovate.json
index c7c22b256e..02ef9f7a97 100644
--- a/renovate.json
+++ b/renovate.json
@@ -6,25 +6,19 @@
   "separateMinorPatch": true,
   "labels": ["dependencies"],
   "schedule": "before 5am every weekday",
+  "registryAliases": {
+    "kong": "https://charts.konghq.com"
+  },
   "customManagers": [
     {
+      "description": "Match dependencies in .github/test_dependencies.yaml that are properly annotated with `# renovate: datasource={} depName={} [packageName={}] [registryUrl={}] versioning={}.`",
       "customType": "regex",
       "fileMatch": [
         "^.github/test_dependencies.yaml$"
       ],
       "matchStrings": [
-        "#\\s+renovate:\\s+datasource=(?<datasource>.*)\\s+depName=(?<depName>.*)\\s+versioning=(?<versioning>.*)\\n.+'(?<currentValue>.*)'"
+        "#\\s+renovate:\\s+datasource=(?<datasource>.*?)\\s+depName=(?<depName>.*?)\\s+(packageName=(?<packageName>.*)\\s+)?(registryUrl=(?<registryUrl>.*)\\s+)?versioning=(?<versioning>.*?)\\n.+'(?<currentValue>.*?)'"
       ]
-    },
-    {
-      "customType": "regex",
-      "fileMatch": [
-        "^.github/test_dependencies.yaml$"
-      ],
-      "matchStrings": [
-        "#\\s+renovate:\\s+datasource=(?<datasource>.*)\\s+depName=(?<depName>.*)\\s+versioning=(?<versioning>.*)\\n.+'(?<currentValue>.*)'"
-      ],
-      "extractVersionTemplate": "^kong-?(?<version>.*)$"
     }
   ],
   "customDatasources": {
@@ -32,5 +26,13 @@
       "defaultRegistryUrlTemplate": "https://raw.githubusercontent.com/kong/gke-renovate-datasource/main/static/rapid.json",
       "format": "json"
     }
-  }
+  },
+  "packageRules": [
+    {
+      "description": "Ignore minor updates if depName has `@only-patch` suffix.",
+      "matchUpdateTypes": ["minor"],
+      "matchDepPatterns": [".*@only-patch"],
+      "enabled": false
+    }
+  ]
 }