diff --git a/app/Jobs/CleanupHelperContainersJob.php b/app/Jobs/CleanupHelperContainersJob.php
index 425dd2591..52b4064fe 100644
--- a/app/Jobs/CleanupHelperContainersJob.php
+++ b/app/Jobs/CleanupHelperContainersJob.php
@@ -21,7 +21,7 @@ public function __construct(public Server $server) {}
 
     private static function helperContainersCommand(): string
     {
-        return 'docker container ps --format \'{{json .}}\' | jq -s \'map(select(.Image|test("^([^/]+/)?coollabsio/coolify-helper(:|@)")))\'';
+        return 'docker container ps --format \'{{json .}}\' | jq -s \'map(select(.Image|test("(^|/)coollabsio/coolify-helper(:|@)")))\'';
     }
 
     public function handle(): void
diff --git a/tests/Unit/CleanupHelperContainersJobTest.php b/tests/Unit/CleanupHelperContainersJobTest.php
index a649985d2..bd3e2e175 100644
--- a/tests/Unit/CleanupHelperContainersJobTest.php
+++ b/tests/Unit/CleanupHelperContainersJobTest.php
@@ -13,6 +13,11 @@
         'docker.io/coollabsio/coolify-helper:1.0.16',
         'ghcr.io/coollabsio/coolify-helper@sha256:abc',
         'registry.example/team/coollabsio/coolify-helper:latest',
+        'coollabsio/coolify:latest',
+        'coollabsio/coolify:4.3.12',
+        'coollabsio/coolify-realtime:1.0.10',
+        'coolify-helper:latest',
+        'someone/coolify-helper:1.0.16',
         'evil/coollabsio/coolify-helper-copy:latest',
         'coollabsio/not-coolify-helper:latest',
     ];
@@ -31,7 +36,7 @@
         $process->mustRun();
 
         expect(array_column(json_decode($process->getOutput(), true, flags: JSON_THROW_ON_ERROR), 'Image'))
-            ->toBe(array_slice($images, 0, 3));
+            ->toBe(array_slice($images, 0, 4));
     } finally {
         unlink($docker);
         rmdir($directory);