diff --git a/cmd/osbuild-worker/main.go b/cmd/osbuild-worker/main.go
index aeef105dd..d851396ed 100644
--- a/cmd/osbuild-worker/main.go
+++ b/cmd/osbuild-worker/main.go
@@ -55,7 +55,7 @@ func handleJob(client *jobqueue.Client) error {
 		return err
 	}
 
-	fmt.Printf("Running job %s\n", job.ID.String())
+	fmt.Printf("Running job %s\n", job.ComposeID.String())
 	result, err := job.Run(client)
 	if err != nil {
 		log.Printf("  Job failed: %v", err)
diff --git a/internal/jobqueue/api.go b/internal/jobqueue/api.go
index 57fd78bad..4447628df 100644
--- a/internal/jobqueue/api.go
+++ b/internal/jobqueue/api.go
@@ -103,7 +103,7 @@ func (api *API) addJobHandler(writer http.ResponseWriter, request *http.Request,
 	writer.WriteHeader(http.StatusCreated)
 	// FIXME: handle or comment this possible error
 	_ = json.NewEncoder(writer).Encode(addJobResponse{
-		ID:           nextJob.ComposeID,
+		ComposeID:    nextJob.ComposeID,
 		ImageBuildID: nextJob.ImageBuildID,
 		Manifest:     nextJob.Manifest,
 		Targets:      nextJob.Targets,
diff --git a/internal/jobqueue/api_test.go b/internal/jobqueue/api_test.go
index 382dccbe0..ed097d01a 100644
--- a/internal/jobqueue/api_test.go
+++ b/internal/jobqueue/api_test.go
@@ -57,7 +57,7 @@ func TestCreate(t *testing.T) {
 	}
 
 	test.TestRoute(t, api, false, "POST", "/job-queue/v1/jobs", `{}`, http.StatusCreated,
-		`{"id":"`+id.String()+`","image_build_id":0,"manifest":{"sources":{},"pipeline":{}},"targets":[]}`, "created")
+		`{"compose_id":"`+id.String()+`","image_build_id":0,"manifest":{"sources":{},"pipeline":{}},"targets":[]}`, "created")
 }
 
 func testUpdateTransition(t *testing.T, from, to string, expectedStatus int, expectedResponse string) {
diff --git a/internal/jobqueue/client.go b/internal/jobqueue/client.go
index 25d80f1d6..4fd6678ac 100644
--- a/internal/jobqueue/client.go
+++ b/internal/jobqueue/client.go
@@ -77,7 +77,7 @@ func (c *Client) AddJob() (*Job, error) {
 		return nil, err
 	}
 
-	return NewJob(jr.ID, jr.ImageBuildID, jr.Manifest, jr.Targets), nil
+	return NewJob(jr.ComposeID, jr.ImageBuildID, jr.Manifest, jr.Targets), nil
 }
 
 func (c *Client) UpdateJob(job *Job, status common.ImageBuildState, result *common.ComposeResult) error {
@@ -86,7 +86,7 @@ func (c *Client) UpdateJob(job *Job, status common.ImageBuildState, result *comm
 	if err != nil {
 		panic(err)
 	}
-	urlPath := fmt.Sprintf("/job-queue/v1/jobs/%s/builds/%d", job.ID.String(), job.ImageBuildID)
+	urlPath := fmt.Sprintf("/job-queue/v1/jobs/%s/builds/%d", job.ComposeID.String(), job.ImageBuildID)
 	url := c.createURL(urlPath)
 	req, err := http.NewRequest("PATCH", url, &b)
 	if err != nil {
@@ -109,7 +109,7 @@ func (c *Client) UpdateJob(job *Job, status common.ImageBuildState, result *comm
 
 func (c *Client) UploadImage(job *Job, reader io.Reader) error {
 	// content type doesn't really matter
-	url := c.createURL(fmt.Sprintf("/job-queue/v1/jobs/%s/builds/%d/image", job.ID.String(), job.ImageBuildID))
+	url := c.createURL(fmt.Sprintf("/job-queue/v1/jobs/%s/builds/%d/image", job.ComposeID.String(), job.ImageBuildID))
 	_, err := c.client.Post(url, "application/octet-stream", reader)
 
 	return err
diff --git a/internal/jobqueue/job.go b/internal/jobqueue/job.go
index 7e3412afb..69041a52d 100644
--- a/internal/jobqueue/job.go
+++ b/internal/jobqueue/job.go
@@ -18,7 +18,7 @@ import (
 )
 
 type Job struct {
-	ID           uuid.UUID         `json:"id"`
+	ComposeID    uuid.UUID         `json:"id"`
 	ImageBuildID int               `json:"image_build_id"`
 	Manifest     *osbuild.Manifest `json:"manifest"`
 	Targets      []*target.Target  `json:"targets"`
@@ -116,7 +116,7 @@ func (job *Job) Run(uploader LocalTargetUploader) (*common.ComposeResult, error)
 			}
 
 			if options.Key == "" {
-				options.Key = job.ID.String()
+				options.Key = job.ComposeID.String()
 			}
 
 			_, err = a.Upload(path.Join(tmpStore, "refs", result.OutputID, options.Filename), options.Bucket, options.Key)
diff --git a/internal/jobqueue/json.go b/internal/jobqueue/json.go
index c65304e5a..f324479cd 100644
--- a/internal/jobqueue/json.go
+++ b/internal/jobqueue/json.go
@@ -9,7 +9,7 @@ import (
 )
 
 type addJobResponse struct {
-	ID           uuid.UUID         `json:"id"`
+	ComposeID    uuid.UUID         `json:"compose_id"`
 	ImageBuildID int               `json:"image_build_id"`
 	Manifest     *osbuild.Manifest `json:"manifest"`
 	Targets      []*target.Target  `json:"targets"`