diff --git a/eng/pipelines/templates/stages/platform-matrix-conda-support.json b/eng/pipelines/templates/stages/platform-matrix-conda-support.json
index 718a0c14a35f..2b4beb8f52f0 100644
--- a/eng/pipelines/templates/stages/platform-matrix-conda-support.json
+++ b/eng/pipelines/templates/stages/platform-matrix-conda-support.json
@@ -1,7 +1,7 @@
 {
   "matrix": {
     "Agent": {
-      "ubuntu-18.04": { "OSVmImage": "MMSUbuntu18.04", "Pool": "azsdk-pool-mms-ubuntu-1804-general" },
+      "ubuntu-18.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" },
       "windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" }
     },
     "PythonVersion": [ "3.6", "3.8", "3.9" ]
diff --git a/eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json b/eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json
index 6c61b0415c97..e0dc21e21127 100644
--- a/eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json
+++ b/eng/pipelines/templates/stages/platform-matrix-cryptography-dependency.json
@@ -4,7 +4,7 @@
   },
   "matrix": {
     "Agent": {
-      "ubuntu-18.04": { "OSVmImage": "MMSUbuntu18.04", "Pool": "azsdk-pool-mms-ubuntu-1804-general" }
+      "ubuntu-18.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" }
     },
     "PythonVersion": [ "pypy3", "3.6", "3.7", "3.8", "3.9" ],
     "CoverageArg": "--disablecov"
diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json
index 8935cea8eb88..5bf11d912290 100644
--- a/eng/pipelines/templates/stages/platform-matrix.json
+++ b/eng/pipelines/templates/stages/platform-matrix.json
@@ -6,7 +6,7 @@
   },
   "matrix": {
     "Agent": {
-      "ubuntu-18.04": { "OSVmImage": "MMSUbuntu18.04", "Pool": "azsdk-pool-mms-ubuntu-1804-general" },
+      "ubuntu-18.04": { "OSVmImage": "MMSUbuntu20.04", "Pool": "azsdk-pool-mms-ubuntu-2004-general" },
       "windows-2019": { "OSVmImage": "MMS2019", "Pool": "azsdk-pool-mms-win-2019-general" },
       "macOS-10.15": { "OSVmImage": "macOS-10.15", "Pool": "Azure Pipelines" }
     },
@@ -17,9 +17,9 @@
   "include": [
     {
       "CoverageConfig": {
-        "ubuntu1804_39_coverage": {
+        "ubuntu2004_39_coverage": {
           "OSVmImage": "MMSUbuntu18.04",
-          "Pool": "azsdk-pool-mms-ubuntu-1804-general",
+          "Pool": "azsdk-pool-mms-ubuntu-2004-general",
           "PythonVersion": "3.9",
           "CoverageArg": "",
           "TestSamples": "false"