diff --git a/Makefile b/Makefile
index c027ccaf..0a94d9c9 100644
--- a/Makefile
+++ b/Makefile
@@ -96,9 +96,9 @@ install: build docs
 	install -d -m 0755 $(DESTDIR)$(BINDIR)
 	install -d -m 0755 $(DESTDIR)$(WWCHROOTDIR)
 	install -d -m 0755 $(DESTDIR)$(WWPROVISIONDIR)
-	install -d -m 0755 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/rootfs/$(WWCLIENTDIR)
-	install -d -m 0755 $(DESTDIR)$(WWOVERLAYDIR)/wwclient/rootfs/$(WWCLIENTDIR)
-	install -d -m 0755 $(DESTDIR)$(WWOVERLAYDIR)/host/rootfs/$(TFTPDIR)/warewulf/
+	install -d -m 0755 $(DESTDIR)$(DATADIR)/warewulf/overlays/wwinit/rootfs/$(WWCLIENTDIR)
+	install -d -m 0755 $(DESTDIR)$(DATADIR)/warewulf/overlays/wwclient/rootfs/$(WWCLIENTDIR)
+	install -d -m 0755 $(DESTDIR)$(DATADIR)/warewulf/overlays/host/rootfs/$(TFTPDIR)/warewulf/
 	install -d -m 0755 $(DESTDIR)$(WWCONFIGDIR)/examples
 	install -d -m 0755 $(DESTDIR)$(WWCONFIGDIR)/ipxe
 	install -d -m 0755 $(DESTDIR)$(WWCONFIGDIR)/grub
@@ -112,27 +112,27 @@ install: build docs
 	install -d -m 0755 $(DESTDIR)$(IPXESOURCE)
 	install -d -m 0755 $(DESTDIR)$(DATADIR)/warewulf
 	# wwctl genconfig to get the compiled in paths to warewulf.conf
-	install -d -m 0755 $(DESTDIR)$(WWDATADIR)/bmc
+	install -d -m 0755 $(DESTDIR)$(DATADIR)/warewulf/bmc
 	test -f $(DESTDIR)$(WWCONFIGDIR)/warewulf.conf || ./wwctl --warewulfconf etc/warewulf.conf genconfig warewulfconf print> $(DESTDIR)$(WWCONFIGDIR)/warewulf.conf
 	test -f $(DESTDIR)$(WWCONFIGDIR)/nodes.conf || install -m 0644 etc/nodes.conf $(DESTDIR)$(WWCONFIGDIR)
 	for f in etc/examples/*.ww; do install -m 0644 $$f $(DESTDIR)$(WWCONFIGDIR)/examples/; done
 	for f in etc/ipxe/*.ipxe; do install -m 0644 $$f $(DESTDIR)$(WWCONFIGDIR)/ipxe/; done
-	for f in lib/warewulf/bmc/*.tmpl; do install -m 0644 $$f $(DESTDIR)$(WWDATADIR)/bmc; done
+	for f in lib/warewulf/bmc/*.tmpl; do install -m 0644 $$f $(DESTDIR)$(DATADIR)/warewulf/bmc; done
 	install -m 0644 etc/grub/grub.cfg.ww $(DESTDIR)$(WWCONFIGDIR)/grub/grub.cfg.ww
-	install -m 0644 etc/grub/chainload.ww $(DESTDIR)$(WWOVERLAYDIR)/host/rootfs$(TFTPDIR)/warewulf/grub.cfg.ww
+	install -m 0644 etc/grub/chainload.ww $(DESTDIR)$(DATADIR)/warewulf/overlays/host/rootfs$(TFTPDIR)/warewulf/grub.cfg.ww
 	install -m 0644 etc/logrotate.d/warewulfd.conf $(DESTDIR)$(LOGROTATEDIR)/warewulfd.conf
-	(cd overlays && find * -path '*/internal' -prune -o -type f -exec install -D -m 0644 {} $(DESTDIR)$(WWOVERLAYDIR)/{} \;)
-	(cd overlays && find * -path '*/internal' -prune -o -type d -exec mkdir -pv $(DESTDIR)$(WWOVERLAYDIR)/{} \;)
-	(cd overlays && find * -path '*/internal' -prune -o -type l -exec cp -av {} $(DESTDIR)$(WWOVERLAYDIR)/{} \;)
-	chmod 0755 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/rootfs/init
-	chmod 0755 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/rootfs/$(WWCLIENTDIR)/wwinit
-	chmod 0600 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/rootfs/$(WWCLIENTDIR)/config.ww
-	chmod 0600 $(DESTDIR)$(WWOVERLAYDIR)/ssh.host_keys/rootfs/etc/ssh/ssh*
-	chmod 0644 $(DESTDIR)$(WWOVERLAYDIR)/ssh.host_keys/rootfs/etc/ssh/ssh*.pub.ww
-	chmod 0600 $(DESTDIR)$(WWOVERLAYDIR)/NetworkManager/rootfs/etc/NetworkManager/system-connections/ww4-managed.ww
-	chmod 0750 $(DESTDIR)$(WWOVERLAYDIR)/host/rootfs
+	(cd overlays && find * -path '*/internal' -prune -o -type f -exec install -D -m 0644 {} $(DESTDIR)$(DATADIR)/warewulf/overlays/{} \;)
+	(cd overlays && find * -path '*/internal' -prune -o -type d -exec mkdir -pv $(DESTDIR)$(DATADIR)/warewulf/overlays/{} \;)
+	(cd overlays && find * -path '*/internal' -prune -o -type l -exec cp -av {} $(DESTDIR)$(DATADIR)/warewulf/overlays/{} \;)
+	chmod 0755 $(DESTDIR)$(DATADIR)/warewulf/overlays/wwinit/rootfs/init
+	chmod 0755 $(DESTDIR)$(DATADIR)/warewulf/overlays/wwinit/rootfs/$(WWCLIENTDIR)/wwinit
+	chmod 0600 $(DESTDIR)$(DATADIR)/warewulf/overlays/wwinit/rootfs/$(WWCLIENTDIR)/config.ww
+	chmod 0600 $(DESTDIR)$(DATADIR)/warewulf/overlays/ssh.host_keys/rootfs/etc/ssh/ssh*
+	chmod 0644 $(DESTDIR)$(DATADIR)/warewulf/overlays/ssh.host_keys/rootfs/etc/ssh/ssh*.pub.ww
+	chmod 0600 $(DESTDIR)$(DATADIR)/warewulf/overlays/NetworkManager/rootfs/etc/NetworkManager/system-connections/ww4-managed.ww
+	chmod 0750 $(DESTDIR)$(DATADIR)/warewulf/overlays/host/rootfs
 	install -m 0755 wwctl $(DESTDIR)$(BINDIR)
-	install -m 0755 wwclient $(DESTDIR)$(WWOVERLAYDIR)/wwinit/rootfs/$(WWCLIENTDIR)/wwclient
+	install -m 0755 wwclient $(DESTDIR)$(DATADIR)/warewulf/overlays/wwinit/rootfs/$(WWCLIENTDIR)/wwclient
 	install -m 0644 include/firewalld/warewulf.xml $(DESTDIR)$(FIREWALLDDIR)
 	install -m 0644 include/systemd/warewulfd.service $(DESTDIR)$(SYSTEMDDIR)
 	install -m 0644 LICENSE.md $(DESTDIR)$(WWDOCDIR)
diff --git a/Variables.mk b/Variables.mk
index be0f5db9..fc7c095b 100644
--- a/Variables.mk
+++ b/Variables.mk
@@ -61,14 +61,13 @@ endif
 TFTPDIR ?= /var/lib/tftpboot
 
 # Warewulf directory paths
-VARLIST += WWCLIENTDIR WWCONFIGDIR WWPROVISIONDIR WWOVERLAYDIR WWCHROOTDIR WWTFTPDIR WWDOCDIR WWDATADIR IPXESOURCE
+VARLIST += WWCLIENTDIR WWCONFIGDIR WWPROVISIONDIR WWOVERLAYDIR WWCHROOTDIR WWTFTPDIR WWDOCDIR IPXESOURCE
 WWCONFIGDIR := $(SYSCONFDIR)/$(WAREWULF)
 WWPROVISIONDIR := $(LOCALSTATEDIR)/$(WAREWULF)/provision
 WWOVERLAYDIR := $(LOCALSTATEDIR)/$(WAREWULF)/overlays
 WWCHROOTDIR := $(LOCALSTATEDIR)/$(WAREWULF)/chroots
 WWTFTPDIR := $(TFTPDIR)/$(WAREWULF)
 WWDOCDIR := $(DOCDIR)/$(WAREWULF)
-WWDATADIR := $(DATADIR)/$(WAREWULF)
 WWCLIENTDIR ?= /warewulf
 
 CONFIG := $(shell pwd)
diff --git a/warewulf.spec.in b/warewulf.spec.in
index 86dec4f7..ad943158 100644
--- a/warewulf.spec.in
+++ b/warewulf.spec.in
@@ -189,30 +189,30 @@ getent group %{wwgroup} >/dev/null || groupadd -r %{wwgroup}
 
 %dir %{_sharedstatedir}/warewulf
 %dir %{_sharedstatedir}/warewulf/chroots
-%dir %{_sharedstatedir}/warewulf/overlays
-%dir %{_sharedstatedir}/warewulf/overlays/*
-%dir %{_sharedstatedir}/warewulf/overlays/*/rootfs
-%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/NetworkManager/rootfs/*
-%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/debian.interfaces/rootfs/*
-%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/debug/rootfs/*
-%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/fstab/rootfs/*
-%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/host/rootfs/*
-%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/hostname/rootfs/*
-%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/hosts/rootfs/*
-%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/ifcfg/rootfs/*
-%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/ignition/rootfs/*
-%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/issue/rootfs/*
-%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/netplan/rootfs/*
-%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/resolv/rootfs/*
-%attr(700, root, root) %{_sharedstatedir}/warewulf/overlays/ssh.authorized_keys/rootfs/*
-%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/ssh.host_keys/rootfs/*
-%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/syncuser/rootfs/*
-%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/systemd.netname/rootfs/*
-%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/udev.netname/rootfs/*
-%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/wicked/rootfs/*
-%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/wwclient/rootfs/*
-%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/wwinit/rootfs/*
-%attr(-, root, root) %{_sharedstatedir}/warewulf/overlays/localtime/rootfs/*
+%dir %{_datadir}/warewulf/overlays
+%dir %{_datadir}/warewulf/overlays/*
+%dir %{_datadir}/warewulf/overlays/*/rootfs
+%attr(-, root, root) %{_datadir}/warewulf/overlays/NetworkManager/rootfs/*
+%attr(-, root, root) %{_datadir}/warewulf/overlays/debian.interfaces/rootfs/*
+%attr(-, root, root) %{_datadir}/warewulf/overlays/debug/rootfs/*
+%attr(-, root, root) %{_datadir}/warewulf/overlays/fstab/rootfs/*
+%attr(-, root, root) %{_datadir}/warewulf/overlays/host/rootfs/*
+%attr(-, root, root) %{_datadir}/warewulf/overlays/hostname/rootfs/*
+%attr(-, root, root) %{_datadir}/warewulf/overlays/hosts/rootfs/*
+%attr(-, root, root) %{_datadir}/warewulf/overlays/ifcfg/rootfs/*
+%attr(-, root, root) %{_datadir}/warewulf/overlays/ignition/rootfs/*
+%attr(-, root, root) %{_datadir}/warewulf/overlays/issue/rootfs/*
+%attr(-, root, root) %{_datadir}/warewulf/overlays/netplan/rootfs/*
+%attr(-, root, root) %{_datadir}/warewulf/overlays/resolv/rootfs/*
+%attr(700, root, root) %{_datadir}/warewulf/overlays/ssh.authorized_keys/rootfs/*
+%attr(-, root, root) %{_datadir}/warewulf/overlays/ssh.host_keys/rootfs/*
+%attr(-, root, root) %{_datadir}/warewulf/overlays/syncuser/rootfs/*
+%attr(-, root, root) %{_datadir}/warewulf/overlays/systemd.netname/rootfs/*
+%attr(-, root, root) %{_datadir}/warewulf/overlays/udev.netname/rootfs/*
+%attr(-, root, root) %{_datadir}/warewulf/overlays/wicked/rootfs/*
+%attr(-, root, root) %{_datadir}/warewulf/overlays/wwclient/rootfs/*
+%attr(-, root, root) %{_datadir}/warewulf/overlays/wwinit/rootfs/*
+%attr(-, root, root) %{_datadir}/warewulf/overlays/localtime/rootfs/*
 
 %attr(-, root, root) %{_bindir}/wwctl
 %attr(-, root, root) %{_prefix}/lib/firewalld/services/warewulf.xml