diff --git a/cmd/image-builder/build.go b/cmd/image-builder/build.go
index c3cf145..2b7e156 100644
--- a/cmd/image-builder/build.go
+++ b/cmd/image-builder/build.go
@@ -5,15 +5,24 @@ import (
 	"github.com/osbuild/images/pkg/osbuild"
 )
 
-func buildImage(res *imagefilter.Result, osbuildManifest []byte, osbuildStoreDir, outputDir string) error {
+type buildOptions struct {
+	OutputDir string
+	StoreDir  string
+}
+
+func buildImage(res *imagefilter.Result, osbuildManifest []byte, opts *buildOptions) error {
+	if opts == nil {
+		opts = &buildOptions{}
+	}
+
 	// XXX: support output filename via commandline (c.f.
 	//   https://github.com/osbuild/images/pull/1039)
-	if outputDir == "" {
-		outputDir = outputDirFor(res)
+	if opts.OutputDir == "" {
+		opts.OutputDir = outputDirFor(res)
 	}
 
 	// XXX: support stremaing via images/pkg/osbuild/monitor.go
-	_, err := osbuild.RunOSBuild(osbuildManifest, osbuildStoreDir, outputDir, res.ImgType.Exports(), nil, nil, false, osStderr)
+	_, err := osbuild.RunOSBuild(osbuildManifest, opts.StoreDir, opts.OutputDir, res.ImgType.Exports(), nil, nil, false, osStderr)
 	return err
 
 }
diff --git a/cmd/image-builder/main.go b/cmd/image-builder/main.go
index 1c5f8aa..a0b9dff 100644
--- a/cmd/image-builder/main.go
+++ b/cmd/image-builder/main.go
@@ -171,7 +171,11 @@ func cmdBuild(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	return buildImage(res, mf.Bytes(), storeDir, outputDir)
+	buildOpts := &buildOptions{
+		OutputDir: outputDir,
+		StoreDir:  storeDir,
+	}
+	return buildImage(res, mf.Bytes(), buildOpts)
 }
 
 func run() error {