diff --git a/nvme-cli.spec b/nvme-cli.spec
index 223806c..6b18de3 100644
--- a/nvme-cli.spec
+++ b/nvme-cli.spec
@@ -3,7 +3,7 @@
 
 Name:           nvme-cli
 Version:        2.4
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        NVMe management command line interface
 
 License:        GPLv2+
@@ -59,6 +59,7 @@ nvme-cli provides NVM-Express user space tooling for Linux.
 #rm -f %{buildroot}%{_sysconfdir}/nvme/hostnqn
 
 # Do not install the dracut rule yet.  See rhbz 1742764
+# Do we want to keep this here?  Now that we have boot support for nvme/fc + tcp?
 rm -f %{buildroot}/usr/lib/dracut/dracut.conf.d/70-nvmf-autoconnect.conf
 
 # Move html docs into the right place
@@ -82,6 +83,7 @@ rm -rf %{buildroot}%{_pkgdocdir}/nvme
 %{_udevrulesdir}/70-nvmf-autoconnect.rules
 %{_udevrulesdir}/71-nvmf-iopolicy-netapp.rules
 # Do not install the dracut rule yet.  See rhbz 1742764
+# Is this still true?  Now that we support nvme-of boot, do we want to install this file?
 # /usr/lib/dracut/dracut.conf.d/70-nvmf-autoconnect.conf
 
 %post
@@ -90,7 +92,7 @@ if [ $1 -eq 1 ] || [ $1 -eq 2 ]; then
 		echo $(nvme gen-hostnqn) > %{_sysconfdir}/nvme/hostnqn
         fi
         if [ ! -s %{_sysconfdir}/nvme/hostid ]; then
-                uuidgen > %{_sysconfdir}/nvme/hostid
+            echo $(nvme show-hostnqn | sed 's/^.*uuid://') > %{_sysconfdir}/nvme/hostid
         fi
 
 	# apply udev and systemd changes that we did
@@ -103,6 +105,9 @@ if [ $1 -eq 1 ] || [ $1 -eq 2 ]; then
 fi
 
 %changelog
+* Thu Aug 10 2023 John Meneghini <jmeneghi@redhat.com> - 2.4-9
+- JIRA: https://issues.redhat.com/browse/RHEL-1147
+
 * Mon Jul 17 2023 John Meneghini <jmeneghi@redhat.com> - 2.4-8
 - Fix BZ#2223436