diff --git a/internal/worker/json.go b/internal/worker/json.go
index 3288281c0..46831d549 100644
--- a/internal/worker/json.go
+++ b/internal/worker/json.go
@@ -20,7 +20,6 @@ type OSBuildJob struct {
 	// Index of the ManifestJobByIDResult instance in the job's dynamic arguments slice
 	ManifestDynArgsIdx *int             `json:"manifest_dyn_args_idx,omitempty"`
 	Targets            []*target.Target `json:"targets,omitempty"`
-	ImageName          string           `json:"image_name,omitempty"`
 	Exports            []string         `json:"export_stages,omitempty"`
 	PipelineNames      *PipelineNames   `json:"pipeline_names,omitempty"`
 }
diff --git a/internal/worker/server_test.go b/internal/worker/server_test.go
index 1e8980ddd..c8363fe13 100644
--- a/internal/worker/server_test.go
+++ b/internal/worker/server_test.go
@@ -20,6 +20,7 @@ import (
 	"github.com/osbuild/osbuild-composer/internal/jobqueue/fsjobqueue"
 	"github.com/osbuild/osbuild-composer/internal/osbuild2"
 	"github.com/osbuild/osbuild-composer/internal/rpmmd"
+	"github.com/osbuild/osbuild-composer/internal/target"
 	"github.com/osbuild/osbuild-composer/internal/test"
 	"github.com/osbuild/osbuild-composer/internal/worker"
 	"github.com/osbuild/osbuild-composer/internal/worker/clienterrors"
@@ -223,12 +224,20 @@ func TestArgs(t *testing.T) {
 	server := newTestServer(t, t.TempDir(), time.Duration(0), "/api/worker/v1", false)
 
 	job := worker.OSBuildJob{
-		Manifest:  manifest,
-		ImageName: "test-image",
+		Manifest: manifest,
+		Exports:  []string{"assembler"},
 		PipelineNames: &worker.PipelineNames{
 			Build:   []string{"b"},
 			Payload: []string{"x", "y", "z"},
 		},
+		Targets: []*target.Target{
+			{
+				Name:           target.TargetNameWorkerServer,
+				ImageName:      "test-image",
+				ExportFilename: "test-image",
+				Options:        &target.WorkerServerTargetOptions{},
+			},
+		},
 	}
 	jobId, err := server.EnqueueOSBuild(arch.Name(), &job, "")
 	require.NoError(t, err)
@@ -399,19 +408,35 @@ func TestMixedOSBuildJob(t *testing.T) {
 	fbPipelines := &worker.PipelineNames{Build: distro.BuildPipelinesFallback(), Payload: distro.PayloadPipelinesFallback()}
 
 	oldJob := worker.OSBuildJob{
-		Manifest:  emptyManifestV2,
-		ImageName: "no-pipeline-names",
+		Manifest: emptyManifestV2,
+		Exports:  []string{"assembler"},
+		Targets: []*target.Target{
+			{
+				Name:           target.TargetNameWorkerServer,
+				ImageName:      "no-pipeline-names",
+				ExportFilename: "no-pipeline-names",
+				Options:        &target.WorkerServerTargetOptions{},
+			},
+		},
 	}
 	oldJobID, err := server.EnqueueOSBuild("x", &oldJob, "")
 	require.NoError(err)
 
 	newJob := worker.OSBuildJob{
-		Manifest:  emptyManifestV2,
-		ImageName: "with-pipeline-names",
+		Manifest: emptyManifestV2,
+		Exports:  []string{"assembler"},
 		PipelineNames: &worker.PipelineNames{
 			Build:   []string{"build"},
 			Payload: []string{"other", "pipelines"},
 		},
+		Targets: []*target.Target{
+			{
+				Name:           target.TargetNameWorkerServer,
+				ImageName:      "with-pipeline-names",
+				ExportFilename: "with-pipeline-names",
+				Options:        &target.WorkerServerTargetOptions{},
+			},
+		},
 	}
 	newJobID, err := server.EnqueueOSBuild("x", &newJob, "")
 	require.NoError(err)
@@ -423,7 +448,7 @@ func TestMixedOSBuildJob(t *testing.T) {
 	// OldJob gets default pipeline names when read
 	require.Equal(fbPipelines, oldJobRead.PipelineNames)
 	require.Equal(oldJob.Manifest, oldJobRead.Manifest)
-	require.Equal(oldJob.ImageName, oldJobRead.ImageName)
+	require.Equal(oldJob.Targets, oldJobRead.Targets)
 	// Not entirely equal
 	require.NotEqual(oldJob, oldJobRead)