diff --git a/ci/scripts/test-deployment b/ci/scripts/test-deployment
index 0357089..9e4644f 100755
--- a/ci/scripts/test-deployment
+++ b/ci/scripts/test-deployment
@@ -218,7 +218,8 @@ if [[ "$SKIP_SMOKE_TESTS" == "false" ]]; then
 	chmod 600 ~/.ssh/id_test_user
 
 	ip="$(genesis ci-vsphere-baseline.yml bosh vms --json | jq -r '.Tables[0].Rows[0].ips')"
-	echo "uname -a; echo -n 'User: '; whoami; uptime" | ssh -i ~/.ssh.id_test_user -o StrictHostKeyChecking=accept-new -l test-user $ip
+	echo "Attempting to SSH to $ip as user 'test-user'..."
+	echo "uname -a && echo -n 'User: ' && whoami && uptime" | ssh -i ~/.ssh/id_test_user -o StrictHostKeyChecking=accept-new -l test-user $ip
 
 	genesis "do" "${DEPLOY_ENV}" -- inventory
 
diff --git a/hooks/addon b/hooks/addon
index 6231ae6..f9c5422 100755
--- a/hooks/addon
+++ b/hooks/addon
@@ -235,7 +235,8 @@ generate-vpn-config)
   ;;
 
 inventory)
-  exec bosh run-errand inventory
+  bosh run-errand inventory
+  exit 0
   ;;
 
 ssh)