diff --git a/internal/cloudapi/v2/server.go b/internal/cloudapi/v2/server.go
index 9c95002f5..b409997ae 100644
--- a/internal/cloudapi/v2/server.go
+++ b/internal/cloudapi/v2/server.go
@@ -14,9 +14,10 @@ import (
 	"github.com/google/uuid"
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
-	"github.com/osbuild/osbuild-composer/pkg/jobqueue"
 	"github.com/sirupsen/logrus"
 
+	"github.com/osbuild/osbuild-composer/pkg/jobqueue"
+
 	"github.com/osbuild/osbuild-composer/internal/blueprint"
 	"github.com/osbuild/osbuild-composer/internal/common"
 	"github.com/osbuild/osbuild-composer/internal/container"
@@ -185,7 +186,7 @@ func (s *Server) enqueueCompose(distribution distro.Distro, bp blueprint.Bluepri
 
 func (s *Server) enqueueKojiCompose(taskID uint64, server, name, version, release string, distribution distro.Distro, bp blueprint.Blueprint, manifestSeed int64, irs []imageRequest, channel string) (uuid.UUID, error) {
 	var id uuid.UUID
-	kojiDirectory := "osbuild-composer-koji-" + uuid.New().String()
+	kojiDirectory := "osbuild-cg/osbuild-composer-koji-" + uuid.New().String()
 
 	initID, err := s.workers.EnqueueKojiInit(&worker.KojiInitJob{
 		Server:  server,