diff --git a/build-scripts/addons/create_hassio_addon.sh b/build-scripts/addons/create_hassio_addon.sh
index c8645da..3e741b5 100755
--- a/build-scripts/addons/create_hassio_addon.sh
+++ b/build-scripts/addons/create_hassio_addon.sh
@@ -134,10 +134,12 @@ echo "[INFO] Setup dockerfile"
 sed -i "s/{arch}/${ARCH}/g" "$ADDON_WORKSPACE/config.json"
 DOCKER_TAG=$(jq --raw-output ".version" "$ADDON_WORKSPACE/config.json")
 
-# if set custom image in file
+# If set custom image in file
 DOCKER_IMAGE=$(jq --raw-output ".image // empty" "$ADDON_WORKSPACE/config.json")
 
+# Replace hass.io vars
 sed -i "s/%%BASE_IMAGE%%/${BASE_IMAGE}/g" "$ADDON_WORKSPACE/Dockerfile"
+sed -i "s/#${ARCH}:FROM/FROM/g" "$ADDON_WORKSPACE/Dockerfile"
 sed -i "s/%%ARCH%%/${ARCH}/g" "$ADDON_WORKSPACE/Dockerfile"
 echo "LABEL io.hass.version=\"$DOCKER_TAG\" io.hass.arch=\"$ARCH\" io.hass.type=\"addon\"" >> "$ADDON_WORKSPACE/Dockerfile"