diff --git a/Makefile b/Makefile
index 5ddb50d..a8348f7 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ cluster-up:
 
 .PHONY: cluster-down
 cluster-down:
-	hack/e2e-setup.sh --cleanup
+	hack/e2e-setup.sh --install-kind --install-kubectl --cleanup
 
 .PHONY: build-venv
 build-venv:
diff --git a/hack/e2e-setup.sh b/hack/e2e-setup.sh
index 051c615..5f6b345 100755
--- a/hack/e2e-setup.sh
+++ b/hack/e2e-setup.sh
@@ -389,11 +389,6 @@ if [ "${ARGCOUNT}" -eq "0" ]; then
   OPT_CREATE_NAD=true
 fi
 
-if [ "${OPT_CLEANUP}" == true ]; then
-  cleanup
-  exit 0
-fi
-
 if [ "${OPT_INSTALL_KIND}" == true ]; then
   install_kind
 fi
@@ -402,6 +397,11 @@ if [ "${OPT_INSTALL_KUBECTL}" == true ]; then
   install_kubectl
 fi
 
+if [ "${OPT_CLEANUP}" == true ]; then
+  cleanup
+  exit 0
+fi
+
 if [ "${OPT_CONFIGURE_INOTIFY_LIMITS}" == true ]; then
   configure_inotify_limits
 fi