diff --git a/eng/common/pipelines/templates/jobs/archetype-sdk-tests-generate.yml b/eng/common/pipelines/templates/jobs/archetype-sdk-tests-generate.yml
index 9b823b2c7..0ad592b07 100644
--- a/eng/common/pipelines/templates/jobs/archetype-sdk-tests-generate.yml
+++ b/eng/common/pipelines/templates/jobs/archetype-sdk-tests-generate.yml
@@ -63,10 +63,10 @@ jobs:
             arguments: >
               -ConfigPath ${{ config.Path }}
               -Selection ${{ config.Selection }}
-              -DisplayNameFilter "$(displayNameFilter)"
-              -Filters "${{ join('","', parameters.MatrixFilters) }}","container=^$","SupportedClouds=^$|${{ parameters.CloudConfig.Cloud }}"
-              -Replace "${{ join('","', parameters.MatrixReplace) }}"
-              -NonSparseParameters "${{ join('","', config.NonSparseParameters) }}"
+              -DisplayNameFilter '$(displayNameFilter)'
+              -Filters '${{ join(''',''', parameters.MatrixFilters) }}','container=^$','SupportedClouds=^$|${{ parameters.CloudConfig.Cloud }}'
+              -Replace '${{ join(''',''', parameters.MatrixReplace) }}'
+              -NonSparseParameters '${{ join(''',''', config.NonSparseParameters) }}'
           displayName: Generate VM Job Matrix ${{ config.Name }}
           name: generate_vm_job_matrix_${{ config.Name }}
 
@@ -78,9 +78,9 @@ jobs:
             arguments: >
               -ConfigPath ${{ config.Path }}
               -Selection ${{ config.Selection }}
-              -DisplayNameFilter "$(displayNameFilter)"
-              -Filters "${{ join('","', parameters.MatrixFilters) }}", "container=.*", "SupportedClouds=^$|${{ parameters.CloudConfig.Cloud }}"
-              -NonSparseParameters "${{ join('","', config.NonSparseParameters) }}"
+              -DisplayNameFilter '$(displayNameFilter)'
+              -Filters '${{ join(''',''', parameters.MatrixFilters) }}', 'container=.*', 'SupportedClouds=^$|${{ parameters.CloudConfig.Cloud }}'
+              -NonSparseParameters '${{ join(''',''', config.NonSparseParameters) }}'
           displayName: Generate Container Job Matrix
           name: generate_container_job_matrix_${{ config.Name }}
 
diff --git a/eng/common/scripts/job-matrix/samples/matrix-test.yml b/eng/common/scripts/job-matrix/samples/matrix-test.yml
index 4006e05f7..b1831293a 100644
--- a/eng/common/scripts/job-matrix/samples/matrix-test.yml
+++ b/eng/common/scripts/job-matrix/samples/matrix-test.yml
@@ -18,7 +18,7 @@ jobs:
         # Exclusion example
         - OSVmImage=^(?!macOS).*
       MatrixReplace:
-        - OsVmImage=.*ubuntu.*/ubuntu-20.04
+        - OsVmImage=(ubuntu).*/$1-20.04
         - .*Framework.*=net5.0/net5.1
       MatrixConfigs:
         - Name: base_product_matrix