diff --git a/devices/qemu-arm b/devices/qemu-arm
new file mode 120000
index 00000000..8cb17b8f
--- /dev/null
+++ b/devices/qemu-arm
@@ -0,0 +1 @@
+qemu_arm64
\ No newline at end of file
diff --git a/devices/qemu-arm64 b/devices/qemu-arm64
new file mode 120000
index 00000000..8cb17b8f
--- /dev/null
+++ b/devices/qemu-arm64
@@ -0,0 +1 @@
+qemu_arm64
\ No newline at end of file
diff --git a/devices/qemu-i386 b/devices/qemu-i386
new file mode 120000
index 00000000..8ce5a5c4
--- /dev/null
+++ b/devices/qemu-i386
@@ -0,0 +1 @@
+qemu_i386
\ No newline at end of file
diff --git a/devices/qemu-x86_64 b/devices/qemu-x86_64
new file mode 120000
index 00000000..2607faf5
--- /dev/null
+++ b/devices/qemu-x86_64
@@ -0,0 +1 @@
+qemu_x86_64
\ No newline at end of file
diff --git a/devices/qemu_arm64 b/devices/qemu_arm64
index 2712af61..279d423d 100644
--- a/devices/qemu_arm64
+++ b/devices/qemu_arm64
@@ -14,7 +14,7 @@
   arch: arm64
   netdevice: tap
   machine: {{ GS_MACHINE }}
-  cpu: {{ QEMU_CPU_VARIABLES }}{% if DEVICE_TYPE == 'qemu_arm' %},aarch64=off{% endif %}
+  cpu: {{ QEMU_CPU_VARIABLES }}{% if DEVICE_TYPE == 'qemu_arm' or DEVICE_TYPE == 'qemu-arm' %},aarch64=off{% endif %}
   guestfs_size: {{ guestfs_size|default(512) }}
 {% endblock global_settings %}
 
diff --git a/projects/lkft/devices/qemu-arm b/projects/lkft/devices/qemu-arm
new file mode 120000
index 00000000..8cb17b8f
--- /dev/null
+++ b/projects/lkft/devices/qemu-arm
@@ -0,0 +1 @@
+qemu_arm64
\ No newline at end of file
diff --git a/projects/lkft/devices/qemu-arm64 b/projects/lkft/devices/qemu-arm64
new file mode 120000
index 00000000..8cb17b8f
--- /dev/null
+++ b/projects/lkft/devices/qemu-arm64
@@ -0,0 +1 @@
+qemu_arm64
\ No newline at end of file
diff --git a/projects/lkft/devices/qemu-i386 b/projects/lkft/devices/qemu-i386
new file mode 120000
index 00000000..8ce5a5c4
--- /dev/null
+++ b/projects/lkft/devices/qemu-i386
@@ -0,0 +1 @@
+qemu_i386
\ No newline at end of file
diff --git a/projects/lkft/devices/qemu-x86_64 b/projects/lkft/devices/qemu-x86_64
new file mode 120000
index 00000000..2607faf5
--- /dev/null
+++ b/projects/lkft/devices/qemu-x86_64
@@ -0,0 +1 @@
+qemu_x86_64
\ No newline at end of file
diff --git a/projects/lkft/devices/qemu_arm64 b/projects/lkft/devices/qemu_arm64
index 4a817067..983330d1 100644
--- a/projects/lkft/devices/qemu_arm64
+++ b/projects/lkft/devices/qemu_arm64
@@ -1,4 +1,4 @@
-{% extends "devices/qemu_arm64" %}
+{% extends "devices/qemu-arm64" %}
 
 {% set ROOTFS_URL_FORMAT = ROOTFS_URL_FORMAT|default("ext4") %}
 {% set OVERLAY_KSELFTEST_URL_FORMAT = OVERLAY_KSELFTEST_URL_FORMAT|default("tar") %}
@@ -7,7 +7,7 @@
 {% set OVERLAY_MODULES_URL_COMP = OVERLAY_MODULES_URL_COMP|default("xz") %}
 {% set OVERLAY_PERF_URL_FORMAT = OVERLAY_PERF_URL_FORMAT|default("tar") %}
 {% set OVERLAY_PERF_URL_COMP = OVERLAY_PERF_URL_COMP|default("xz") %}
-{% if DEVICE_TYPE == 'qemu_arm' %}
+{% if DEVICE_TYPE == 'qemu_arm' or DEVICE_TYPE == 'qemu-arm' %}
 {% set GS_MACHINE = "virt-2.10,accel=kvm" %}
 {% else %}
 {% set QEMU_CPU_VARIABLES = QEMU_CPU_VARIABLES|default("max,pauth-impdef=on") %}
diff --git a/projects/lkft/devices/qemu_i386 b/projects/lkft/devices/qemu_i386
index f03c27a9..d4f2aa9b 100644
--- a/projects/lkft/devices/qemu_i386
+++ b/projects/lkft/devices/qemu_i386
@@ -1,4 +1,4 @@
-{% extends "devices/qemu_i386" %}
+{% extends "devices/qemu-i386" %}
 
 {% set ROOTFS_URL_FORMAT = ROOTFS_URL_FORMAT|default("ext4") %}
 {% set OVERLAY_CPUPOWER_URL_FORMAT = OVERLAY_CPUPOWER_URL_FORMAT|default("tar") %}
diff --git a/projects/lkft/devices/qemu_x86_64 b/projects/lkft/devices/qemu_x86_64
index e460f16c..a7ceb552 100644
--- a/projects/lkft/devices/qemu_x86_64
+++ b/projects/lkft/devices/qemu_x86_64
@@ -1,4 +1,4 @@
-{% extends "devices/qemu_x86_64" %}
+{% extends "devices/qemu-x86_64" %}
 
 {% set ROOTFS_URL_FORMAT = ROOTFS_URL_FORMAT|default("ext4") %}
 {% set OVERLAY_CPUPOWER_URL_FORMAT = OVERLAY_CPUPOWER_URL_FORMAT|default("tar") %}
diff --git a/projects/lkft/qemu.jinja2 b/projects/lkft/qemu.jinja2
index a1a791cc..5f34e7fb 100644
--- a/projects/lkft/qemu.jinja2
+++ b/projects/lkft/qemu.jinja2
@@ -4,7 +4,7 @@
 {% include PROJECT+"include/metadata.jinja2" %}
 {% endblock metadata %}
 
-{% if DEVICE_TYPE == 'qemu_arm' %}
+{% if DEVICE_TYPE == 'qemu_arm' or DEVICE_TYPE == 'qemu-arm' %}
 {# libhugetlbfs_word_size variable is required for libhugetlbfs.yaml test template #}
 {% set libhuggetlbfs_word_size = 32 %}
 {% set AUTO_LOGIN_PROMPT = AUTO_LOGIN_PROMPT|default("am57xx-evm login:") %}