diff --git a/lib/config/presets/internal/replacements.ts b/lib/config/presets/internal/replacements.ts
index 7e813c33802a45..cfce5aeb199cfe 100644
--- a/lib/config/presets/internal/replacements.ts
+++ b/lib/config/presets/internal/replacements.ts
@@ -963,9 +963,9 @@ export const presets: Record<string, Preset> = {
           'The `zap-stable` image has moved to the `zaproxy` organization.',
         matchCurrentVersion: '>=2.0.0 <2.14.0',
         matchDatasources: ['docker'],
-        matchPackagePatterns: [
-          '^(?:docker\\.io/)?owasp/zap2docker-stable$',
-          '^(?:docker\\.io/)?softwaresecurityproject/zap-stable$',
+        matchPackageNames: [
+          '/^(?:docker\\.io/)?owasp/zap2docker-stable$/',
+          '/^(?:docker\\.io/)?softwaresecurityproject/zap-stable$/',
         ],
         replacementName: 'zaproxy/zap-stable',
         replacementVersion: '2.14.0',
@@ -975,9 +975,9 @@ export const presets: Record<string, Preset> = {
           'The `zap-bare` image has moved to the `zaproxy` organization.',
         matchCurrentVersion: '>=2.0.0 <2.14.0',
         matchDatasources: ['docker'],
-        matchPackagePatterns: [
-          '^(?:docker\\.io/)?owasp/zap2docker-bare$',
-          '^(?:docker\\.io/)?softwaresecurityproject/zap-bare$',
+        matchPackageNames: [
+          '/^(?:docker\\.io/)?owasp/zap2docker-bare$/',
+          '/^(?:docker\\.io/)?softwaresecurityproject/zap-bare$/',
         ],
         replacementName: 'zaproxy/zap-bare',
         replacementVersion: '2.14.0',
diff --git a/lib/config/presets/internal/workarounds.ts b/lib/config/presets/internal/workarounds.ts
index 8a6652b152fba0..8c4441ecd3e2b9 100644
--- a/lib/config/presets/internal/workarounds.ts
+++ b/lib/config/presets/internal/workarounds.ts
@@ -32,10 +32,10 @@ export const presets: Record<string, Preset> = {
         matchCurrentValue:
           '/^(?<major>\\d+)(?:\\.(?<minor>\\d+)(?:\\.(?<patch>\\d+))?)?-(?<compatibility>.+)-(?<build>\\d+)(?:-r(?<revision>\\d+))?$/',
         matchDatasources: ['docker'],
-        matchPackagePrefixes: [
-          'bitnami/',
-          'docker.io/bitnami/',
-          'gcr.io/bitnami-containers/',
+        matchPackageNames: [
+          'bitnami/**',
+          'docker.io/bitnami/**',
+          'gcr.io/bitnami-containers/**',
         ],
         versioning:
           'regex:^(?<major>\\d+)(?:\\.(?<minor>\\d+)(?:\\.(?<patch>\\d+))?)?(:?-(?<compatibility>.+)-(?<build>\\d+)(?:-r(?<revision>\\d+))?)?$',