diff --git a/Makefile b/Makefile
index 78f1a506b..d8a8c805a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,20 @@
+.PHONY: build
 build:
 	go build -o osbuild-composer ./cmd/osbuild-composer/
 	go build -o osbuild-worker ./cmd/osbuild-worker/
 
+.PHONY: install
 install:
 	- mkdir -p /usr/lib/osbuild-composer
 	cp osbuild-composer /usr/lib/osbuild-composer/
 	cp osbuild-worker /usr/lib/osbuild-composer/
 	cp dnf-json /usr/lib/osbuild-composer/
-
-run-socket:
-	systemd-socket-activate -l /run/weldr/api.socket -l /run/osbuild-composer/job.socket ./osbuild-composer
+	- mkdir -p /etc/sysusers.d/
+	cp distribution/osbuild-composer.conf /etc/sysusers.d/
+	systemd-sysusers osbuild-composer.conf
+	- mkdir -p /etc/systemd/system/
+	cp distribution/*.service /etc/systemd/system/
+	cp distribution/*.socket /etc/systemd/system/
+	systemctl daemon-reload
+	systemctl enable osbuild-composer.socket
+	systemctl enable osbuild-worker@1.service
diff --git a/distribution/Makefile b/distribution/Makefile
deleted file mode 100644
index a5c558efa..000000000
--- a/distribution/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-sd-install:
-	cp *.service /etc/systemd/system/
-	cp *.socket /etc/systemd/system/
-	systemctl daemon-reload
-	
-sd-start:
-	systemctl start osbuild-composer.socket
-	systemctl start osbuild-worker@1.service
-
-sd-enable:
-	systemctl enable osbuild-composer.socket
-	systemctl enable osbuild-worker@1.service
-
-sd-stop:
-	systemctl disable osbuild-composer.socket
-	systemctl stop osbuild-composer.socket
-	systemctl stop osbuild-composer.service
-	systemctl disable osbuild-worker@1.service
-	systemctl stop osbuild-worker@1.service
-
-user-install:
-	- mkdir -p /etc/sysusers.d/
-	cp osbuild-composer.conf /etc/sysusers.d/