diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index 0b928a37..33b85fa2 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -249,7 +249,7 @@ IMAGE_CMD_garagesign () {
                                     --length 0 \
                                     ${target_url} \
                                     --sha256 ${ostree_target_hash} \
-                                    --hardwareids ${SOTA_HARDWARE_ID}
+                                    --hardwareids ${GARAGE_TARGET_COMPATIBLE_HWIDS}
             if [ -n "${GARAGE_CUSTOMIZE_TARGET}" ]; then
                 bbplain "Running command(${GARAGE_CUSTOMIZE_TARGET}) to customize target"
                 ${GARAGE_CUSTOMIZE_TARGET} \
diff --git a/classes/sota.bbclass b/classes/sota.bbclass
index fde00cd5..d73689fb 100644
--- a/classes/sota.bbclass
+++ b/classes/sota.bbclass
@@ -42,6 +42,7 @@ GARAGE_TARGET_VERSION ?= ""
 GARAGE_TARGET_URL ?= ""
 GARAGE_TARGET_EXPIRES ?= ""
 GARAGE_TARGET_EXPIRE_AFTER ?= ""
+GARAGE_TARGET_COMPATIBLE_HWIDS ??= "${SOTA_HARDWARE_ID}"
 GARAGE_CUSTOMIZE_TARGET ?= ""
 
 SOTA_MACHINE ??="none"