diff --git a/internal/cloudapi/v2/handler.go b/internal/cloudapi/v2/handler.go
index ea745bc51..b0b2310c4 100644
--- a/internal/cloudapi/v2/handler.go
+++ b/internal/cloudapi/v2/handler.go
@@ -448,10 +448,14 @@ func (h *apiHandlers) PostCompose(ctx echo.Context) error {
 				}
 
 				imageName := fmt.Sprintf("composer-api-%s", uuid.New().String())
+				var bucket string
+				if gcpUploadOptions.Bucket != nil {
+					bucket = *gcpUploadOptions.Bucket
+				}
 				t := target.NewGCPTarget(&target.GCPTargetOptions{
 					Region: gcpUploadOptions.Region,
 					Os:     imageType.Arch().Distro().Name(), // not exposed in cloudapi
-					Bucket: gcpUploadOptions.Bucket,
+					Bucket: bucket,
 					// the uploaded object must have a valid extension
 					Object:            fmt.Sprintf("%s.tar.gz", imageName),
 					ShareWithAccounts: share,
diff --git a/internal/cloudapi/v2/openapi.v2.gen.go b/internal/cloudapi/v2/openapi.v2.gen.go
index f6ca45469..f1717d7de 100644
--- a/internal/cloudapi/v2/openapi.v2.gen.go
+++ b/internal/cloudapi/v2/openapi.v2.gen.go
@@ -339,7 +339,7 @@ type Filesystem struct {
 // GCPUploadOptions defines model for GCPUploadOptions.
 type GCPUploadOptions struct {
 	// Name of an existing STANDARD Storage class Bucket.
-	Bucket string `json:"bucket"`
+	Bucket *string `json:"bucket,omitempty"`
 
 	// The name to use for the imported and shared Compute Engine image.
 	// The image name must be unique within the GCP project, which is used
@@ -836,74 +836,74 @@ var swaggerSpec = []string{
 	"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",
-	"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",
-	"vn3//wEAAP//qIL3tG9rAAA=",
+	"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",
+	"/wEAAP//PejbA2ZrAAA=",
 }
 
 // GetSwagger returns the content of the embedded swagger specification file
diff --git a/internal/cloudapi/v2/openapi.v2.yml b/internal/cloudapi/v2/openapi.v2.yml
index cf6967052..1a0674446 100644
--- a/internal/cloudapi/v2/openapi.v2.yml
+++ b/internal/cloudapi/v2/openapi.v2.yml
@@ -862,7 +862,6 @@ components:
       type: object
       required:
         - region
-        - bucket
       properties:
         region:
           type: string
diff --git a/test/cases/api/gcp.sh b/test/cases/api/gcp.sh
index d88877c8a..1d9f8c454 100644
--- a/test/cases/api/gcp.sh
+++ b/test/cases/api/gcp.sh
@@ -78,7 +78,6 @@ function createReqFile() {
     "image_type": "${IMAGE_TYPE}",
     "repositories": $(jq ".\"$ARCH\"" /usr/share/tests/osbuild-composer/repositories/"$DISTRO".json),
     "upload_options": {
-      "bucket": "${GCP_BUCKET}",
       "region": "${GCP_REGION}",
       "image_name": "${GCP_IMAGE_NAME}",
       "share_with_accounts": ["${GCP_API_TEST_SHARE_ACCOUNT}"]
diff --git a/tools/provision.sh b/tools/provision.sh
index dc2c0cd12..93f8cccbd 100755
--- a/tools/provision.sh
+++ b/tools/provision.sh
@@ -87,7 +87,12 @@ EOF
         # it into /tmp and as a result, the worker would not see it due to using PrivateTmp=true.
         GCP_CREDS_WORKER_PATH="/etc/osbuild-worker/gcp-credentials.json"
         sudo cp "$GOOGLE_APPLICATION_CREDENTIALS" "$GCP_CREDS_WORKER_PATH"
-        echo -e "\n[gcp]\ncredentials = \"$GCP_CREDS_WORKER_PATH\"\n" | sudo tee -a /etc/osbuild-worker/osbuild-worker.toml
+        sudo tee -a /etc/osbuild-worker/osbuild-worker.toml > /dev/null << EOF
+
+[gcp]
+credentials = "$GCP_CREDS_WORKER_PATH"
+bucket = "$GCP_BUCKET"
+EOF
     fi
 
     # if Azure credentials are defined in the env, create the credentials file