diff --git a/scale_build/image/mtree.py b/scale_build/image/mtree.py
index 96a7b52..ad23355 100644
--- a/scale_build/image/mtree.py
+++ b/scale_build/image/mtree.py
@@ -36,6 +36,8 @@ ETC_FILES_TO_REMOVE = [
     'etc/netdata/netdata.conf',
     'etc/nfs.conf',
     'etc/nginx/nginx.conf',
+    'etc/nvme/hostid',
+    'etc/nvme/hostnqn',
     'etc/proftpd/proftpd.conf',
     'etc/proftpd/tls.conf',
     'etc/smartd.conf',