diff --git a/Makefile b/Makefile
index c347b8399..1365b612c 100644
--- a/Makefile
+++ b/Makefile
@@ -22,8 +22,6 @@ install:
 	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
 
 tarball:
 	git archive --prefix=$(PACKAGE_NAME)-$(VERSION)/ --format=tar.gz HEAD > $(PACKAGE_NAME)-$(VERSION).tar.gz
diff --git a/distribution/osbuild-worker@.service b/distribution/osbuild-worker@.service
index 6dc0274c1..a507414bf 100644
--- a/distribution/osbuild-worker@.service
+++ b/distribution/osbuild-worker@.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=OSBuild Composer Worker (%i)
+Requires=osbuild-composer.socket
 After=multi-user.target osbuild-composer.socket
 
 [Service]