diff --git a/make/e2e-ci.sh b/make/e2e-ci.sh
index 69a81f288..f757ae7a1 100755
--- a/make/e2e-ci.sh
+++ b/make/e2e-ci.sh
@@ -14,5 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+set -o errexit
+trap 'make kind-logs' EXIT
 make --no-print-directory e2e FLAKE_ATTEMPTS=2 K8S_VERSION="$(K8S_VERSION)"
-make kind-logs