diff --git a/eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json b/eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json
index a6694042057e..dd423bc8a846 100644
--- a/eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json
+++ b/eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json
@@ -6,24 +6,10 @@
     "Agent": {
       "ubuntu-20.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" }
     },
-    "PythonVersion": [ "pypy3", "3.6", "3.7", "3.8", "3.9" ],
+    "PythonVersion": [ "pypy3", "3.7", "3.8", "3.9" ],
     "CoverageArg": "--disablecov"
   },
   "include": [
-    {
-      "Agent": {
-        "macOS-10.15": { "OSVmImage": "macOS-10.15", "Pool": "Azure Pipelines" }
-      },
-      "PythonVersion": "2.7",
-      "CoverageArg": "--disablecov"
-    },
-    {
-      "Agent": {
-        "windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" }
-      },
-      "PythonVersion": "3.6",
-      "CoverageArg": "--disablecov"
-    },
     {
       "Config": {
         "Ubuntu2004_310": {
diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json
index 31ed0b8e03e6..b25519516ece 100644
--- a/eng/pipelines/templates/stages/platform-matrix.json
+++ b/eng/pipelines/templates/stages/platform-matrix.json
@@ -10,7 +10,7 @@
       "windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" },
       "macOS-10.15": { "OSVmImage": "macOS-10.15", "Pool": "Azure Pipelines" }
     },
-    "PythonVersion": [ "pypy3", "2.7", "3.6", "3.7", "3.8" ],
+    "PythonVersion": [ "pypy3", "3.7", "3.8" ],
     "CoverageArg": "--disablecov",
     "TestSamples": "false"
   },
diff --git a/sdk/core/ci.yml b/sdk/core/ci.yml
index 3f029f1d8a48..77ac049ef0f1 100644
--- a/sdk/core/ci.yml
+++ b/sdk/core/ci.yml
@@ -31,6 +31,11 @@ extends:
   template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
   parameters:
     ServiceDirectory: core
+    MatrixConfigs:
+      - Name: core_ci_matrix
+        Path: sdk/core/platform-matrix.json
+        Selection: sparse
+        GenerateVMJobs: true
     Artifacts:
     - name: azure-core
       safeName: azurecore
diff --git a/sdk/core/platform-matrix.json b/sdk/core/platform-matrix.json
new file mode 100644
index 000000000000..8eedc22dc0be
--- /dev/null
+++ b/sdk/core/platform-matrix.json
@@ -0,0 +1,18 @@
+{
+    "matrix": {
+      "$IMPORT": "eng/pipelines/templates/stages/platform-matrix.json"
+    },
+    "include": [
+        {
+            "Config": {
+                "Ubuntu2004_py27": {
+                    "OSVmImage": "MMSUbuntu20.04",
+                    "Pool": "azsdk-pool-mms-ubuntu-2004-general",
+                    "PythonVersion": "2.7",
+                    "CoverageArg": "--disablecov",
+                    "TestSamples": "false"
+                }
+            }
+        }   
+    ]
+}
diff --git a/sdk/storage/platform-matrix-all-versions.json b/sdk/storage/platform-matrix-all-versions.json
index a2f787d4e5ba..fcc28d6fb689 100644
--- a/sdk/storage/platform-matrix-all-versions.json
+++ b/sdk/storage/platform-matrix-all-versions.json
@@ -10,7 +10,7 @@
           "windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" },
           "macOS-10.15": { "OSVmImage": "macOS-10.15", "Pool": "Azure Pipelines" }
         },
-        "PythonVersion": [ "pypy3", "2.7", "3.6", "3.7", "3.8", "3.9" ],
+        "PythonVersion": [ "pypy3", "3.7", "3.8", "3.9" ],
         "CoverageArg": "--disablecov",
         "TestSamples": "false",
         "AZURE_LIVE_TEST_SERVICE_VERSION": [