diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 07bd9e1..2532023 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -18,6 +18,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: superfly/flyctl-actions/setup-flyctl@master
       - if: github.event.inputs.app == 'gitea'
-        run: flyctl apps create "$GITEA_APP_NAME" --org personal || true; flyctl volumes create gitea_data --size 1 --region lax -a "$GITEA_APP_NAME" || true; flyctl secrets set GITEA__server__DOMAIN=$GITEA_APP_NAME.fly.dev GITEA__server__ROOT_URL=https://$GITEA_APP_NAME.fly.dev -a "$GITEA_APP_NAME"; flyctl deploy --remote-only -a "$GITEA_APP_NAME" -c fly.toml
+        run: flyctl apps create "${GITEA_APP_NAME:?GITEA_APP_NAME var not set}" --org personal || true; flyctl volumes create gitea_data --size 1 --region lax -a "${GITEA_APP_NAME:?}" --yes || true; flyctl secrets set -a "${GITEA_APP_NAME:?}" --stage "GITEA__server__DOMAIN=${GITEA_APP_NAME}.fly.dev" "GITEA__server__ROOT_URL=https://${GITEA_APP_NAME}.fly.dev"; flyctl deploy --remote-only -c fly.toml -a "${GITEA_APP_NAME:?}"
       - if: github.event.inputs.app == 'runner'
-        run: flyctl apps create "$RUNNER_APP_NAME" --org personal || true; flyctl volumes create runner_data --size 1 --region lax -a "$RUNNER_APP_NAME" || true; flyctl secrets set GITEA_INSTANCE_URL=https://$GITEA_APP_NAME.fly.dev "GITEA_RUNNER_REGISTRATION_TOKEN=$GITEA_RUNNER_REGISTRATION_TOKEN" -a "$RUNNER_APP_NAME"; flyctl deploy --remote-only -a "$RUNNER_APP_NAME" -c runner/fly.toml
+        run: flyctl apps create "${RUNNER_APP_NAME:?RUNNER_APP_NAME var not set}" --org personal || true; flyctl volumes create runner_data --size 1 --region lax -a "${RUNNER_APP_NAME:?}" --yes || true; flyctl secrets set -a "${RUNNER_APP_NAME:?}" --stage "GITEA_INSTANCE_URL=https://${GITEA_APP_NAME:?GITEA_APP_NAME var required}" "GITEA_RUNNER_REGISTRATION_TOKEN=${GITEA_RUNNER_REGISTRATION_TOKEN:?GITEA_RUNNER_REGISTRATION_TOKEN secret not set}"; flyctl deploy --remote-only -c runner/fly.toml -a "${RUNNER_APP_NAME:?}"
+