diff --git a/internal/jobqueue/client.go b/internal/jobqueue/client.go
index 4fd6678ac..b9f1f4f1f 100644
--- a/internal/jobqueue/client.go
+++ b/internal/jobqueue/client.go
@@ -12,7 +12,11 @@ import (
 	"net"
 	"net/http"
 
+	"github.com/google/uuid"
+
 	"github.com/osbuild/osbuild-composer/internal/common"
+	"github.com/osbuild/osbuild-composer/internal/osbuild"
+	"github.com/osbuild/osbuild-composer/internal/target"
 )
 
 type Client struct {
@@ -21,6 +25,13 @@ type Client struct {
 	hostname string
 }
 
+type Job struct {
+	ComposeID    uuid.UUID
+	ImageBuildID int
+	Manifest     *osbuild.Manifest
+	Targets      []*target.Target
+}
+
 func NewClient(address string, conf *tls.Config) *Client {
 	client := &http.Client{
 		Transport: &http.Transport{
@@ -77,7 +88,12 @@ func (c *Client) AddJob() (*Job, error) {
 		return nil, err
 	}
 
-	return NewJob(jr.ComposeID, jr.ImageBuildID, jr.Manifest, jr.Targets), nil
+	return &Job{
+		jr.ComposeID,
+		jr.ImageBuildID,
+		jr.Manifest,
+		jr.Targets,
+	}, nil
 }
 
 func (c *Client) UpdateJob(job *Job, status common.ImageBuildState, result *common.ComposeResult) error {
diff --git a/internal/jobqueue/job.go b/internal/jobqueue/job.go
deleted file mode 100644
index 83f3e1719..000000000
--- a/internal/jobqueue/job.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package jobqueue
-
-import (
-	"github.com/google/uuid"
-
-	"github.com/osbuild/osbuild-composer/internal/osbuild"
-	"github.com/osbuild/osbuild-composer/internal/target"
-)
-
-type Job struct {
-	ComposeID    uuid.UUID
-	ImageBuildID int
-	Manifest     *osbuild.Manifest
-	Targets      []*target.Target
-}
-
-func NewJob(id uuid.UUID, imageBuildID int, manifest *osbuild.Manifest, targets []*target.Target) *Job {
-	return &Job{id, imageBuildID, manifest, targets}
-}