diff --git a/pkg/pillar/hypervisor/kvm.go b/pkg/pillar/hypervisor/kvm.go
index 495895beda..707a81799e 100644
--- a/pkg/pillar/hypervisor/kvm.go
+++ b/pkg/pillar/hypervisor/kvm.go
@@ -426,7 +426,14 @@ const qemuSwtpmTemplate = `
   chardev = "swtpm"
 
 [device "tpm-tis"]
+# 'virt' refers to aarch64
+# 'tpm-tis-device' for aarch64 versus 'tpm-tis' for x86
+# Reference: https://listman.redhat.com/archives/libvir-list/2021-February/msg00647.html
+{{- if eq .Machine "virt"}}
+  driver = "tpm-tis-device"
+{{- else}}
   driver = "tpm-tis"
+{{- end}}
   tpmdev = "tpm0"
 `