diff --git a/Makefile b/Makefile
index 61f27956..f9573a43 100644
--- a/Makefile
+++ b/Makefile
@@ -64,11 +64,6 @@ files: all
 #	cp -r tftpboot/* /var/lib/tftpboot/warewulf/ipxe/
 #	restorecon -r /var/lib/tftpboot/warewulf
 
-services: files
-	groupadd -r warewulf
-	systemctl daemon-reload
-	systemctl enable --now warewulfd
-
 wwctl:
 	cd cmd/wwctl; go build -mod vendor -tags "$(WW_BUILD_GO_BUILD_TAGS)" -o ../../wwctl
 
@@ -89,4 +84,4 @@ clean:
 	rm -rf _dist
 	rm -f warewulf-$(VERSION).tar.gz
 
-install: files services
+install: files
diff --git a/warewulf.spec.in b/warewulf.spec.in
index 8f8ff836..0f76c3c2 100644
--- a/warewulf.spec.in
+++ b/warewulf.spec.in
@@ -28,8 +28,10 @@ groupadd -r warewulf >/dev/null 2>&1 || :
 
 %post
 %if %{?rhel}%{!?rhel:0} >= 7
-systemctl start warewulfd >/dev/null 2>&1 || :
-systemctl enable warewulfd >/dev/null 2>&1 || :
+    groupadd -r warewulf >/dev/null 2>&1 || :
+    systemctl daemon-reload >/dev/null 2>&1 || :
+    systemctl start warewulfd >/dev/null 2>&1 || :
+    systemctl enable warewulfd >/dev/null 2>&1 || :
 %endif
 
 %clean