diff --git a/.github/workflows/test-deployments.yml b/.github/workflows/test-deployments.yml
index 46cb348f0..ad50648a1 100644
--- a/.github/workflows/test-deployments.yml
+++ b/.github/workflows/test-deployments.yml
@@ -193,11 +193,13 @@ jobs:
         if: always()
         shell: bash
         run: |
-          set -x +e
+          set -x
+          set +e
           sudo ss -lntp | grep -E ":(${ZITI_CTRL_ADVERTISED_PORT}|${ZITI_ROUTER_PORT})"
           sudo journalctl --no-pager -o cat -u ziti-controller.service
           sudo journalctl --no-pager -o cat -u ziti-router.service
           cat /opt/openziti/etc/**/*.env /tmp/${ZITI_ROUTER_NAME}.jwt
+          exit 0
 
   docker-deployments:
     name: Test the Docker Deployments
diff --git a/.github/workflows/test-quickstart.yml b/.github/workflows/test-quickstart.yml
index 023c59f13..758f03fde 100644
--- a/.github/workflows/test-quickstart.yml
+++ b/.github/workflows/test-quickstart.yml
@@ -85,3 +85,4 @@ jobs:
           id runner
           ls -lAn ${GOCACHE:-${HOME}/.cache/go-build}/ ${GOPATH:-${HOME}/go}/pkg/mod/
           docker compose --profile test logs
+          exit 0
diff --git a/dist/dist-packages/linux/linux.test.bash b/dist/dist-packages/linux/linux.test.bash
index 3c14a9159..97b243a36 100755
--- a/dist/dist-packages/linux/linux.test.bash
+++ b/dist/dist-packages/linux/linux.test.bash
@@ -32,6 +32,7 @@ cleanup(){
             fi
         )||true
     done
+    echo "DEBUG: cleanup complete"
 }
 
 portcheck(){
diff --git a/dist/docker-images/compose.test.bash b/dist/docker-images/compose.test.bash
index 493f164d8..511574512 100755
--- a/dist/docker-images/compose.test.bash
+++ b/dist/docker-images/compose.test.bash
@@ -9,6 +9,7 @@ set -o xtrace
 
 cleanup(){
 	docker compose --profile test down --volumes --remove-orphans
+    echo "DEBUG: cleanup complete"
 }
 
 portcheck(){