diff --git a/features.in/tty/config.mk b/features.in/tty/config.mk
index 37ee8be5..adca3ae1 100644
--- a/features.in/tty/config.mk
+++ b/features.in/tty/config.mk
@@ -9,7 +9,7 @@ ifeq (distro,$(IMAGE_CLASS))
 endif
 
 comma := ,
-use/tty/S0 use/tty/SI0 use/tty/AMA0: use/tty/%: use/tty
+use/tty/S0 use/tty/SIF0 use/tty/AMA0: use/tty/%: use/tty
 	@$(call add,THE_PACKAGES,agetty)
 	@$(call add,TTY_DEV,tty$*)
 	@$(call set,TTY_RATE,115200)
diff --git a/features.in/uboot/config.mk b/features.in/uboot/config.mk
index 7356d51a..2a7dafcf 100644
--- a/features.in/uboot/config.mk
+++ b/features.in/uboot/config.mk
@@ -7,7 +7,11 @@ endif
 endif
 
 ifeq (,$(filter-out riscv64,$(ARCH)))
+ifeq (,$(filter-out qcow2 qcow2c,$(IMAGE_TYPE)))
 UBOOT_TTY := use/tty/S0
+else
+UBOOT_TTY := use/tty/SIF0
+endif
 endif
 
 ifneq (,$(filter-out i586 x86_64,$(ARCH)))