diff --git a/.env b/.env
index 71796901e5..a7830cfc4c 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
-COMPOSE_PROJECT_NAME=sentry_self_hosted
+COMPOSE_PROJECT_NAME=sentry_onpremise
 SENTRY_EVENT_RETENTION_DAYS=90
 # You can either use a port number or an IP:PORT combo for SENTRY_BIND
 # See https://docs.docker.com/compose/compose-file/#ports for more
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
index 3e5de4d17d..59f0ad9051 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -5,9 +5,9 @@ body:
     id: problem
     attributes:
       label: Problem Statement
-      description: What problem could `self-hosted` solve that it doesn't?
+      description: What problem could `onpremise` solve that it doesn't?
       placeholder: |-
-        I want to make whirled peas, but `self-hosted` doesn't blend.
+        I want to make whirled peas, but `onpremise` doesn't blend.
     validations:
       required: true
   - type: textarea
@@ -16,7 +16,7 @@ body:
       label: Solution Brainstorm
       description: We know you have bright ideas to share ... share away, friend.
       placeholder: |-
-        Add a blender to `self-hosted`.
+        Add a blender to `onpremise`.
     validations:
       required: false
   - type: markdown
diff --git a/README.md b/README.md
index fd5a0c8687..7265016f90 100644
--- a/README.md
+++ b/README.md
@@ -56,5 +56,5 @@ 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-image]: https://github.com/getsentry/onpremise/workflows/test/badge.svg
 [build-status-url]: https://git.io/JUYkh
diff --git a/docker-compose.yml b/docker-compose.yml
index 38fceac209..5db67830b6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,7 +9,7 @@ x-healthcheck-defaults: &healthcheck_defaults
   # Related issues:
   # https://github.com/moby/moby/issues/39102
   # https://github.com/moby/moby/issues/39388
-  # https://github.com/getsentry/self-hosted/issues/1000
+  # https://github.com/getsentry/onpremise/issues/1000
   interval: 30s
   timeout: 5s
   retries: 5
@@ -252,7 +252,7 @@ services:
     command: subscriptions --auto-offset-reset=latest --consumer-group=snuba-transactions-subscriptions-consumers --topic=events --result-topic=transactions-subscription-results --dataset=transactions --commit-log-topic=snuba-commit-log --commit-log-group=transactions_group --delay-seconds=60 --schedule-ttl=60
   snuba-cleanup:
     <<: *snuba_defaults
-    image: snuba-cleanup-self-hosted-local
+    image: snuba-cleanup-onpremise-local
     build:
       context: ./cron
       args:
@@ -260,7 +260,7 @@ services:
     command: '"*/5 * * * * gosu snuba snuba cleanup --storage errors --dry-run False"'
   snuba-transactions-cleanup:
     <<: *snuba_defaults
-    image: snuba-cleanup-self-hosted-local
+    image: snuba-cleanup-onpremise-local
     build:
       context: ./cron
       args:
@@ -278,7 +278,7 @@ services:
     command: run -c /etc/symbolicator/config.yml
   symbolicator-cleanup:
     <<: *restart_policy
-    image: symbolicator-cleanup-self-hosted-local
+    image: symbolicator-cleanup-onpremise-local
     build:
       context: ./cron
       args:
@@ -317,7 +317,7 @@ services:
     command: run query-subscription-consumer --commit-batch-size 1 --topic transactions-subscription-results
   sentry-cleanup:
     <<: *sentry_defaults
-    image: sentry-cleanup-self-hosted-local
+    image: sentry-cleanup-onpremise-local
     build:
       context: ./cron
       args:
diff --git a/install/_test_setup.sh b/install/_test_setup.sh
index 6e8349261a..6fdf29eecb 100644
--- a/install/_test_setup.sh
+++ b/install/_test_setup.sh
@@ -1,8 +1,8 @@
 set -euo pipefail
 source "$(dirname $0)/_lib.sh"
 
-rm -rf /tmp/sentry-self-hosted-test-sandbox.*
-_SANDBOX="$(mktemp -d /tmp/sentry-self-hosted-test-sandbox.XXX)"
+rm -rf /tmp/sentry-onpremise-test-sandbox.*
+_SANDBOX="$(mktemp -d /tmp/sentry-onpremise-test-sandbox.XXX)"
 
 report_success() {
   echo "$(basename $0) - Success 👍"
diff --git a/install/replace-tsdb.sh b/install/replace-tsdb.sh
index c539687066..0716bc148b 100644
--- a/install/replace-tsdb.sh
+++ b/install/replace-tsdb.sh
@@ -6,7 +6,7 @@ replace_tsdb() {
     ! grep -xq 'SENTRY_TSDB = "sentry.tsdb.redissnuba.RedisSnubaTSDB"' "$SENTRY_CONFIG_PY"
   ); then
     # Do NOT indent the following string as it would be reflected in the end result,
-    # breaking the final config file. See getsentry/self-hosted#624.
+    # breaking the final config file. See getsentry/onpremise#624.
     tsdb_settings="\
 SENTRY_TSDB = \"sentry.tsdb.redissnuba.RedisSnubaTSDB\"
 
@@ -37,7 +37,7 @@ SENTRY_TSDB_OPTIONS = {\"switchover_timestamp\": $(date +%s) + (90 * 24 * 3600)}
     echo ""
     echo "$tsdb_settings"
     echo ""
-    echo "For more information please refer to https://github.com/getsentry/self-hosted/pull/430"
+    echo "For more information please refer to https://github.com/getsentry/onpremise/pull/430"
   fi
 }
 
diff --git a/install/turn-things-off.sh b/install/turn-things-off.sh
index 270dc4e78c..090dc8d396 100644
--- a/install/turn-things-off.sh
+++ b/install/turn-things-off.sh
@@ -5,6 +5,9 @@ if [[ -n "$MINIMIZE_DOWNTIME" ]]; then
   $dc rm -fsv $($dc config --services | grep -v -E '^(nginx|relay)$')
 else
   # Clean up old stuff and ensure nothing is working while we install/update
+  # This is for older versions of on-premise:
+  $dc -p onpremise down -t $STOP_TIMEOUT --rmi local --remove-orphans
+  # This is for newer versions
   $dc down -t $STOP_TIMEOUT --rmi local --remove-orphans
 fi
 
diff --git a/install/update-docker-images.sh b/install/update-docker-images.sh
index ba40c56215..e6d232cac7 100644
--- a/install/update-docker-images.sh
+++ b/install/update-docker-images.sh
@@ -1,12 +1,11 @@
 echo "${_group}Fetching and updating Docker images ..."
 
-# We tag locally built images with a '-self-hosted-local' suffix.
-# docker-compose pull tries to pull these too and shows a 404 error on the
-# console which is confusing and unnecessary. To overcome this, we add the
-# stderr>stdout redirection below and pass it through grep, ignoring all lines
-# having this '-self-hosted-local' suffix.
-
-$dc pull -q --ignore-pull-failures 2>&1 | grep -v -- -self-hosted-local || true
+# We tag locally built images with an '-onpremise-local' suffix. docker-compose
+# pull tries to pull these too and shows a 404 error on the console which is
+# confusing and unnecessary. To overcome this, we add the stderr>stdout
+# redirection below and pass it through grep, ignoring all lines having this
+# '-onpremise-local' suffix.
+$dc pull -q --ignore-pull-failures 2>&1 | grep -v -- -onpremise-local || true
 
 # We may not have the set image on the repo (local images) so allow fails
 docker pull ${SENTRY_IMAGE} || true;
diff --git a/reset.sh b/reset.sh
index e7449353d2..e1886860d4 100755
--- a/reset.sh
+++ b/reset.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# The purpose of this script is to make it easy to reset a local self-hosted
+# The purpose of this script is to make it easy to reset a local onpremise
 # install to a clean state, optionally targeting a particular version.
 
 set -euo pipefail