diff --git a/src/analyser/__snapshots__/index.test.ts.snap b/src/analyser/__snapshots__/index.test.ts.snap
index 0a6d87ae..ee537f03 100644
--- a/src/analyser/__snapshots__/index.test.ts.snap
+++ b/src/analyser/__snapshots__/index.test.ts.snap
@@ -118,7 +118,7 @@ exports[`analyser > should run correctly 1`] = `
         "/docker-compose.yml",
       ],
       "reason": [
-        "postgresql matched: /postgres/",
+        "postgresql matched: /^postgres$/",
       ],
       "tech": "postgresql",
       "techs": [],
diff --git a/src/rules/db/postgres.ts b/src/rules/db/postgres.ts
index 7eabc637..7a9f19f2 100644
--- a/src/rules/db/postgres.ts
+++ b/src/rules/db/postgres.ts
@@ -6,7 +6,12 @@ register({
   type: 'db',
   dependencies: [
     { type: 'npm', name: 'pg' },
-    { type: 'docker', name: /postgres/, example: 'postgres:0.0.0' },
+    { type: 'docker', name: 'postgres' },
+    { type: 'docker', name: 'bitnami/postgresql' },
+    { type: 'docker', name: 'circleci/postgres' },
+    { type: 'docker', name: 'cimg/postgres' },
+    { type: 'docker', name: 'ubuntu/postgres' },
+    { type: 'docker', name: 'bitnamicharts/postgresql' },
     { type: 'rust', name: 'postgres' },
     { type: 'ruby', name: 'pg' },
     {
diff --git a/src/rules/db/supabase.postgres.ts b/src/rules/db/supabase.postgres.ts
index 3b897686..1c6428b5 100644
--- a/src/rules/db/supabase.postgres.ts
+++ b/src/rules/db/supabase.postgres.ts
@@ -10,5 +10,8 @@ register({
     { type: 'npm', name: '@supabase/postgres-meta' },
     { type: 'npm', name: '@supabase/realtime-js' },
     { type: 'githubAction', name: 'supabase/embeddings-generator' },
+    { type: 'docker', name: 'bitnami/supabase-postgres' },
+    { type: 'docker', name: 'supabase/postgres' },
+    { type: 'docker', name: 'supabase/postgres-meta' },
   ],
 });
diff --git a/src/rules/spec/docker/__snapshots__/component.test.ts.snap b/src/rules/spec/docker/__snapshots__/component.test.ts.snap
index 3bb38380..cfc00fd0 100644
--- a/src/rules/spec/docker/__snapshots__/component.test.ts.snap
+++ b/src/rules/spec/docker/__snapshots__/component.test.ts.snap
@@ -63,6 +63,9 @@ exports[`docker > should match everything 1`] = `
   "slack",
   "snyk",
   "strapi",
+  "supabase",
+  "supabase.postgres",
+  "supabase.storage",
   "telegram",
   "trufflesecurity",
   "typesense",
@@ -163,11 +166,31 @@ exports[`docker > should match everything 2`] = `
     "bitnami/matomo",
     "0.0.0",
   ],
+  [
+    "docker",
+    "bitnami/postgresql",
+    "0.0.0",
+  ],
   [
     "docker",
     "bitnami/solr",
     "0.0.0",
   ],
+  [
+    "docker",
+    "bitnami/supabase-postgres",
+    "0.0.0",
+  ],
+  [
+    "docker",
+    "bitnami/supabase-storage",
+    "0.0.0",
+  ],
+  [
+    "docker",
+    "bitnamicharts/postgresql",
+    "0.0.0",
+  ],
   [
     "docker",
     "blackfire/blackfire",
@@ -193,6 +216,16 @@ exports[`docker > should match everything 2`] = `
     "cimg/azure",
     "0.0.0",
   ],
+  [
+    "docker",
+    "cimg/postgres",
+    "0.0.0",
+  ],
+  [
+    "docker",
+    "circleci/postgres",
+    "0.0.0",
+  ],
   [
     "docker",
     "clickhouse/clickhouse-server",
@@ -438,6 +471,21 @@ exports[`docker > should match everything 2`] = `
     "strapi",
     "0.0.0",
   ],
+  [
+    "docker",
+    "supabase/postgres",
+    "0.0.0",
+  ],
+  [
+    "docker",
+    "supabase/postgres-meta",
+    "0.0.0",
+  ],
+  [
+    "docker",
+    "supabase/storage-api",
+    "0.0.0",
+  ],
   [
     "docker",
     "trufflesecurity/trufflehog",
@@ -448,6 +496,11 @@ exports[`docker > should match everything 2`] = `
     "typesense/typesense",
     "0.0.0",
   ],
+  [
+    "docker",
+    "ubuntu/postgres",
+    "0.0.0",
+  ],
   [
     "docker",
     "vault",
diff --git a/src/rules/storage/supabase.storage.ts b/src/rules/storage/supabase.storage.ts
index f2d84856..84eab9b3 100644
--- a/src/rules/storage/supabase.storage.ts
+++ b/src/rules/storage/supabase.storage.ts
@@ -4,5 +4,9 @@ register({
   tech: 'supabase.storage',
   name: 'Supabase Storage',
   type: 'storage',
-  dependencies: [{ type: 'npm', name: '@supabase/storage-js' }],
+  dependencies: [
+    { type: 'npm', name: '@supabase/storage-js' },
+    { type: 'docker', name: 'bitnami/supabase-storage' },
+    { type: 'docker', name: 'supabase/storage-api' },
+  ],
 });