diff --git a/install/kots/manifests/gitpod-installer-job.yaml b/install/kots/manifests/gitpod-installer-job.yaml
index 771cb0b6281515..2559cf7231b93f 100644
--- a/install/kots/manifests/gitpod-installer-job.yaml
+++ b/install/kots/manifests/gitpod-installer-job.yaml
@@ -202,6 +202,7 @@ spec:
                   echo "Gitpod: configuring storage for S3"
 
                   yq e -i ".objectStorage.s3.endpoint = \"{{repl ConfigOption "store_s3_endpoint" }}\"" "${CONFIG_FILE}"
+                  yq e -i ".objectStorage.s3.bucket = \"{{repl ConfigOption "store_s3_bucket" }}\"" "${CONFIG_FILE}"
                   yq e -i ".objectStorage.s3.credentials.kind = \"secret\"" "${CONFIG_FILE}"
                   yq e -i ".objectStorage.s3.credentials.name = \"storage-s3\"" "${CONFIG_FILE}"
                 fi
diff --git a/install/kots/manifests/kots-config.yaml b/install/kots/manifests/kots-config.yaml
index 21bfb98d946ff7..a752dae3626a26 100644
--- a/install/kots/manifests/kots-config.yaml
+++ b/install/kots/manifests/kots-config.yaml
@@ -241,6 +241,13 @@ spec:
           when: '{{repl (ConfigOptionEquals "store_provider" "s3") }}'
           help_text: The endpoint used to connect to the S3 storage.
 
+        - name: store_s3_bucket
+          title: S3 bucket name
+          type: text
+          required: false
+          when: '{{repl (ConfigOptionEquals "store_provider" "s3") }}'
+          help_text: Name of S3 bucket to be used as storage. If left empty, Gitpod will create bucket per each user. If set, then all data will be stored inside one bucket.
+
         - name: store_s3_access_key_id
           title: Access Key
           type: text