diff --git a/.github/workflows/test-mlperf-inference-submission-generation.yml b/.github/workflows/test-mlperf-inference-submission-generation.yml
index f4ea7df13..22c1b81e3 100644
--- a/.github/workflows/test-mlperf-inference-submission-generation.yml
+++ b/.github/workflows/test-mlperf-inference-submission-generation.yml
@@ -30,71 +30,41 @@ jobs:
         division: ["closed", "open", "closed-open"]
         category: ["datacenter", "edge"]
         round: ["5.0", "5.1"]
-        case: ["closed"]
+        folder_name: ["closed", "open"]
         action: ["run", "docker"]
         exclude:
           - os: macos-latest
           - os: windows-latest
           - category: "edge"
-          - case: "closed-edge"
         include:
           - os: ubuntu-latest
             python-version: "3.12"
             division: "closed"
             category: "edge"
             round: "5.0"
-            case: "closed-edge"
+            folder_name: "closed-edge"
             action: "run"
           - os: ubuntu-latest
             python-version: "3.12"
             division: "closed"
             category: "edge"
             round: "5.0"
-            case: "closed-edge"
+            folder_name: "closed-edge"
             action: "docker"
           - os: ubuntu-latest
             python-version: "3.12"
             division: "open"
             category: "edge"
             round: "5.0"
-            case: "closed-edge"
+            folder_name: "closed-edge"
             action: "run"
           - os: ubuntu-latest
             python-version: "3.12"
             division: "open"
             category: "edge"
             round: "5.0"
-            case: "closed-edge"
+            folder_name: "closed-edge"
             action: "docker"
-          - os: ubuntu-latest
-            python-version: "3.12"
-            division: "closed"
-            category: "edge"
-            round: "5.1"
-            case: "closed-edge"
-            action: "run"
-          - os: ubuntu-latest
-            python-version: "3.12"
-            division: "closed"
-            category: "edge"
-            round: "5.1"
-            case: "closed-edge"
-            action: "docker"
-          - os: ubuntu-latest
-            python-version: "3.12"
-            division: "open"
-            category: "edge"
-            round: "5.1"
-            case: "closed-edge"
-            action: "run"
-          - os: ubuntu-latest
-            python-version: "3.12"
-            division: "open"
-            category: "edge"
-            round: "5.1"
-            case: "closed-edge"
-            action: "docker"
-
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
@@ -115,11 +85,11 @@ jobs:
     - name: Pull repo where test cases are uploaded
       run: |
         git clone -b submission-generation-examples https://github.com/mlcommons/inference.git submission_generation_examples
-    - name: Run Submission Generation - round-${{ matrix.round }}${{ matrix.case }} ${{ matrix.action }} ${{ matrix.category }} ${{ matrix.division }} 
+    - name: Run Submission Generation - round-${{ matrix.round }}${{ matrix.folder_name }} ${{ matrix.action }} ${{ matrix.category }} ${{ matrix.division }} 
       run: |
-        if [ "${{ matrix.case }}" == "closed" ]; then
+        if [ "${{ matrix.folder_name }}" == "closed" ]; then
           description="Test submission - contains closed edge and datacenter"
-        elif [ "${{ matrix.case }}" == "closed-power" ]; then
+        elif [ "${{ matrix.folder_name }}" == "closed-power" ]; then
           description="Test submission - contains closed-power edge and datacenter results"
         fi
         # Dynamically set the log group to simulate a dynamic step name
@@ -131,10 +101,10 @@ jobs:
         fi
 
         if [ -n "${{ inputs.repo-url }}" ]; then
-          mlc ${{ matrix.action }} script --tags=generate,inference,submission --adr.compiler.tags=gcc --version=v${{ matrix.round }} --clean --preprocess_submission=yes --submission_base_dir=mysubmissions --results_dir=$PWD/submission_generation_examples/submission_round_${{ matrix.round }}/${{ matrix.case }}/ --run_checker --submitter=MLCommons --tar=yes --division=${{ matrix.division }} --env.MLC_DETERMINE_MEMORY_CONFIGURATION=yes --quiet --adr.inference-src.tags=_repo.${{ inputs.repo-url }},_branch.${{ inputs.ref }} $docker_tags
+          mlc ${{ matrix.action }} script --tags=generate,inference,submission --adr.compiler.tags=gcc --version=v${{ matrix.round }} --clean --preprocess_submission=yes --submission_base_dir=mysubmissions --results_dir=$PWD/submission_generation_examples/submission_round_${{ matrix.round }}/${{ matrix.folder_name }}/ --run_checker --submitter=MLCommons --tar=yes --division=${{ matrix.division }} --env.MLC_DETERMINE_MEMORY_CONFIGURATION=yes --quiet --adr.inference-src.tags=_repo.${{ inputs.repo-url }},_branch.${{ inputs.ref }} $docker_tags
           mlc ${{ matrix.action }} script --tags=run,inference,submission,checker --submitter_id_off=mysubmitter_id --tar=yes --submission_dir=mysubmissions/mlperf_submission --submission_tar_file=mysubmission.tar.gz --quiet --src_version=v${{ matrix.round }} --adr.inference-src.tags=_repo.${{ inputs.repo-url }},_branch.${{ inputs.ref }} $docker_tags
         else
-          mlc ${{ matrix.action }} script --tags=generate,inference,submission --adr.compiler.tags=gcc --version=v${{ matrix.round }} --clean --preprocess_submission=yes --submission_base_dir=mysubmissions --results_dir=$PWD/submission_generation_examples/submission_round_${{ matrix.round }}/${{ matrix.case }}/ --run_checker --submitter=MLCommons --tar=yes --division=${{ matrix.division }} --env.MLC_DETERMINE_MEMORY_CONFIGURATION=yes --quiet $docker_tags
+          mlc ${{ matrix.action }} script --tags=generate,inference,submission --adr.compiler.tags=gcc --version=v${{ matrix.round }} --clean --preprocess_submission=yes --submission_base_dir=mysubmissions --results_dir=$PWD/submission_generation_examples/submission_round_${{ matrix.round }}/${{ matrix.folder_name }}/ --run_checker --submitter=MLCommons --tar=yes --division=${{ matrix.division }} --env.MLC_DETERMINE_MEMORY_CONFIGURATION=yes --quiet $docker_tags
           mlc ${{ matrix.action }} script --tags=run,inference,submission,checker --submitter_id_off=mysubmitter_id --tar=yes --submission_dir=mysubmissions/mlperf_submission --submission_tar_file=mysubmission.tar.gz --quiet --src_version=v${{ matrix.round }} $docker_tags
         fi