diff --git a/.github/actions/run-tests/action.yaml b/.github/actions/run-tests/action.yaml
index 9edeebb66..2199ce782 100644
--- a/.github/actions/run-tests/action.yaml
+++ b/.github/actions/run-tests/action.yaml
@@ -4,6 +4,9 @@ inputs:
   tests:
     description: "Test regex"
     required: true
+  test-file:
+    description: "Name of the chainsaw test file"
+    default: chainsaw-test
 runs:
   using: "composite"
   steps:
@@ -13,4 +16,4 @@ runs:
       shell: bash
       run: |
         set -e
-        chainsaw test --config .chainsaw.yaml --include-test-regex '^chainsaw$/${{ inputs.tests }}' --no-color=false
+        chainsaw test --config .chainsaw.yaml  --include-test-regex '^chainsaw$/${{ matrix.tests }}' --test-file='${{ inputs.test-file }}' --no-color=false
diff --git a/.github/actions/setup-env/action.yaml b/.github/actions/setup-env/action.yaml
index 8bdbd708a..ef9300f0d 100644
--- a/.github/actions/setup-env/action.yaml
+++ b/.github/actions/setup-env/action.yaml
@@ -40,12 +40,6 @@ runs:
         set -e
         kubectl create -f https://github.com/kyverno/kyverno/raw/main/config/install-latest-testing.yaml
     - name: Wait for kyverno ready
-      shell: bash
-      run: |
-        set -e
-        kubectl wait --namespace kyverno --for=condition=ready pod --selector '!job-name' --timeout=60s
+      uses: ./.github/actions/wait-for-kyverno-ready
     - name: Install CRDs
-      shell: bash
-      run: |
-        set -e
-        kubectl apply -f ./.chainsaw/crds
+      uses: ./.github/actions/install-crds