diff --git a/README.md b/README.md
index fd5a0c8..5d7baf3 100644
--- a/README.md
+++ b/README.md
@@ -1,60 +1,60 @@
 # Self-Hosted Sentry nightly
 
 Official bootstrap for running your own [Sentry](https://sentry.io/) with [Docker](https://www.docker.com/).
 
 ## Requirements
 
 * Docker 19.03.6+
 * Compose 1.28.0+
 * 4 CPU Cores
 * 8 GB RAM
 * 20 GB Free Disk Space
 
 ## Setup
 
 ### Customize DotEnv (.env) file
 
 Environment specific configurations can be done in the `.env.custom` file. It will be located in the root directory of the Sentry installation.
 
 By default, there exists no `.env.custom` file. In this case, you can manually add this file by copying the `.env` file to a new `.env.custom` file and adjust your settings in the `.env.custom` file.
 
 Please keep in mind to check the `.env` file for changes, when you perform an upgrade of Sentry, so that you can adjust your `.env.custom` accordingly, if required.
 
 ### Installation
 
 To get started with all the defaults, simply clone the repo and run `./install.sh` in your local check-out. Sentry uses Python 3 by default since December 4th, 2020 and Sentry 21.1.0 is the last version to support Python 2.
 
-During the install, a prompt will ask if you want to create a user account. If you require that the install not be blocked by the prompt, run `./install.sh --no-user-prompt`.
+During the install, a prompt will ask if you want to create a user account. If you require that the install not be blocked by the prompt, run `./install.sh --skip-user-prompt`.
 
 Please visit [our documentation](https://develop.sentry.dev/self-hosted/) for everything else.
 
 ## Tips & Tricks
 
 ### Event Retention
 
 Sentry comes with a cleanup cron job that prunes events older than `90 days` by default. If you want to change that, you can change the `SENTRY_EVENT_RETENTION_DAYS` environment variable in `.env` or simply override it in your environment. If you do not want the cleanup cron, you can remove the `sentry-cleanup` service from the `docker-compose.yml`file.
 
 ### Installing a specific SHA
 
 If you want to install a specific release of Sentry, use the tags/releases on this repo.
 
 We continously push the Docker image for each commit made into [Sentry](https://github.com/getsentry/sentry), and other services such as [Snuba](https://github.com/getsentry/snuba) or [Symbolicator](https://github.com/getsentry/symbolicator) to [our Docker Hub](https://hub.docker.com/u/getsentry) and tag the latest version on master as `:nightly`. This is also usually what we have on sentry.io and what the install script uses. You can use a custom Sentry image, such as a modified version that you have built on your own, or simply a specific commit hash by setting the `SENTRY_IMAGE` environment variable to that image name before running `./install.sh`:
 
 ```shell
 SENTRY_IMAGE=getsentry/sentry:83b1380 ./install.sh
 ```
 
 Note that this may not work for all commit SHAs as this repository evolves with Sentry and its satellite projects. It is highly recommended to check out a version of this repository that is close to the timestamp of the Sentry commit you are installing.
 
 ### Using Linux
 
 If you are using Linux and you need to use `sudo` when running `./install.sh`, make sure to place the environment variable *after* `sudo`:
 
 ```shell
 sudo SENTRY_IMAGE=us.gcr.io/sentryio/sentry:83b1380 ./install.sh
 ```
 
 Where you replace `83b1380` with the sha you want to use.
 
 [build-status-image]: https://github.com/getsentry/self-hosted/workflows/test/badge.svg
 [build-status-url]: https://git.io/JUYkh
diff --git a/install/check-latest-commit.sh b/install/check-latest-commit.sh
index 003639e..7f35660 100644
--- a/install/check-latest-commit.sh
+++ b/install/check-latest-commit.sh
@@ -1,11 +1,15 @@
-#!/bin/bash
+echo "${_group}Checking for latest commit ... "
 
 # Checks if we are on latest commit from github if it is running from master branch
 if [[ -d "../.git" && "${SKIP_COMMIT_CHECK:-0}" != 1 ]]; then
   if [[ $(git branch | sed -n '/\* /s///p') == "master" ]]; then
     if [[ $(git rev-parse HEAD) != $(git ls-remote $(git rev-parse --abbrev-ref @{u} | sed 's/\// /g') | cut -f1) ]]; then
-      echo "Seems like you are not using the latest commit from self-hosted repository. Please pull the latest changes and try again.";
+      echo "Seems like you are not using the latest commit from the self-hosted repository. Please pull the latest changes and try again, or suppress this check with --skip-commit-check.";
       exit 1
     fi
   fi
+else
+  echo "skipped"
 fi
+
+echo "${_endgroup}"
diff --git a/install/parse-cli.sh b/install/parse-cli.sh
index 9492a89..4712fd6 100644
--- a/install/parse-cli.sh
+++ b/install/parse-cli.sh
@@ -1,34 +1,41 @@
 echo "${_group}Parsing command line ..."
 
 show_help() {
   cat <<EOF
 Usage: $0 [options]
 
-Install Sentry with `docker compose`.
+Install Sentry with \`docker compose\`.
 
 Options:
  -h, --help             Show this message and exit.
- --no-user-prompt       Skips the initial user creation prompt (ideal for non-interactive installs).
- --minimize-downtime    EXPERIMENTAL: try to keep accepting events for as long as possible while upgrading.
-                        This will disable cleanup on error, and might leave your installation in partially upgraded state.
-                        This option might not reload all configuration, and is only meant for in-place upgrades.
+ --minimize-downtime    EXPERIMENTAL: try to keep accepting events for as long
+                          as possible while upgrading. This will disable cleanup
+                          on error, and might leave your installation in a
+                          partially upgraded state. This option might not reload
+                          all configuration, and is only meant for in-place
+                          upgrades.
+ --skip-commit-check    Skip the check for the latest commit when on the master
+                          branch of a \`self-hosted\` Git working copy.
+ --skip-user-prompt     Skip the initial user creation prompt (ideal for non-
+                          interactive installs).
 EOF
 }
 
 SKIP_USER_PROMPT="${SKIP_USER_PROMPT:-}"
 MINIMIZE_DOWNTIME="${MINIMIZE_DOWNTIME:-}"
 SKIP_COMMIT_CHECK="${SKIP_COMMIT_CHECK:-}"
 
 while (( $# )); do
   case "$1" in
     -h | --help) show_help; exit;;
-    --no-user-prompt) SKIP_USER_PROMPT=1;;
+    --no-user-prompt) SKIP_USER_PROMPT=1;;  # deprecated
+    --skip-user-prompt) SKIP_USER_PROMPT=1;;
     --minimize-downtime) MINIMIZE_DOWNTIME=1;;
     --skip-commit-check) SKIP_COMMIT_CHECK=1;;
     --) ;;
     *) echo "Unexpected argument: $1. Use --help for usage information."; exit 1;;
   esac
   shift
 done
 
 echo "${_endgroup}"