diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 5b24d75b..61c935c6 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -27,20 +27,22 @@ jobs:
       - run: helm upgrade --install -n spire-server spire spire --repo https://spiffe.github.io/helm-charts-hardened/ -f .github/tests/spire-values.yaml
       - run: docker exec kind-control-plane crictl images
       - run: kubectl apply -f .github/tests/java-spiffe-helper.yaml
-      - run: kubectl wait pod/java-spiffe-helper --for condition=Ready --timeout=180s
-        continue-on-error: true
-      - run: kubectl logs -lapp=java-spiffe-helper > java-spiffe-helper.log
-      - uses: actions/upload-artifact@v4
+      - run: kubectl wait pod/java-spiffe-helper --for condition=Ready --timeout=30s
+      - if: ${{ failure() }}
+        run: kubectl logs -lapp=java-spiffe-helper > java-spiffe-helper.log
+      - if: ${{ failure() }}
+        uses: actions/upload-artifact@v4
         with:
           name: logs
           path: java-spiffe-helper.log
-      - run: kubectl describe pods -lapp=java-spiffe-helper
+      - if: ${{ failure() }}
+        run: kubectl describe pods -lapp=java-spiffe-helper
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '17'
-      - run: which keytool
       - run: kubectl cp java-spiffe-helper:/tmp/keystore.p12 keystore.p12
-      - run: keytool -list -keystore keystore.p12 -alias spiffe -storepass password
       - run: kubectl cp java-spiffe-helper:/tmp/truststore.p12 truststore.p12
+      - run: ls -latrh
+      - run: keytool -list -keystore keystore.p12 -alias spiffe -storepass password
       - run: keytool -list -keystore truststore.p12 -alias spiffe -storepass password