diff --git a/cmd/osbuild-worker/main.go b/cmd/osbuild-worker/main.go
index 3e7e2d5dc..c327752a5 100644
--- a/cmd/osbuild-worker/main.go
+++ b/cmd/osbuild-worker/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"crypto/tls"
 	"crypto/x509"
 	"errors"
@@ -11,6 +12,7 @@ import (
 	"log"
 	"os"
 	"path"
+	"time"
 
 	"github.com/google/uuid"
 	"github.com/osbuild/osbuild-composer/internal/common"
@@ -161,6 +163,25 @@ func RunJob(job *worker.Job, store string, uploadFunc func(uuid.UUID, string, io
 	return result, nil
 }
 
+// Regularly ask osbuild-composer if the compose we're currently working on was
+// canceled and exit the process if it was.
+// It would be cleaner to kill the osbuild process using (`exec.CommandContext`
+// or similar), but osbuild does not currently support this. Exiting here will
+// make systemd clean up the whole cgroup and restart this service.
+func WatchJob(ctx context.Context, client *worker.Client, job *worker.Job) {
+	for {
+		select {
+		case <-time.After(15 * time.Second):
+			if client.JobCanceled(job) {
+				log.Println("Job was canceled. Exiting.")
+				os.Exit(0)
+			}
+		case <-ctx.Done():
+			return
+		}
+	}
+}
+
 func main() {
 	var unix bool
 	flag.BoolVar(&unix, "unix", false, "Interpret 'address' as a path to a unix domain socket instead of a network address")
@@ -209,6 +230,9 @@ func main() {
 
 		fmt.Printf("Running job %s\n", job.Id)
 
+		ctx, cancel := context.WithCancel(context.Background())
+		go WatchJob(ctx, client, job)
+
 		var status common.ImageBuildState
 		result, err := RunJob(job, store, client.UploadImage)
 		if err != nil {
@@ -223,6 +247,9 @@ func main() {
 			status = common.IBFinished
 		}
 
+		// signal to WatchJob() that it can stop watching
+		cancel()
+
 		err = client.UpdateJob(job, status, result)
 		if err != nil {
 			log.Fatalf("Error reporting job result: %v", err)
diff --git a/distribution/osbuild-worker@.service b/distribution/osbuild-worker@.service
index 8b12a2ec0..b06cdb87d 100644
--- a/distribution/osbuild-worker@.service
+++ b/distribution/osbuild-worker@.service
@@ -7,8 +7,8 @@ After=multi-user.target osbuild-composer.socket
 Type=simple
 PrivateTmp=true
 ExecStart=/usr/libexec/osbuild-composer/osbuild-worker -unix /run/osbuild-composer/job.socket
-Restart=on-failure
-RestartSec=10s
+Restart=always
+RestartSec=1s
 CPUSchedulingPolicy=batch
 IOSchedulingClass=idle
 CacheDirectory=osbuild-worker