diff --git a/.github/workflows/s3-regression-tests.yml b/.github/workflows/s3-regression-tests.yml
index bae74ac51682..11620054d7dd 100644
--- a/.github/workflows/s3-regression-tests.yml
+++ b/.github/workflows/s3-regression-tests.yml
@@ -1,6 +1,7 @@
 name: S3 Regression Tests
 on:
   pull_request:
+    types: [ opened, synchronize, reopened, labeled, unlabeled ]
   merge_group:
   push:
     branches:
@@ -14,7 +15,7 @@ jobs:
     if: github.repository == 'aws/aws-sdk-java-v2'
     runs-on: ubuntu-latest
     outputs:
-      has_s3_related_changes: ${{ steps.check-changes.outputs.has_s3_related_changes }}
+      run_tests: ${{ contains(github.event.pull_request.labels.*.name, 'force-s3-regression-tests') || steps.check-changes.outputs.has_s3_related_changes }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -40,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       REGRESSION_TEST: DownloadStreamingRegressionTesting
-      HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.has_s3_related_changes }}
+      HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.run_tests }}
     steps:
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -61,7 +62,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       REGRESSION_TEST: ControlPlaneOperationRegressionTesting
-      HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.has_s3_related_changes }}
+      HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.run_tests }}
     steps:
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -82,7 +83,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       REGRESSION_TEST: UploadSyncRegressionTesting
-      HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.has_s3_related_changes }}
+      HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.run_tests }}
     steps:
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -103,7 +104,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       REGRESSION_TEST: UploadAsyncRegressionTesting
-      HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.has_s3_related_changes }}
+      HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.run_tests }}
     steps:
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -124,7 +125,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       REGRESSION_TEST: UploadCrtRegressionTesting
-      HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.has_s3_related_changes }}
+      HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.run_tests }}
     steps:
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -145,7 +146,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       REGRESSION_TEST: UploadTransferManagerRegressionTesting
-      HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.has_s3_related_changes }}
+      HAS_S3_CHANGES: ${{ needs.check-s3-related-changes.outputs.run_tests }}
     steps:
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
diff --git a/buildspecs/s3-regression-tests.yml b/buildspecs/s3-regression-tests.yml
index e030cc3a7098..06f307f756c4 100644
--- a/buildspecs/s3-regression-tests.yml
+++ b/buildspecs/s3-regression-tests.yml
@@ -12,7 +12,6 @@ phases:
           exit 0
         fi
         mvn clean install -P s3-regression-tests -pl :s3-tests -am -T1C -Dregression.test="$REGRESSION_TEST" $MAVEN_OPTIONS
-        echo $MAVEN_OPTIONS
     finally:
       - mkdir -p codebuild-test-reports
       - find ./ -name 'TEST-*.xml' -type f -exec cp {} codebuild-test-reports/ \;
diff --git a/test/s3-tests/src/it/java/software/amazon/awssdk/services/s3/regression/upload/UploadConfig.java b/test/s3-tests/src/it/java/software/amazon/awssdk/services/s3/regression/upload/UploadConfig.java
index 308558db4999..cc197a225317 100644
--- a/test/s3-tests/src/it/java/software/amazon/awssdk/services/s3/regression/upload/UploadConfig.java
+++ b/test/s3-tests/src/it/java/software/amazon/awssdk/services/s3/regression/upload/UploadConfig.java
@@ -40,13 +40,15 @@ public static List<UploadConfig> testConfigs() {
                 for (UploadStreamingRegressionTesting.ContentSize cs :
                     UploadStreamingRegressionTesting.ContentSize.values()) {
                     for (boolean ps : payloadSign) {
-                        UploadConfig testConfig = new UploadConfig();
-                        testConfig.setRequestChecksumValidation(checksumValidation);
-                        testConfig.setBodyType(bodType);
-                        testConfig.setContentSize(cs);
-                        testConfig.setPayloadSigning(ps);
-                        testConfig.setBucketType(BucketType.STANDARD_BUCKET);
-                        configs.add(testConfig);
+                        for (BucketType bucketType : BucketType.values()) {
+                            UploadConfig testConfig = new UploadConfig();
+                            testConfig.setRequestChecksumValidation(checksumValidation);
+                            testConfig.setBodyType(bodType);
+                            testConfig.setContentSize(cs);
+                            testConfig.setPayloadSigning(ps);
+                            testConfig.setBucketType(bucketType);
+                            configs.add(testConfig);
+                        }
                     }
                 }
             }