diff --git a/scripts/setup_wizard.sh b/scripts/setup_wizard.sh
index a87fcbf..b102a87 100755
--- a/scripts/setup_wizard.sh
+++ b/scripts/setup_wizard.sh
@@ -160,14 +160,13 @@ confirm_inputs "CERT_LOCATION" "KEY_LOCATION"
 
 if [ ! -f "$CERT_LOCATION" ] || [ ! -f "$KEY_LOCATION" ]; then
     (umask 077; mkdir -p "${CERT_DIR}")
-    cd "${CERT_DIR}"
-    step ca root root_ca.crt
-    hostname=$(hostname -s) step ca certificate "$hostname" cert.pem key.pem \
+    step ca root "${CERT_DIR}/root_ca.crt"
+    hostname=$(hostname -s) step ca certificate "$hostname" \
+        "${CERT_DIR}/cert.pem" "${CERT_DIR}/key.pem" \
         --san "$hostname" \
         --san "$hostname.john-stream.com" \
         --san "$IP_ADDRESS" \
         --provisioner admin
-    exit 1
 fi
 
 # 3. Configure