diff --git a/distribution/osbuild-composer.service b/distribution/osbuild-composer.service
index 81fd12724..7ed35f68f 100644
--- a/distribution/osbuild-composer.service
+++ b/distribution/osbuild-composer.service
@@ -2,6 +2,7 @@
 Description=OSBuild Composer
 After=multi-user.target
 Requires=osbuild-composer.socket
+Wants=osbuild-worker@1.service
 
 [Service]
 Type=simple
diff --git a/distribution/osbuild-worker@.service b/distribution/osbuild-worker@.service
index 32a3ffb74..6dc0274c1 100644
--- a/distribution/osbuild-worker@.service
+++ b/distribution/osbuild-worker@.service
@@ -11,5 +11,4 @@ Restart=on-failure
 RestartSec=10s
 
 [Install]
-DefaultInstance=1
-WantedBy=multi-user.target
+WantedBy=osbuild-composer.service