diff --git a/esphome-beta/config.yaml b/esphome-beta/config.yaml
index 7fd3dae..926da10 100644
--- a/esphome-beta/config.yaml
+++ b/esphome-beta/config.yaml
@@ -32,6 +32,6 @@ name: ESPHome (beta)
 version: 2022.12.3
 slug: esphome-beta
 description: Beta version of ESPHome add-on
-image: ghcr.io/esphome/esphome-hassio-{arch}
+image: ghcr.io/esphome/esphome-hassio
 stage: experimental
 advanced: true
diff --git a/esphome-dev/build.yaml b/esphome-dev/build.yaml
index 349204e..114bb62 100644
--- a/esphome-dev/build.yaml
+++ b/esphome-dev/build.yaml
@@ -1,5 +1,5 @@
 ---
 build_from:
-  aarch64: ghcr.io/esphome/esphome-hassio-aarch64:dev
-  amd64: ghcr.io/esphome/esphome-hassio-amd64:dev
-  armv7: ghcr.io/esphome/esphome-hassio-armv7:dev
+  aarch64: ghcr.io/esphome/esphome-hassio:dev
+  amd64: ghcr.io/esphome/esphome-hassio:dev
+  armv7: ghcr.io/esphome/esphome-hassio:dev
diff --git a/esphome/config.yaml b/esphome/config.yaml
index 2f51394..f261e63 100644
--- a/esphome/config.yaml
+++ b/esphome/config.yaml
@@ -32,4 +32,4 @@ name: ESPHome
 version: 2022.12.3
 slug: esphome
 description: ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices
-image: ghcr.io/esphome/esphome-hassio-{arch}
+image: ghcr.io/esphome/esphome-hassio
diff --git a/script/generate.py b/script/generate.py
index 96aebc2..d135ca6 100755
--- a/script/generate.py
+++ b/script/generate.py
@@ -51,7 +51,7 @@ def main(args):
             path = dir_ / "build.yaml"
             build_conf = {
                 "build_from": {
-                    arch: base_image.format(arch=arch) for arch in conf["arch"]
+                    arch: base_image for arch in conf["arch"]
                 }
             }
             with open(path, "w") as f:
diff --git a/template/addon_config.yaml b/template/addon_config.yaml
index 43e8ec5..7055fd7 100644
--- a/template/addon_config.yaml
+++ b/template/addon_config.yaml
@@ -58,7 +58,7 @@ esphome-dev:
     keyfile: str?
     relative_url: str?
     leave_front_door_open: bool?
-  base_image: ghcr.io/esphome/esphome-hassio-{arch}:dev
+  base_image: ghcr.io/esphome/esphome-hassio:dev
 
 esphome-beta:
   <<: *base
@@ -68,7 +68,7 @@ esphome-beta:
   slug: esphome-beta
   description: "Beta version of ESPHome add-on"
   url: https://beta.esphome.io/
-  image: ghcr.io/esphome/esphome-hassio-{arch}
+  image: ghcr.io/esphome/esphome-hassio
   stage: experimental
   advanced: true
 
@@ -79,7 +79,7 @@ esphome-stable:
   version: '2022.12.3'  # STABLE
   slug: esphome
   description: "ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices"
-  image: ghcr.io/esphome/esphome-hassio-{arch}
+  image: ghcr.io/esphome/esphome-hassio
 
 copy_files:
   CHANGELOG.md: