diff --git a/.github/workflows/test-builder-with-cache.yml b/.github/workflows/test-builder-with-cache.yml
index 76825cb..96fab60 100644
--- a/.github/workflows/test-builder-with-cache.yml
+++ b/.github/workflows/test-builder-with-cache.yml
@@ -14,12 +14,21 @@ concurrency:
 
 jobs:
   build-package-with-cache:
-    # if: ${{ github.event.registry_package.package_version.container_metadata.tag.name == 'latest-builder-with-cache' }}
+    if: >-
+      github.event_name == 'push' || 
+      github.event_name == 'workflow_dispatch' || 
+      github.event_name == 'registry_package' ||
+      (
+        github.event.registry_package.name == 'autoware' &&
+        github.event.registry_package.package_version.container_metadata.tag.name == 'latest-builder-with-cache'
+      )
+
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/bounverif/autoware:latest-builder-with-cache
 
     strategy:
+      fail-fast: false
       matrix:
         package:
           - autoware_tensorrt_yolox