diff --git a/setup-s3-preview/action.yml b/setup-s3-preview/action.yml
index efebbd8..15b0c9e 100644
--- a/setup-s3-preview/action.yml
+++ b/setup-s3-preview/action.yml
@@ -52,6 +52,7 @@ runs:
         JOB_NAME: "prepare-s3-preview-${{ inputs.preview-number }}"
         CONFIGMAP_NAME: "${{ inputs.configmap-name }}"
         SECRET_NAME: "${{ inputs.secret-name }}"
+        PREVIEW_ROOT_FOLDER: "preview_${{ inputs.preview-number }}"
         S3_BUCKET_KEY: "${{ inputs.s3-bucket-key }}"
         S3_ENDPOINT_KEY: "${{ inputs.s3-endpoint-key }}"
         S3_REGION_KEY: "${{ inputs.s3-region-key }}"
@@ -59,12 +60,12 @@ runs:
         S3_FORCE_PATH_STYLE_ACCESS_KEY: "${{ inputs.s3-force-path-style-access-key }}"
         S3_ACCESS_KEY_KEY: "${{ inputs.s3-access-key-key }}"
         S3_SECRET_KEY_KEY: "${{ inputs.s3-secret-key-key }}"
-        PREVIEW_NUMBER: "${{ inputs.preview-number }}"
       run: |
         envsubst '
           $JOB_NAME
           $CONFIGMAP_NAME
           $SECRET_NAME
+          $PREVIEW_ROOT_FOLDER
           $S3_BUCKET_KEY
           $S3_ENDPOINT_KEY
           $S3_REGION_KEY
@@ -72,7 +73,6 @@ runs:
           $S3_FORCE_PATH_STYLE_ACCESS_KEY
           $S3_ACCESS_KEY_KEY
           $S3_SECRET_KEY_KEY
-          $PREVIEW_NUMBER
         ' < ${{ github.action_path }}/job-template.yml > job-setup-s3.yml
 
         echo "Prepared job manifest: job-setup-s3.yml"
diff --git a/setup-s3-preview/job-template.yml b/setup-s3-preview/job-template.yml
index 741abe2..9b1618e 100644
--- a/setup-s3-preview/job-template.yml
+++ b/setup-s3-preview/job-template.yml
@@ -36,8 +36,8 @@ spec:
                 S3_SOURCE_PREFIX="s3://$S3_BUCKET/"
               fi
 
-              S3_PREVIEW_PREFIX="s3://$S3_BUCKET/preview-${PREVIEW_NUMBER}/"
-              
+              S3_PREVIEW_PREFIX="s3://$S3_BUCKET/${PREVIEW_ROOT_FOLDER}/"
+
               echo "Checking if $S3_PREVIEW_PREFIX already exists..."
               if [ "$(aws s3 $S3_ARGS ls "$S3_PREVIEW_PREFIX" | wc -l)" -gt 0 ]; then
                 echo "$S3_PREVIEW_PREFIX already exists. Skipping setup."
@@ -90,5 +90,5 @@ spec:
                 secretKeyRef:
                   name: ${SECRET_NAME}
                   key: ${S3_SECRET_KEY_KEY}
-            - name: PREVIEW_NUMBER
-              value: "${PREVIEW_NUMBER}"
+            - name: PREVIEW_ROOT_FOLDER
+              value: "${PREVIEW_ROOT_FOLDER}"
diff --git a/teardown-s3-preview/action.yml b/teardown-s3-preview/action.yml
index d6a6d24..be89842 100644
--- a/teardown-s3-preview/action.yml
+++ b/teardown-s3-preview/action.yml
@@ -48,25 +48,25 @@ runs:
         JOB_NAME: "teardown-s3-preview-${{ inputs.preview-number }}"
         CONFIGMAP_NAME: "${{ inputs.configmap-name }}"
         SECRET_NAME: "${{ inputs.secret-name }}"
+        PREVIEW_ROOT_FOLDER: "preview_${{ inputs.preview-number }}"
         S3_BUCKET_KEY: "${{ inputs.s3-bucket-key }}"
         S3_ENDPOINT_KEY: "${{ inputs.s3-endpoint-key }}"
         S3_REGION_KEY: "${{ inputs.s3-region-key }}"
         S3_FORCE_PATH_STYLE_ACCESS_KEY: "${{ inputs.s3-force-path-style-access-key }}"
         S3_ACCESS_KEY_KEY: "${{ inputs.s3-access-key-key }}"
         S3_SECRET_KEY_KEY: "${{ inputs.s3-secret-key-key }}"
-        PREVIEW_NUMBER: "${{ inputs.preview-number }}"
       run: |
         envsubst '
           $JOB_NAME
           $CONFIGMAP_NAME
           $SECRET_NAME
+          $PREVIEW_ROOT_FOLDER
           $S3_BUCKET_KEY
           $S3_ENDPOINT_KEY
           $S3_REGION_KEY
           $S3_FORCE_PATH_STYLE_ACCESS_KEY
           $S3_ACCESS_KEY_KEY
           $S3_SECRET_KEY_KEY
-          $PREVIEW_NUMBER
         ' < ${{ github.action_path }}/job-template.yml > job-teardown-s3.yml
 
         echo "Prepared job manifest: job-teardown-s3.yml"
diff --git a/teardown-s3-preview/job-template.yml b/teardown-s3-preview/job-template.yml
index e153970..dc0e1ba 100644
--- a/teardown-s3-preview/job-template.yml
+++ b/teardown-s3-preview/job-template.yml
@@ -29,7 +29,7 @@ spec:
                 S3_ARGS="--endpoint-url $S3_ENDPOINT"
               fi
               
-              S3_PREVIEW_PREFIX="s3://$S3_BUCKET/preview-${PREVIEW_NUMBER}/"
+              S3_PREVIEW_PREFIX="s3://$S3_BUCKET/${PREVIEW_ROOT_FOLDER}/"
               
               echo "Checking if $S3_PREVIEW_PREFIX exists..."
               if [ "$(aws s3 $S3_ARGS ls "$S3_PREVIEW_PREFIX" | wc -l)" -eq 0 ]; then
@@ -77,5 +77,5 @@ spec:
                 secretKeyRef:
                   name: ${SECRET_NAME}
                   key: ${S3_SECRET_KEY_KEY}
-            - name: PREVIEW_NUMBER
-              value: "${PREVIEW_NUMBER}"
+            - name: PREVIEW_ROOT_FOLDER
+              value: "${PREVIEW_ROOT_FOLDER}"