diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl
index 4b2800846..f8f988b84 100644
--- a/share/templates.d/99-generic/runtime-install.tmpl
+++ b/share/templates.d/99-generic/runtime-install.tmpl
@@ -140,7 +140,7 @@ installpkg rng-tools
 %if basearch in ("x86_64", "aarch64"):
 installpkg dmidecode
 %endif
-
+installpkg nvme-cli
 
 ## fonts & themes
 installpkg abattis-cantarell-vf-fonts
diff --git a/share/templates.d/99-generic/runtime-postinstall.tmpl b/share/templates.d/99-generic/runtime-postinstall.tmpl
index 528a2cda1..7fbdd2791 100644
--- a/share/templates.d/99-generic/runtime-postinstall.tmpl
+++ b/share/templates.d/99-generic/runtime-postinstall.tmpl
@@ -114,6 +114,10 @@ remove etc/lvm/cache
 remove etc/lvm/lvm.conf
 append etc/lvm/lvm.conf "global {\n\tuse_lvmetad = 1\n}\n"
 
+## Remove machine specific nvme-cli files
+remove etc/nvme/hostid
+remove etc/nvme/hostnqn
+
 ## TODO: we could run prelink here if we wanted?
 
 ## fix fonconfig cache containing timestamps