diff --git a/.pipelines/pipeline.yaml b/.pipelines/pipeline.yaml
index 2675f3552b..8d62048627 100644
--- a/.pipelines/pipeline.yaml
+++ b/.pipelines/pipeline.yaml
@@ -206,15 +206,6 @@ stages:
       displayName: AKS Swift
       pipelineBuildImage: "$(BUILD_IMAGE)"
 
-  - template: singletenancy/aks-engine/e2e-job-template.yaml
-    parameters:
-      name: "ubuntu_16_04_linux_e2e"
-      displayName: Ubuntu 16.04
-      pipelineBuildImage: "$(BUILD_IMAGE)"
-      clusterDefinition: "cniLinux1604.json"
-      clusterDefinitionCniTypeKey: "azureCNIURLLinux"
-      clusterDefinitionCniBuildOS: "linux"
-      clusterDefinitionCniBuildExt: ".tgz"
 
   - template: singletenancy/aks-engine/e2e-job-template.yaml
     parameters:
@@ -236,13 +227,24 @@ stages:
       clusterDefinitionCniBuildOS: "windows"
       clusterDefinitionCniBuildExt: ".zip"
 
+      
+  - template: singletenancy/aks-engine/e2e-job-template.yaml
+    parameters:
+      name: "windows_20_04_e2e"
+      displayName: "Windows 2004"
+      pipelineBuildImage: "$(BUILD_IMAGE)"
+      clusterDefinition: "cniWindows2004.json"
+      clusterDefinitionCniTypeKey: "azureCNIURLWindows"
+      clusterDefinitionCniBuildOS: "windows"
+      clusterDefinitionCniBuildExt: ".zip"
+
   - stage: cleanup
     displayName: Cleanup
     dependsOn:
       - "aks_swift_e2e"
-      - "ubuntu_16_04_linux_e2e"
       - "ubuntu_18_04_linux_e2e"
       - "windows_19_03_e2e"
+      - "windows_20_04_e2e"
     jobs:
       - job: delete_remote_artifacts
         displayName: Delete remote artifacts
diff --git a/test/apimodels/cniLinux1604.json b/test/apimodels/cniLinux1604.json
deleted file mode 100644
index d9509d8180..0000000000
--- a/test/apimodels/cniLinux1604.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-   "apiVersion": "vlabs",
-   "properties": {
-      "orchestratorProfile": {
-         "orchestratorType": "Kubernetes",
-         "orchestratorRelease": "1.17",
-         "kubernetesConfig": {
-            "networkPlugin": "azure",
-            "networkPolicy": "azure",
-            "azureCNIVersion": "",
-            "azureCNIURLLinux": "",
-            "apiServerConfig": {
-               "--tls-min-version": "VersionTLS12",
-               "--tls-cipher-suites": "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256"
-            },
-            "addons": [
-               {
-                  "name": "azure-npm-daemonset",
-                  "enabled": true,
-                  "containers": [
-                     {
-                        "name": "azure-npm-daemonset",
-                        "image": ""
-                     }
-                  ]
-               }
-            ]
-         }
-      },
-      "masterProfile": {
-         "count": 1,
-         "dnsPrefix": "cniLinux",
-         "vmSize": "Standard_D2_v2"
-      },
-      "agentPoolProfiles": [
-         {
-            "name": "agentpool1",
-            "count": 3,
-            "vmSize": "Standard_D2_v2",
-            "availabilityProfile": "AvailabilitySet",
-            "osType": "Linux",
-            "distro": "aks-ubuntu-16.04"
-         }
-      ],
-      "linuxProfile": {
-         "adminUsername": "azureuser",
-         "ssh": {
-            "publicKeys": [
-               {
-                  "keyData": ""
-               }
-            ]
-         }
-      },
-      "servicePrincipalProfile": {
-         "clientId": "",
-         "secret": ""
-      }
-   }
-}
\ No newline at end of file
diff --git a/test/apimodels/cniLinux1804.json b/test/apimodels/cniLinux1804.json
index 4121e1cec5..a522b79244 100644
--- a/test/apimodels/cniLinux1804.json
+++ b/test/apimodels/cniLinux1804.json
@@ -3,7 +3,7 @@
    "properties": {
       "orchestratorProfile": {
          "orchestratorType": "Kubernetes",
-         "orchestratorRelease": "1.17",
+         "orchestratorRelease": "1.22",
          "kubernetesConfig": {
             "networkPlugin": "azure",
             "networkPolicy": "azure",
@@ -57,4 +57,4 @@
          "secret": ""
       }
    }
-}
\ No newline at end of file
+}
diff --git a/test/apimodels/cniWindows1809.json b/test/apimodels/cniWindows2004.json
similarity index 94%
rename from test/apimodels/cniWindows1809.json
rename to test/apimodels/cniWindows2004.json
index 753ee61f9b..7bd61c857b 100644
--- a/test/apimodels/cniWindows1809.json
+++ b/test/apimodels/cniWindows2004.json
@@ -41,8 +41,8 @@
          "enableAutomaticUpdates": false,
          "sshEnabled": true,
          "windowsPublisher": "MicrosoftWindowsServer",
-         "windowsOffer": "WindowsServerSemiAnnual",
-         "windowsSku": "Datacenter-Core-1809-with-Containers-smalldisk",
+         "windowsOffer": "WindowsServer",
+         "windowsSku": "datacenter-core-2004-with-containers-smalldisk",
          "imageVersion": "latest"
       },
       "linuxProfile": {
@@ -58,4 +58,4 @@
          "secret": ""
       }
    }
-}
\ No newline at end of file
+}