diff --git a/live/src/agama-installer.changes b/live/src/agama-installer.changes
index 3eb1e5fc58..95a27b4e5c 100644
--- a/live/src/agama-installer.changes
+++ b/live/src/agama-installer.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Mar 18 16:32:07 UTC 2025 - Knut Anderssen <kanderssen@suse.com>
+
+- Remove /etc/nvme/host* files from the image (bsc#1238038)
+
 -------------------------------------------------------------------
 Mon Mar 17 12:12:02 UTC 2025 - Ladislav Slezák <lslezak@suse.com>
 
diff --git a/live/src/config.sh b/live/src/config.sh
index cd795f244b..2f7c56835f 100644
--- a/live/src/config.sh
+++ b/live/src/config.sh
@@ -120,6 +120,9 @@ if [ "${arch}" = "s390x" ]; then
   touch /config.bootoptions
 fi
 
+# Remove nvme hostid and hostnqn (bsc#1238038)
+rm -f /etc/nvme/host*
+
 # replace the @@LIVE_MEDIUM_LABEL@@ with the real Live partition label name from KIWI
 sed -i -e "s/@@LIVE_MEDIUM_LABEL@@/$label/g" /usr/bin/live-password
 sed -i -e "s/@@LIVE_MEDIUM_LABEL@@/$label/g" /usr/bin/checkmedia-service