diff --git a/builder.sh b/builder.sh
index e5efe61..3e8e01b 100755
--- a/builder.sh
+++ b/builder.sh
@@ -63,8 +63,8 @@ declare -A BUILD_MACHINE=(
 
 function print_help() {
     cat << EOF
-Hass.io build-env for ecosystem:
-docker run --rm homeassistant/{arch}-builder:latest [options]
+Home Assistant ecosystem build utility:
+docker run --rm ghcr.io/home-assistant/{arch}-builder:latest [options]
 
 Options:
   -h, --help
@@ -529,7 +529,7 @@ function build_addon() {
     # Set defaults build things
     if [ -z "$build_from" ]; then
         bashio::log.info "No build information or from not provided. Using default base image."
-        build_from="homeassistant/${build_arch}-base:latest"
+        build_from="ghcr.io/home-assistant/${build_arch}-base:latest"
     fi
 
     # Additional build args