diff --git a/.github/tests/common.sh b/.github/tests/common.sh
index 3fa18df..6cb4f6e 100755
--- a/.github/tests/common.sh
+++ b/.github/tests/common.sh
@@ -22,6 +22,7 @@ $(kubectl --request-timeout=30s describe pods --namespace "$1")
 
 \`\`\`shell
 $(kubectl get pods -o name -n "$1" | while read -r line; do echo logs for "${line}"; kubectl logs -n "$1" "${line}" --all-containers=true --ignore-errors=true; done)
+$( ([[ -n "$2" ]] && kubectl get pods -o name -n "$2") | while read -r line; do echo logs for "${line}"; kubectl logs -n "$2" "${line}" --all-containers=true --ignore-errors=true; done)
 \`\`\`
 
 EOF
@@ -36,7 +37,7 @@ k_rollout_status () {
 }
 
 get_spire_release_name () {
-  helm ls -A | grep '^spire' | awk '{print $1}'
+  helm ls -A | grep '^spire' | grep -v spire-crds | awk '{print $1}'
 }
 
 print_spire_workload_status () {
diff --git a/examples/external-mysql/run-tests.sh b/examples/external-mysql/run-tests.sh
index aeaf627..0f41ea8 100755
--- a/examples/external-mysql/run-tests.sh
+++ b/examples/external-mysql/run-tests.sh
@@ -24,6 +24,15 @@ for i in "$@"; do
 done
 
 teardown() {
+  print_helm_releases
+  print_spire_workload_status spire-server
+  print_spire_workload_status spire-system
+
+  if [[ "$1" -ne 0 ]]; then
+    get_namespace_details spire-server
+    get_namespace_details spire-system
+  fi
+
   if [ "${CLEANUP}" -eq 1 ]; then
     helm uninstall --namespace "spire-server" spire 2>/dev/null || true
     helm uninstall --namespace mysql mysql 2>/dev/null || true
@@ -32,7 +41,7 @@ teardown() {
   fi
 }
 
-trap 'trap - SIGTERM && teardown' SIGINT SIGTERM EXIT
+trap 'EC=$? && trap - SIGTERM && teardown $EC' SIGINT SIGTERM EXIT
 
 kubectl create namespace spire-system --dry-run=client -o yaml | kubectl apply -f -
 kubectl label namespace spire-system pod-security.kubernetes.io/enforce=privileged || true
@@ -48,12 +57,3 @@ helm upgrade --install --namespace "spire-server" \
   --values "${SCRIPTPATH}/values.yaml,${SCRIPTPATH}/../production/values.yaml,${SCRIPTPATH}/../production/values-node-pod-antiaffinity.yaml,${SCRIPTPATH}/../production/example-your-values.yaml" \
   --set 'spire-server.dataStore.sql.password=sp1ff3Test' --wait spire charts/spire
 helm test --namespace "spire-server" spire
-
-print_helm_releases
-print_spire_workload_status spire-server
-print_spire_workload_status spire-system
-
-if [[ "$1" -ne 0 ]]; then
-  get_namespace_details spire-server
-  get_namespace_details spire-system
-fi
diff --git a/examples/external-postgresql/run-tests.sh b/examples/external-postgresql/run-tests.sh
index 8cfe700..3a93f68 100755
--- a/examples/external-postgresql/run-tests.sh
+++ b/examples/external-postgresql/run-tests.sh
@@ -24,6 +24,15 @@ for i in "$@"; do
 done
 
 teardown() {
+  print_helm_releases
+  print_spire_workload_status spire-server
+  print_spire_workload_status spire-system
+
+  if [[ "$1" -ne 0 ]]; then
+    get_namespace_details spire-server
+    get_namespace_details spire-system
+  fi
+
   if [ "${CLEANUP}" -eq 1 ]; then
     helm uninstall --namespace "spire-server" spire 2>/dev/null || true
     helm uninstall --namespace "spire-server" postgresql 2>/dev/null || true
@@ -32,7 +41,7 @@ teardown() {
   fi
 }
 
-trap 'trap - SIGTERM && teardown' SIGINT SIGTERM EXIT
+trap 'EC=$? && trap - SIGTERM && teardown $EC' SIGINT SIGTERM EXIT
 
 kubectl create namespace spire-system --dry-run=client -o yaml | kubectl apply -f -
 kubectl label namespace spire-system pod-security.kubernetes.io/enforce=privileged || true
@@ -48,12 +57,3 @@ helm upgrade --install --namespace "spire-server" \
   --values "${SCRIPTPATH}/values.yaml,${SCRIPTPATH}/../production/values.yaml,${SCRIPTPATH}/../production/values-node-pod-antiaffinity.yaml,${SCRIPTPATH}/../production/example-your-values.yaml" \
   --set 'spire-server.dataStore.sql.password=sp1ff3Test' --wait spire charts/spire
 helm test --namespace "spire-server" spire
-
-print_helm_releases
-print_spire_workload_status spire-server
-print_spire_workload_status spire-system
-
-if [[ "$1" -ne 0 ]]; then
-  get_namespace_details spire-server
-  get_namespace_details spire-system
-fi
diff --git a/examples/nested/run-tests.sh b/examples/nested/run-tests.sh
index 407715e..8fd5fe4 100755
--- a/examples/nested/run-tests.sh
+++ b/examples/nested/run-tests.sh
@@ -24,6 +24,15 @@ for i in "$@"; do
 done
 
 teardown() {
+  print_helm_releases
+  print_spire_workload_status spire-root-server
+  print_spire_workload_status spire-server spire-system
+
+  if [[ "$1" -ne 0 ]]; then
+    get_namespace_details spire-root-server
+    get_namespace_details spire-server spire-system
+  fi
+
   if [ "${CLEANUP}" -eq 1 ]; then
     helm uninstall --namespace spire-server spire 2>/dev/null || true
     kubectl delete ns spire-server 2>/dev/null || true
@@ -34,7 +43,7 @@ teardown() {
   fi
 }
 
-trap 'trap - SIGTERM && teardown' SIGINT SIGTERM EXIT
+trap 'EC=$? && trap - SIGTERM && teardown $EC' SIGINT SIGTERM EXIT
 
 kubectl create namespace spire-system --dry-run=client -o yaml | kubectl apply -f -
 kubectl label namespace spire-system pod-security.kubernetes.io/enforce=privileged || true
@@ -50,13 +59,3 @@ helm upgrade --install --create-namespace --namespace spire-server --values "${S
   --wait spire charts/spire
 helm test --namespace spire-server spire
 
-print_helm_releases
-print_spire_workload_status spire-root-server
-print_spire_workload_status spire-server
-print_spire_workload_status spire-system
-
-if [[ "$1" -ne 0 ]]; then
-  get_namespace_details spire-root-server
-  get_namespace_details spire-server
-  get_namespace_details spire-system
-fi
diff --git a/examples/production/run-tests.sh b/examples/production/run-tests.sh
index a60342a..595b96b 100755
--- a/examples/production/run-tests.sh
+++ b/examples/production/run-tests.sh
@@ -35,6 +35,13 @@ for i in "$@"; do
 done
 
 teardown() {
+  print_helm_releases
+  print_spire_workload_status spire-server spire-system
+
+  if [[ "$1" -ne 0 ]]; then
+    get_namespace_details spire-server spire-system
+  fi
+
   if [ "${CLEANUP}" -eq 1 ]; then
     helm uninstall --namespace "${ns}" spire 2>/dev/null || true
     kubectl delete ns "${ns}" 2>/dev/null || true
@@ -46,7 +53,7 @@ teardown() {
   fi
 }
 
-trap 'trap - SIGTERM && teardown' SIGINT SIGTERM EXIT
+trap 'EC=$? && trap - SIGTERM && teardown $EC' SIGINT SIGTERM EXIT
 
 if [[ -n "$UPGRADE_ARGS" ]]; then
   pushd "${SCRIPTPATH}"
@@ -132,10 +139,3 @@ if helm get manifest -n spire-server spire | grep -i example; then
   echo Global settings did not work. Please fix.
   exit 1
 fi
-
-print_helm_releases
-print_spire_workload_status "${ns}"
-
-if [[ "$1" -ne 0 ]]; then
-  get_namespace_details "${ns}"
-fi
diff --git a/examples/tornjak/run-tests.sh b/examples/tornjak/run-tests.sh
index f911ee0..f91ed82 100755
--- a/examples/tornjak/run-tests.sh
+++ b/examples/tornjak/run-tests.sh
@@ -24,20 +24,20 @@ for i in "$@"; do
 done
 
 teardown() {
+  print_helm_releases
+  print_spire_workload_status "${ns}"
+
+  if [[ "$1" -ne 0 ]]; then
+    get_namespace_details "${ns}"
+  fi
+
   if [ "${CLEANUP}" -eq 1 ]; then
     helm uninstall --namespace "${ns}" spire 2>/dev/null || true
     kubectl delete ns "${ns}" 2>/dev/null || true
   fi
 }
 
-trap 'trap - SIGTERM && teardown' SIGINT SIGTERM EXIT
+trap 'EC=$? && trap - SIGTERM && teardown $EC' SIGINT SIGTERM EXIT
 
 "${helm_install[@]}" --namespace "${ns}" --values "${SCRIPTPATH}/values.yaml" --wait spire charts/spire
 helm test --namespace "${ns}" spire
-
-print_helm_releases
-print_spire_workload_status "${ns}"
-
-if [[ "$1" -ne 0 ]]; then
-  get_namespace_details "${ns}"
-fi