diff --git a/build.yaml b/build.yaml
index b16534f..e5fe2f3 100644
--- a/build.yaml
+++ b/build.yaml
@@ -1,4 +1,5 @@
-image: "ghcr.io/home-assistant/{arch}-builder"
+image: "homeassistant/{arch}-builder"
+shadow_repository: "ghcr.io/home-assistant"
 build_from:
   aarch64: "ghcr.io/home-assistant/aarch64-base:3.18"
   armv7: "ghcr.io/home-assistant/armv7-base:3.18"
diff --git a/builder.sh b/builder.sh
index 67d315e..2b039ab 100755
--- a/builder.sh
+++ b/builder.sh
@@ -603,8 +603,8 @@ function build_generic() {
         bashio::log.error "Can't find the image tag on build.json"
         return 1
     fi
-    repository="$(echo "$raw_image" | cut -f 1 -d '/')"
-    image="$(echo "$raw_image" | cut -f 2 -d '/')"
+    repository="${raw_image%/*}"
+    image="${raw_image##*/}"
 
     # Additional build args
     if bashio::var.has_value "$args"; then