diff --git a/parts/linux/cloud-init/artifacts/cse_install.sh b/parts/linux/cloud-init/artifacts/cse_install.sh
index 392de546d22..7a4453cad12 100755
--- a/parts/linux/cloud-init/artifacts/cse_install.sh
+++ b/parts/linux/cloud-init/artifacts/cse_install.sh
@@ -30,23 +30,31 @@ installContainerRuntime() {
     if [ -f "$MANIFEST_FILEPATH" ]; then
         stable_containerd="$(jq -r .containerd.stable "$MANIFEST_FILEPATH")"
         latest_containerd="$(jq -r .containerd.latest "$MANIFEST_FILEPATH")"
+        edge_containerd="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
     else
         echo "WARNING: containerd version not found in manifest, defaulting to hardcoded."
     fi
 
     # todo(ace): read 1.22 from a manifest and track it against supported versions
-    if semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
+    if semverCompare ${KUBERNETES_VERSION} "1.24.0"; then
+        containerd_version="$(echo "$edge_containerd" | cut -d- -f1)"
+        containerd_patch_version="$(echo "$edge_containerd" | cut -d- -f2)"
+        if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
+            echo "invalid container version: $edge_containerd"
+            exit $ERR_CONTAINERD_INSTALL_TIMEOUT
+        fi        
+    elif semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
         containerd_version="$(echo "$latest_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$latest_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $latest_containerd"
+            echo "invalid container version: $latest_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     else
         containerd_version="$(echo "$stable_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$stable_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $stable_containerd"
+            echo "invalid container version: $stable_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     fi
diff --git a/parts/linux/cloud-init/artifacts/manifest.json b/parts/linux/cloud-init/artifacts/manifest.json
index d0bdbb166ac..ca54e34db23 100644
--- a/parts/linux/cloud-init/artifacts/manifest.json
+++ b/parts/linux/cloud-init/artifacts/manifest.json
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
index 92f475d97a7..78ba9eb8566 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line63.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData
index d37459eca24..08c51f27f25 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line63.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData
index 1a086d7ae8c..ed8cee1d182 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line63.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData
index 1a086d7ae8c..ed8cee1d182 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line63.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData
index 9cfc4d2f9b3..ebb61992126 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line63.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData
index a2550879d37..02cc5b9c670 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line63.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData
index 1183a6f13c9..332951e55b6 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line63.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData
index 7723c242357..1a1d435b12d 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line63.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData
index 1b4b0a45b6d..0e4324a73d2 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line63.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData
index a089aa6aa4e..33e522464ff 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line63.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData
index 48fe2807e82..45b5f296690 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line63.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData
index 7723c242357..1a1d435b12d 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line63.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData
index bb2253e1205..72c0c7525c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData
@@ -37,7 +37,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_installs_distro.sh
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line40.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line40.sh
index c7e9251d7b9..c6c63e3b1b8 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line40.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line40.sh
@@ -30,23 +30,31 @@ installContainerRuntime() {
     if [ -f "$MANIFEST_FILEPATH" ]; then
         stable_containerd="$(jq -r .containerd.stable "$MANIFEST_FILEPATH")"
         latest_containerd="$(jq -r .containerd.latest "$MANIFEST_FILEPATH")"
+        edge_containerd="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
     else
         echo "WARNING: containerd version not found in manifest, defaulting to hardcoded."
     fi
 
     # todo(ace): read 1.22 from a manifest and track it against supported versions
-    if semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
+    if semverCompare ${KUBERNETES_VERSION} "1.24.0"; then
+        containerd_version="$(echo "$edge_containerd" | cut -d- -f1)"
+        containerd_patch_version="$(echo "$edge_containerd" | cut -d- -f2)"
+        if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
+            echo "invalid container version: $edge_containerd"
+            exit $ERR_CONTAINERD_INSTALL_TIMEOUT
+        fi        
+    elif semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
         containerd_version="$(echo "$latest_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$latest_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $latest_containerd"
+            echo "invalid container version: $latest_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     else
         containerd_version="$(echo "$stable_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$stable_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $stable_containerd"
+            echo "invalid container version: $stable_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     fi
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line63.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData
index be7c2f9fe1b..0a8967a5277 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line63.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData
index f84162cd9f3..234b1b6b9e8 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line63.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData
index bed462a0ca8..c4534792ba7 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData
@@ -37,7 +37,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_installs_distro.sh
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line40.sh
index c7e9251d7b9..c6c63e3b1b8 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line40.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line40.sh
@@ -30,23 +30,31 @@ installContainerRuntime() {
     if [ -f "$MANIFEST_FILEPATH" ]; then
         stable_containerd="$(jq -r .containerd.stable "$MANIFEST_FILEPATH")"
         latest_containerd="$(jq -r .containerd.latest "$MANIFEST_FILEPATH")"
+        edge_containerd="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
     else
         echo "WARNING: containerd version not found in manifest, defaulting to hardcoded."
     fi
 
     # todo(ace): read 1.22 from a manifest and track it against supported versions
-    if semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
+    if semverCompare ${KUBERNETES_VERSION} "1.24.0"; then
+        containerd_version="$(echo "$edge_containerd" | cut -d- -f1)"
+        containerd_patch_version="$(echo "$edge_containerd" | cut -d- -f2)"
+        if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
+            echo "invalid container version: $edge_containerd"
+            exit $ERR_CONTAINERD_INSTALL_TIMEOUT
+        fi        
+    elif semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
         containerd_version="$(echo "$latest_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$latest_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $latest_containerd"
+            echo "invalid container version: $latest_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     else
         containerd_version="$(echo "$stable_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$stable_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $stable_containerd"
+            echo "invalid container version: $stable_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line63.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData
index 76014bd8088..4304f261621 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData
@@ -37,7 +37,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/+R7+3fbNpb/7/4rbmnVj9SUbLfN9OsZ9buurCQ6diQfWUp3NpPVQCQoYUwBWgD0I7L2b98DgA+QhBzb6XS6Z5NzHIe4uLhvfC5Abn/TmhLamiIx39rqdCZX3eGHXqc76fUno/eX7RZbyhb6nHDcChiViFDMRSsI/CVnd/dNgfkNCXCTUD130Dnvjp46lQXXWOqZ/d6kM+i/6b2dnPWGba+FZdAKKGlRLJuhp8d/6fXTQcVVDU4JNUNng1/7F4PTs6sKQchuacxQKLytzrDXGV3klDYhJ4GMHbTFgongrZgFKE6XHPRHp71+d3jmXjlTNbSZDsf9jpOcJzSwCc9/unLSXSdTzCmWWNjU41/G/dF4MuxedE+vuu3GXiymE45jjAQGn4Mv9rdG3Yvu5WA4OptcXozfKq3qVpA4xkvGZUnm2sSNJjkfjq9GF93R5EN3eNUb9NvezWHzsHnkbb0/7ffedK9Gkze9i+7l6ehduqAJiwWiJMJCNv8hGPW2toIYI5osO7kJz+I3JMZibx9WWwAAfAE+j6CxyQdb660tQoVEcZwzGSZUkgXWPDQTHMwZeITCBkrw4Xz8S3fY7466V5lK0IbGqv547WmWt4jIScT4JCIxhqPjQziCTXrCNlAG+I5IYBQiROKEYyACQhyTKeZI4gO4xRChOJ6i4BqmOGa3TSO7NjoIiaYxnhShZo3FSGIhq2Mkgo/gR+A1ah7x4NOfQc4x1YTqT41922vs/eO/VEA1i4dNQ+Zkue/lzGryuJkZsseY4VjgnKvx4a+nw36v//YECkZwg7kgjAJlEiKW0BAIhcwBBxDiCCWxJHQGksEc8TBgIQ6bZo2IGDNvg2Qh20MB3j8BjlEIR83jY4g4WwDKuQGiIUiufEQkoBlSAQUiWapUwrkoIvOAwIsbzDtssUQcu8MJPLVQ89CruKRQcJJyVWY0VmjUTOzBAwSJBD/0wY+OLG9YfJZIBvPnczu2uJmo+gxeoy6fB5/g4QE+bhhst8GjSRwrMgddSbgSdcUwdkLfoJiEuNAxc8AJOJQqc1DZ2OgOhxOrsvT6V6PTi4vJqPe+OxiP8gkRqcfjo/6p5dNX+ecL3P53+qeu1Ff7J/0nLfJXEtEQxYziYncBr7Gq6772Ks9LuqYF/wl7iCXph+4w20Jc621Z21Yfy1vGry/jZEZovu8pRyoPrPrd0a+D4Xm6I689aIOn9xgPPlVNn3I8VcOdfs9hlOxpvq1W0RTsKNEyTNDp93KJFtch4eAvHZP0uHo6evsfGgg2Vup/RuSryXh4sb39qrWGbRgLDAp4wjQhqibDtiq8wPGC3WBAcQzBHHEBe94rbx+SpRqUcwwRoSgGr2V8wbHk98EinMywnEjEp2qi2oN/BK8uXctIk8q29qAm3VrFuxVxFoc81iyrnPNEyBjL3DRmH75OH08SHre9uZRLcdJqoUD4C8I5403tNhzOcJNi2crI/Vs0I63Gqgqp1q2Y0OSuhRbh6x/K1J5rVQVElkjOq2DNNdVEV2OPiNPh+9c/7Kt0PqrHk1ujApimuFM0pzGbNgPGcfOW0JDdCoeGiC9e/5DppH93CJZtx7qOfWPwS03Des3JA4JEkwxffa/C4fUhBAmPwY+uLsBnbm7Ww4THXjkYcrfUIiKv4PMFC+FPP/7o5g4AmWpWDGU5+sL0+tDvjiZ/7BxzifjMROvoVi03UdqnZS1H48g8vRxPToedd+3G3gzLzuX4lAfzfYBtnTjAOOhoqxq53h/aa+TPx8OLJ+RywIkvGYtF66axKou5VjmIOMEi7Tz9Oomvs8JvrDJd1k2JeHP22bNl0sbtmupal1J7v+w5Fflpf5LmgufSu5Xzy1YwNbK+xtrutiq+eYYXgoRzTOWHFOg09oxhwPczKH/8cyvENy0FMOABBA5hNzNfDvdbrdnuvlUIq9HhANvfNl+tm4d2BVyVZVlD+7+h5p56YTRgIJOkzoVFkEqLYtVM3Gf7Lw6bIK7JcqnakZIl1RyJ+AxLKPhWBHG0Rdsg50SoZpLR+B4CvQaECVcLBAI34cO7MwFizpI4hDm6wZlkWVjCkmM/QMEchyCY6lQpxqEqClkaNq3VSKRrxc08hJBhoZsum6tiNkXXODxQcZhwChjx+D7nUI1l76VJUTgx3SaeGtk1Z9p4qBb1Z73h2gFtLZuliufd58kGB5fxbWqcoyqGLZYY0yUKrrUbzQqESlZImB7NrAu2EnH4fHfzHFv4nTpDx77WKJOkmWjDy8ftt97aElgmy06/d0a42LDnpdxNiZizWwr+EDhj8kT9cNEo+fxhKqI16mBenDY+yr9GVpigPGoVQmsT/x0xcDn2v7gf16Legvi2I1UQ+Xefn8ZUhc9zPVcYrgaBfm+I81uZ0NVv/R52xHeSo0CeJ1P8S1rMc1ue/3RVBUpqP1TTT4d/1bCmcVxNlFXtLHqdMyscU+HjAB4uyFhj3TLL2ZCxwrmCFm0OJRCube1LjqiIGF+0PfHQfPWw45sFsv3kwQPfF3N2W1Di0KdogYXylK6bXxbyb7n3fV9ITpZ+wBZLRjGVov298mS5+wLrGJ+yEJuOLJniGMuNY1lxVVX1SWJZ0fDufom5YlKk1UVvMhoMLrI4SJvEOVvg1jyj9vNrgNYjp97LxDr46C3QDEMjYw+N1bu/XnaH2okaLJaCy2vodqh0uJFNNcdJgeSuM40IAqn8qz21RAGG659EkzDgCQXfVzbyFyyhEuT9ErenhIYHggdtvd5BKGT6G1tKwqjQBCf8tiYupAYcIXEN+Q0Z+AF4wbLi1dYqdeFB6q41GPUc0GJxk+qeud2DWoduBvxHLO/mpmCFk5uCVF/gVoKRuuL8EcycByRY8QLWyUBJbBJByIJrzG0pMZX8fskIleB54N8YTif6Z12c/4uertns2TZ6zE22t4Is8YsZLzJKYYwv8HnEHAXyODcLnhv6Uxqq3y45u7sv7gw746vR4P3E3pLKhwKNlYNkPLw4aa8r8OIzOGlLnXW98G1ncEYBl2zHyJs2yWCBrjGIhBsK3f7p4XuIcSRVS6hvr9TgF1YvztEMjN/gn1euAWXwV1uW1P3BqLu3QIRyHO6fwC0GfLfEgSzrcK80mGJIaIg5/N2xE/69CSPV2oqESKG1SLtsEFjq6zwWWcvqYMzNkwgcwvQeTs+v9J3dec4fkqWQHKOF3dWOBmcDS+YYy10BAmPlQ4oDLEQqMUok80MslT5KJJ0vLMp0K1KuDs02XP99OTTcdS9Hrs9KAnf3u630P7HjLWA0JKqQQzDHwTUwWoWPwGiAYXipkDad6evs9Dg4LPEmEeztpVdZbgtkd1le09O3WfBzG47+tL8POzvwEXwKXh0Zuq+dnmv5Ktdyo1+tmmAjl+yqZzIc9xUWTSGMdUXntHRFyhysGfRTV8Ylg3u+qel1Fta5QuW/5VszVWGfVZc3kXuPsXskMjeQe1tWJ46+u9tQnDaUJvtw4tlVDTZiZNixrimKCL0cDv59U3xuKw76PSiVKgjEvZB4ASgMGQU5R7pghySQSJrSpWKJsxiWMaIYBAMi02M8uithGrPgGlSthCVnN0QQRgmd5cu5kPoqw9tZ7Bfywo51R1Gfu7GXKPKg9/70bTfrK6E4KEviWL96McdAMjHqk9aQCEVmyVi6qbJE39wquG6BXh/CkepBDzfBWyOUEtN6yagQTLWge6kukixwCCyRkGn1qEY3BIEWdGfHfZ3dGSn6t5PLcXGnDftptd+guDlKfLbu6eHsP0vLVKqNippDwY26WkXucT1S4PrP0iOtoWU9zgad8+5GR5mM4Vii2denzLA7On1rP/7eyiS9hlJDo7oNWugT4gqb3yS3Hs0eiWZudzQqorwstrPz7xetZcVWGj0v4WO5+X1nqB0s3jDemROKck8rxK7YojjW9W4RcIgYhwVjNEDXuHT2sapBiPUTMMQ2iDmOYwPKQiLQNMbtq87x4dHrnAbFcS5je6+x95jrBMRESHiAGcdL2P3PRcCbCxJwJlgkmwFbtHbhAdDtNeyully11I2j9e6+I3FfIpntEPE0IYTk0AahZYn2vG/FybfCO4DG0QE0jvfXkEopJM/FzN6AyQxvS5Ha3GFpk3SqBJnLsIjQUHs0lVY5Vrvbs2tXwqm9pvZ+kO6/hEJ58Y//9uk7r/Zo7a3/DCGz79xoHkIHeWBhGpozDiJO1IMm+qwcGzwhVg6PbJGLiG7nMD2TeZ3evvoYdkXL4Rh74fw+1iweIIVTEoHzCghTHCD1IE3okGGhaNL3J40wqsQ1K43OS7Ml17CChEyNs9VsrEqWWG8+O3HyyzaOJ7FMYyNkFJuiorqur988frNqzhfOwvhVtZsvyGNMNxXpx0QxJVm/QD5emuypvJBlrtPT0Db2w3c60qwRwyuhgel2zfvoht0wKd7Hg+w1nnJU5hvq41bQkzTPiWSTUPUduHjvIa9/5TrrnXiN4/VuVhf9m27WZ1R6p8aD83Hz46H//z59t2HUdz+eeNl6jZVlJVUIJIdd9fdv1MrzWn641HzKBlTdY/7YalttdP6LCToFHCcBC3G78f8rAdPIx+CbNhy6w8QAz5zSMnQedVUTrz3Fz7WJQb6ROWc9wO2cxNi8767HSztPTcPsj6tkVdpLUq55Tla6AlYsurbT1I9qCWkaekeToF9xOjo+hOycujazqBb5sUmlbJjdby9EEu8fNPbmTEgVtfsH4J5oTibsCgRecT79BZaYhh0310LQ/Fz6yYIKibjsOGe7pNXHGvpU4uniVtmu8894hnoDx2FF2jRw9TX5ZTKNSdCJWRKaqDWX5wpHpw9rQfyvLbsGjuYYZ/dfVgifKoirNP1xSsc2oPgW3esTegVDDgDfYKpveVOvCOtdOcf0lOyWxHF2YP3q9OLiFXAcYY5pYC5HEMyIZqxE653B3tW70/0DJXQwT+cpOgaLJJjX13FWuAw2vrS2Ob5nyl8VKz6RSHNJ9w7V5KgDn7KIwu5FE7qhbOkbEXeFUXKk1yzpS3tpKa7vmfZolpCV4u2o0zWKup1dO0BWsdxjrrJcI3JVw9JeUbfTjouoarEdlzfC0geMwy98wMhuMOckxOmnIB1GIzIregDz1pn1PaX+WlYFhPnZDKJZM2z9dDjRbyVPKNbfPUVkpkZM0EiWBHNzamQzM1EcIAl/+Qt0B2/g559dRCGSSLCEB/hET9BxeVL09ctlfK+WVdKnS59AhFS8dwdvttZb2+qf/wkAAP//eLbrkHk8AAA=
+    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
 
 
 - path: /opt/azure/containers/provision_installs_distro.sh
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line40.sh
index c7e9251d7b9..c6c63e3b1b8 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line40.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line40.sh
@@ -30,23 +30,31 @@ installContainerRuntime() {
     if [ -f "$MANIFEST_FILEPATH" ]; then
         stable_containerd="$(jq -r .containerd.stable "$MANIFEST_FILEPATH")"
         latest_containerd="$(jq -r .containerd.latest "$MANIFEST_FILEPATH")"
+        edge_containerd="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
     else
         echo "WARNING: containerd version not found in manifest, defaulting to hardcoded."
     fi
 
     # todo(ace): read 1.22 from a manifest and track it against supported versions
-    if semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
+    if semverCompare ${KUBERNETES_VERSION} "1.24.0"; then
+        containerd_version="$(echo "$edge_containerd" | cut -d- -f1)"
+        containerd_patch_version="$(echo "$edge_containerd" | cut -d- -f2)"
+        if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
+            echo "invalid container version: $edge_containerd"
+            exit $ERR_CONTAINERD_INSTALL_TIMEOUT
+        fi        
+    elif semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
         containerd_version="$(echo "$latest_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$latest_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $latest_containerd"
+            echo "invalid container version: $latest_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     else
         containerd_version="$(echo "$stable_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$stable_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $stable_containerd"
+            echo "invalid container version: $stable_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line63.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData
index 0972591043c..b5fea2b6425 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData
@@ -37,7 +37,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_installs_distro.sh
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line40.sh
index c7e9251d7b9..c6c63e3b1b8 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line40.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line40.sh
@@ -30,23 +30,31 @@ installContainerRuntime() {
     if [ -f "$MANIFEST_FILEPATH" ]; then
         stable_containerd="$(jq -r .containerd.stable "$MANIFEST_FILEPATH")"
         latest_containerd="$(jq -r .containerd.latest "$MANIFEST_FILEPATH")"
+        edge_containerd="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
     else
         echo "WARNING: containerd version not found in manifest, defaulting to hardcoded."
     fi
 
     # todo(ace): read 1.22 from a manifest and track it against supported versions
-    if semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
+    if semverCompare ${KUBERNETES_VERSION} "1.24.0"; then
+        containerd_version="$(echo "$edge_containerd" | cut -d- -f1)"
+        containerd_patch_version="$(echo "$edge_containerd" | cut -d- -f2)"
+        if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
+            echo "invalid container version: $edge_containerd"
+            exit $ERR_CONTAINERD_INSTALL_TIMEOUT
+        fi        
+    elif semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
         containerd_version="$(echo "$latest_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$latest_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $latest_containerd"
+            echo "invalid container version: $latest_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     else
         containerd_version="$(echo "$stable_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$stable_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $stable_containerd"
+            echo "invalid container version: $stable_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line63.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData
index d0f0400eff0..b991d692997 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line63.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData
index 4020fa5e261..bc9c6003947 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData
@@ -37,7 +37,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_installs_distro.sh
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line40.sh
index c6a07d92e22..814b215dd11 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line40.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line40.sh
@@ -30,23 +30,31 @@ installContainerRuntime() {
     if [ -f "$MANIFEST_FILEPATH" ]; then
         stable_containerd="$(jq -r .containerd.stable "$MANIFEST_FILEPATH")"
         latest_containerd="$(jq -r .containerd.latest "$MANIFEST_FILEPATH")"
+        edge_containerd="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
     else
         echo "WARNING: containerd version not found in manifest, defaulting to hardcoded."
     fi
 
     # todo(ace): read 1.22 from a manifest and track it against supported versions
-    if semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
+    if semverCompare ${KUBERNETES_VERSION} "1.24.0"; then
+        containerd_version="$(echo "$edge_containerd" | cut -d- -f1)"
+        containerd_patch_version="$(echo "$edge_containerd" | cut -d- -f2)"
+        if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
+            echo "invalid container version: $edge_containerd"
+            exit $ERR_CONTAINERD_INSTALL_TIMEOUT
+        fi        
+    elif semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
         containerd_version="$(echo "$latest_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$latest_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $latest_containerd"
+            echo "invalid container version: $latest_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     else
         containerd_version="$(echo "$stable_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$stable_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $stable_containerd"
+            echo "invalid container version: $stable_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line63.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData
index f7dbcc55c56..bd31347b98f 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData
@@ -37,7 +37,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/+R7+3fbNpb/7/4rbmnVj9SUbLfN9OsZ9buurCQ6diQfWUp3NpPVQCQoYUwBWgD0I7L2b98DgA+QhBzb6XS6Z5NzHIe4uLhvfC5Abn/TmhLamiIx39rqdCZX3eGHXqc76fUno/eX7RZbyhb6nHDcChiViFDMRSsI/CVnd/dNgfkNCXCTUD130Dnvjp46lQXXWOqZ/d6kM+i/6b2dnPWGba+FZdAKKGlRLJuhp8d/6fXTQcVVDU4JNUNng1/7F4PTs6sKQchuacxQKLytzrDXGV3klDYhJ4GMHbTFgongrZgFKE6XHPRHp71+d3jmXjlTNbSZDsf9jpOcJzSwCc9/unLSXSdTzCmWWNjU41/G/dF4MuxedE+vuu3GXiymE45jjAQGn4Mv9rdG3Yvu5WA4OptcXozfKq3qVpA4xkvGZUnm2sSNJjkfjq9GF93R5EN3eNUb9NvezWHzsHnkbb0/7ffedK9Gkze9i+7l6ehduqAJiwWiJMJCNv8hGPW2toIYI5osO7kJz+I3JMZibx9WWwAAfAE+j6CxyQdb660tQoVEcZwzGSZUkgXWPDQTHMwZeITCBkrw4Xz8S3fY7466V5lK0IbGqv547WmWt4jIScT4JCIxhqPjQziCTXrCNlAG+I5IYBQiROKEYyACQhyTKeZI4gO4xRChOJ6i4BqmOGa3TSO7NjoIiaYxnhShZo3FSGIhq2Mkgo/gR+A1ah7x4NOfQc4x1YTqT41922vs/eO/VEA1i4dNQ+Zkue/lzGryuJkZsseY4VjgnKvx4a+nw36v//YECkZwg7kgjAJlEiKW0BAIhcwBBxDiCCWxJHQGksEc8TBgIQ6bZo2IGDNvg2Qh20MB3j8BjlEIR83jY4g4WwDKuQGiIUiufEQkoBlSAQUiWapUwrkoIvOAwIsbzDtssUQcu8MJPLVQ89CruKRQcJJyVWY0VmjUTOzBAwSJBD/0wY+OLG9YfJZIBvPnczu2uJmo+gxeoy6fB5/g4QE+bhhst8GjSRwrMgddSbgSdcUwdkLfoJiEuNAxc8AJOJQqc1DZ2OgOhxOrsvT6V6PTi4vJqPe+OxiP8gkRqcfjo/6p5dNX+ecL3P53+qeu1Ff7J/0nLfJXEtEQxYziYncBr7Gq6772Ks9LuqYF/wl7iCXph+4w20Jc621Z21Yfy1vGry/jZEZovu8pRyoPrPrd0a+D4Xm6I689aIOn9xgPPlVNn3I8VcOdfs9hlOxpvq1W0RTsKNEyTNDp93KJFtch4eAvHZP0uHo6evsfGgg2Vup/RuSryXh4sb39qrWGbRgLDAp4wjQhqibDtiq8wPGC3WBAcQzBHHEBe94rbx+SpRqUcwwRoSgGr2V8wbHk98EinMywnEjEp2qi2oN/BK8uXctIk8q29qAm3VrFuxVxFoc81iyrnPNEyBjL3DRmH75OH08SHre9uZRLcdJqoUD4C8I5403tNhzOcJNi2crI/Vs0I63Gqgqp1q2Y0OSuhRbh6x/K1J5rVQVElkjOq2DNNdVEV2OPiNPh+9c/7Kt0PqrHk1ujApimuFM0pzGbNgPGcfOW0JDdCoeGiC9e/5DppH93CJZtx7qOfWPwS03Des3JA4JEkwxffa/C4fUhBAmPwY+uLsBnbm7Ww4THXjkYcrfUIiKv4PMFC+FPP/7o5g4AmWpWDGU5+sL0+tDvjiZ/7BxzifjMROvoVi03UdqnZS1H48g8vRxPToedd+3G3gzLzuX4lAfzfYBtnTjAOOhoqxq53h/aa+TPx8OLJ+RywIkvGYtF66axKou5VjmIOMEi7Tz9Oomvs8JvrDJd1k2JeHP22bNl0sbtmupal1J7v+w5Fflpf5LmgufSu5Xzy1YwNbK+xtrutiq+eYYXgoRzTOWHFOg09oxhwPczKH/8cyvENy0FMOABBA5hNzNfDvdbrdnuvlUIq9HhANvfNl+tm4d2BVyVZVlD+7+h5p56YTRgIJOkzoVFkEqLYtVM3Gf7Lw6bIK7JcqnakZIl1RyJ+AxLKPhWBHG0Rdsg50SoZpLR+B4CvQaECVcLBAI34cO7MwFizpI4hDm6wZlkWVjCkmM/QMEchyCY6lQpxqEqClkaNq3VSKRrxc08hJBhoZsum6tiNkXXODxQcZhwChjx+D7nUI1l76VJUTgx3SaeGtk1Z9p4qBb1Z73h2gFtLZuliufd58kGB5fxbWqcoyqGLZYY0yUKrrUbzQqESlZImB7NrAu2EnH4fHfzHFv4nTpDx77WKJOkmWjDy8ftt97aElgmy06/d0a42LDnpdxNiZizWwr+EDhj8kT9cNEo+fxhKqI16mBenDY+yr9GVpigPGoVQmsT/x0xcDn2v7gf16Legvi2I1UQ+Xefn8ZUhc9zPVcYrgaBfm+I81uZ0NVv/R52xHeSo0CeJ1P8S1rMc1ue/3RVBUpqP1TTT4d/1bCmcVxNlFXtLHqdMyscU+HjAB4uyFhj3TLL2ZCxwrmCFm0OJRCube1LjqiIGF+0PfHQfPWw45sFsv3kwQPfF3N2W1Di0KdogYXylK6bXxbyb7n3fV9ITpZ+wBZLRjGVov298mS5+wLrGJ+yEJuOLJniGMuNY1lxVVX1SWJZ0fDufom5YlKk1UVvMhoMLrI4SJvEOVvg1jyj9vNrgNYjp97LxDr46C3QDEMjYw+N1bu/XnaH2okaLJaCy2vodqh0uJFNNcdJgeSuM40IAqn8qz21RAGG659EkzDgCQXfVzbyFyyhEuT9ErenhIYHggdtvd5BKGT6G1tKwqjQBCf8tiYupAYcIXEN+Q0Z+AF4wbLi1dYqdeFB6q41GPUc0GJxk+qeud2DWoduBvxHLO/mpmCFk5uCVF/gVoKRuuL8EcycByRY8QLWyUBJbBJByIJrzG0pMZX8fskIleB54N8YTif6Z12c/4uertns2TZ6zE22t4Is8YsZLzJKYYwv8HnEHAXyODcLnhv6Uxqq3y45u7sv7gw746vR4P3E3pLKhwKNlYNkPLw4aa8r8OIzOGlLnXW98G1ncEYBl2zHyJs2yWCBrjGIhBsK3f7p4XuIcSRVS6hvr9TgF1YvztEMjN/gn1euAWXwV1uW1P3BqLu3QIRyHO6fwC0GfLfEgSzrcK80mGJIaIg5/N2xE/69CSPV2oqESKG1SLtsEFjq6zwWWcvqYMzNkwgcwvQeTs+v9J3dec4fkqWQHKOF3dWOBmcDS+YYy10BAmPlQ4oDLEQqMUok80MslT5KJJ0vLMp0K1KuDs02XP99OTTcdS9Hrs9KAnf3u630P7HjLWA0JKqQQzDHwTUwWoWPwGiAYXipkDad6evs9Dg4LPEmEeztpVdZbgtkd1le09O3WfBzG47+tL8POzvwEXwKXh0Zuq+dnmv5Ktdyo1+tmmAjl+yqZzIc9xUWTSGMdUXntHRFyhysGfRTV8Ylg3u+qel1Fta5QuW/5VszVWGfVZc3kXuPsXskMjeQe1tWJ46+u9tQnDaUJvtw4tlVDTZiZNixrimKCL0cDv59U3xuKw76PSiVKgjEvZB4ASgMGQU5R7pghySQSJrSpWKJsxiWMaIYBAMi02M8uithGrPgGlSthCVnN0QQRgmd5cu5kPoqw9tZ7Bfywo51R1Gfu7GXKPKg9/70bTfrK6E4KEviWL96McdAMjHqk9aQCEVmyVi6qbJE39wquG6BXh/CkepBDzfBWyOUEtN6yagQTLWge6kukixwCCyRkGn1qEY3BIEWdGfHfZ3dGSn6t5PLcXGnDftptd+guDlKfLbu6eHsP0vLVKqNippDwY26WkXucT1S4PrP0iOtoWU9zgad8+5GR5mM4Vii2denzLA7On1rP/7eyiS9hlJDo7oNWugT4gqb3yS3Hs0eiWZudzQqorwstrPz7xetZcVWGj0v4WO5+X1nqB0s3jDemROKck8rxK7YojjW9W4RcIgYhwVjNEDXuHT2sapBiPUTMMQ2iDmOYwPKQiLQNMbtq87x4dHrnAbFcS5je6+x95jrBMRESHiAGcdL2P3PRcCbCxJwJlgkmwFbtHbhAdDtNeyully11I2j9e6+I3FfIpntEPE0IYTk0AahZYn2vG/FybfCO4DG0QE0jvfXkEopJM/FzN6AyQxvS5Ha3GFpk3SqBJnLsIjQUHs0lVY5Vrvbs2tXwqm9pvZ+kO6/hEJ58Y//9uk7r/Zo7a3/DCGz79xoHkIHeWBhGpozDiJO1IMm+qwcGzwhVg6PbJGLiG7nMD2TeZ3evvoYdkXL4Rh74fw+1iweIIVTEoHzCghTHCD1IE3okGGhaNL3J40wqsQ1K43OS7Ml17CChEyNs9VsrEqWWG8+O3HyyzaOJ7FMYyNkFJuiorqur988frNqzhfOwvhVtZsvyGNMNxXpx0QxJVm/QD5emuypvJBlrtPT0Db2w3c60qwRwyuhgel2zfvoht0wKd7Hg+w1nnJU5hvq41bQkzTPiWSTUPUduHjvIa9/5TrrnXiN4/VuVhf9m27WZ1R6p8aD83Hz46H//z59t2HUdz+eeNl6jZVlJVUIJIdd9fdv1MrzWn641HzKBlTdY/7YalttdP6LCToFHCcBC3G78f8rAdPIx+CbNhy6w8QAz5zSMnQedVUTrz3Fz7WJQb6ROWc9wO2cxNi8767HSztPTcPsj6tkVdpLUq55Tla6AlYsurbT1I9qCWkaekeToF9xOjo+hOycujazqBb5sUmlbJjdby9EEu8fNPbmTEgVtfsH4J5oTibsCgRecT79BZaYhh0310LQ/Fz6yYIKibjsOGe7pNXHGvpU4uniVtmu8894hnoDx2FF2jRw9TX5ZTKNSdCJWRKaqDWX5wpHpw9rQfyvLbsGjuYYZ/dfVgifKoirNP1xSsc2oPgW3esTegVDDgDfYKpveVOvCOtdOcf0lOyWxHF2YP3q9OLiFXAcYY5pYC5HEMyIZqxE653B3tW70/0DJXQwT+cpOgaLJJjX13FWuAw2vrS2Ob5nyl8VKz6RSHNJ9w7V5KgDn7KIwu5FE7qhbOkbEXeFUXKk1yzpS3tpKa7vmfZolpCV4u2o0zWKup1dO0BWsdxjrrJcI3JVw9JeUbfTjouoarEdlzfC0geMwy98wMhuMOckxOmnIB1GIzIregDz1pn1PaX+WlYFhPnZDKJZM2z9dDjRbyVPKNbfPUVkpkZM0EiWBHNzamQzM1EcIAl/+Qt0B2/g559dRCGSSLCEB/hET9BxeVL09ctlfK+WVdKnS59AhFS8dwdvttZb2+qf/wkAAP//eLbrkHk8AAA=
+    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
 
 
 - path: /opt/azure/containers/provision_installs_distro.sh
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line40.sh
index c7e9251d7b9..c6c63e3b1b8 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line40.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line40.sh
@@ -30,23 +30,31 @@ installContainerRuntime() {
     if [ -f "$MANIFEST_FILEPATH" ]; then
         stable_containerd="$(jq -r .containerd.stable "$MANIFEST_FILEPATH")"
         latest_containerd="$(jq -r .containerd.latest "$MANIFEST_FILEPATH")"
+        edge_containerd="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
     else
         echo "WARNING: containerd version not found in manifest, defaulting to hardcoded."
     fi
 
     # todo(ace): read 1.22 from a manifest and track it against supported versions
-    if semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
+    if semverCompare ${KUBERNETES_VERSION} "1.24.0"; then
+        containerd_version="$(echo "$edge_containerd" | cut -d- -f1)"
+        containerd_patch_version="$(echo "$edge_containerd" | cut -d- -f2)"
+        if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
+            echo "invalid container version: $edge_containerd"
+            exit $ERR_CONTAINERD_INSTALL_TIMEOUT
+        fi        
+    elif semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
         containerd_version="$(echo "$latest_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$latest_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $latest_containerd"
+            echo "invalid container version: $latest_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     else
         containerd_version="$(echo "$stable_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$stable_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $stable_containerd"
+            echo "invalid container version: $stable_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line63.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData
index 5726732629d..b3397719f66 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData
@@ -37,7 +37,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_installs_distro.sh
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line40.sh
index c7e9251d7b9..c6c63e3b1b8 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line40.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line40.sh
@@ -30,23 +30,31 @@ installContainerRuntime() {
     if [ -f "$MANIFEST_FILEPATH" ]; then
         stable_containerd="$(jq -r .containerd.stable "$MANIFEST_FILEPATH")"
         latest_containerd="$(jq -r .containerd.latest "$MANIFEST_FILEPATH")"
+        edge_containerd="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
     else
         echo "WARNING: containerd version not found in manifest, defaulting to hardcoded."
     fi
 
     # todo(ace): read 1.22 from a manifest and track it against supported versions
-    if semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
+    if semverCompare ${KUBERNETES_VERSION} "1.24.0"; then
+        containerd_version="$(echo "$edge_containerd" | cut -d- -f1)"
+        containerd_patch_version="$(echo "$edge_containerd" | cut -d- -f2)"
+        if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
+            echo "invalid container version: $edge_containerd"
+            exit $ERR_CONTAINERD_INSTALL_TIMEOUT
+        fi        
+    elif semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
         containerd_version="$(echo "$latest_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$latest_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $latest_containerd"
+            echo "invalid container version: $latest_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     else
         containerd_version="$(echo "$stable_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$stable_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $stable_containerd"
+            echo "invalid container version: $stable_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line63.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData
index b68b826d9a9..842bb734c72 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData
@@ -37,7 +37,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_installs_distro.sh
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line40.sh
index c7e9251d7b9..c6c63e3b1b8 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line40.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line40.sh
@@ -30,23 +30,31 @@ installContainerRuntime() {
     if [ -f "$MANIFEST_FILEPATH" ]; then
         stable_containerd="$(jq -r .containerd.stable "$MANIFEST_FILEPATH")"
         latest_containerd="$(jq -r .containerd.latest "$MANIFEST_FILEPATH")"
+        edge_containerd="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
     else
         echo "WARNING: containerd version not found in manifest, defaulting to hardcoded."
     fi
 
     # todo(ace): read 1.22 from a manifest and track it against supported versions
-    if semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
+    if semverCompare ${KUBERNETES_VERSION} "1.24.0"; then
+        containerd_version="$(echo "$edge_containerd" | cut -d- -f1)"
+        containerd_patch_version="$(echo "$edge_containerd" | cut -d- -f2)"
+        if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
+            echo "invalid container version: $edge_containerd"
+            exit $ERR_CONTAINERD_INSTALL_TIMEOUT
+        fi        
+    elif semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
         containerd_version="$(echo "$latest_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$latest_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $latest_containerd"
+            echo "invalid container version: $latest_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     else
         containerd_version="$(echo "$stable_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$stable_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $stable_containerd"
+            echo "invalid container version: $stable_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line63.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData
index 834befb4d31..f2c44967da8 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData
@@ -37,7 +37,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_installs_distro.sh
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line40.sh
index c7e9251d7b9..c6c63e3b1b8 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line40.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line40.sh
@@ -30,23 +30,31 @@ installContainerRuntime() {
     if [ -f "$MANIFEST_FILEPATH" ]; then
         stable_containerd="$(jq -r .containerd.stable "$MANIFEST_FILEPATH")"
         latest_containerd="$(jq -r .containerd.latest "$MANIFEST_FILEPATH")"
+        edge_containerd="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
     else
         echo "WARNING: containerd version not found in manifest, defaulting to hardcoded."
     fi
 
     # todo(ace): read 1.22 from a manifest and track it against supported versions
-    if semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
+    if semverCompare ${KUBERNETES_VERSION} "1.24.0"; then
+        containerd_version="$(echo "$edge_containerd" | cut -d- -f1)"
+        containerd_patch_version="$(echo "$edge_containerd" | cut -d- -f2)"
+        if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
+            echo "invalid container version: $edge_containerd"
+            exit $ERR_CONTAINERD_INSTALL_TIMEOUT
+        fi        
+    elif semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
         containerd_version="$(echo "$latest_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$latest_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $latest_containerd"
+            echo "invalid container version: $latest_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     else
         containerd_version="$(echo "$stable_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$stable_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $stable_containerd"
+            echo "invalid container version: $stable_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line63.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData
index c1bbb616b2f..62e46fafae1 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line63.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData
index 7831e692460..6428011e2a4 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData
@@ -37,7 +37,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_installs_distro.sh
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line40.sh
index c7e9251d7b9..c6c63e3b1b8 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line40.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line40.sh
@@ -30,23 +30,31 @@ installContainerRuntime() {
     if [ -f "$MANIFEST_FILEPATH" ]; then
         stable_containerd="$(jq -r .containerd.stable "$MANIFEST_FILEPATH")"
         latest_containerd="$(jq -r .containerd.latest "$MANIFEST_FILEPATH")"
+        edge_containerd="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
     else
         echo "WARNING: containerd version not found in manifest, defaulting to hardcoded."
     fi
 
     # todo(ace): read 1.22 from a manifest and track it against supported versions
-    if semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
+    if semverCompare ${KUBERNETES_VERSION} "1.24.0"; then
+        containerd_version="$(echo "$edge_containerd" | cut -d- -f1)"
+        containerd_patch_version="$(echo "$edge_containerd" | cut -d- -f2)"
+        if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
+            echo "invalid container version: $edge_containerd"
+            exit $ERR_CONTAINERD_INSTALL_TIMEOUT
+        fi        
+    elif semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
         containerd_version="$(echo "$latest_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$latest_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $latest_containerd"
+            echo "invalid container version: $latest_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     else
         containerd_version="$(echo "$stable_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$stable_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $stable_containerd"
+            echo "invalid container version: $stable_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line63.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData
index 6593f2729b6..fbd311fd4b3 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData
@@ -37,7 +37,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_installs_distro.sh
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line40.sh
index c7e9251d7b9..c6c63e3b1b8 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line40.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line40.sh
@@ -30,23 +30,31 @@ installContainerRuntime() {
     if [ -f "$MANIFEST_FILEPATH" ]; then
         stable_containerd="$(jq -r .containerd.stable "$MANIFEST_FILEPATH")"
         latest_containerd="$(jq -r .containerd.latest "$MANIFEST_FILEPATH")"
+        edge_containerd="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
     else
         echo "WARNING: containerd version not found in manifest, defaulting to hardcoded."
     fi
 
     # todo(ace): read 1.22 from a manifest and track it against supported versions
-    if semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
+    if semverCompare ${KUBERNETES_VERSION} "1.24.0"; then
+        containerd_version="$(echo "$edge_containerd" | cut -d- -f1)"
+        containerd_patch_version="$(echo "$edge_containerd" | cut -d- -f2)"
+        if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
+            echo "invalid container version: $edge_containerd"
+            exit $ERR_CONTAINERD_INSTALL_TIMEOUT
+        fi        
+    elif semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
         containerd_version="$(echo "$latest_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$latest_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $latest_containerd"
+            echo "invalid container version: $latest_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     else
         containerd_version="$(echo "$stable_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$stable_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $stable_containerd"
+            echo "invalid container version: $stable_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line63.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData
index b9a7aff84a4..8dbf1500d47 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData
@@ -37,7 +37,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_installs_distro.sh
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line40.sh
index c6a07d92e22..814b215dd11 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line40.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line40.sh
@@ -30,23 +30,31 @@ installContainerRuntime() {
     if [ -f "$MANIFEST_FILEPATH" ]; then
         stable_containerd="$(jq -r .containerd.stable "$MANIFEST_FILEPATH")"
         latest_containerd="$(jq -r .containerd.latest "$MANIFEST_FILEPATH")"
+        edge_containerd="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
     else
         echo "WARNING: containerd version not found in manifest, defaulting to hardcoded."
     fi
 
     # todo(ace): read 1.22 from a manifest and track it against supported versions
-    if semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
+    if semverCompare ${KUBERNETES_VERSION} "1.24.0"; then
+        containerd_version="$(echo "$edge_containerd" | cut -d- -f1)"
+        containerd_patch_version="$(echo "$edge_containerd" | cut -d- -f2)"
+        if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
+            echo "invalid container version: $edge_containerd"
+            exit $ERR_CONTAINERD_INSTALL_TIMEOUT
+        fi        
+    elif semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
         containerd_version="$(echo "$latest_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$latest_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $latest_containerd"
+            echo "invalid container version: $latest_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     else
         containerd_version="$(echo "$stable_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$stable_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $stable_containerd"
+            echo "invalid container version: $stable_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line63.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData
index a089aa6aa4e..33e522464ff 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line63.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData
index 4d18bec4a9e..963bc5cdcfe 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData
@@ -37,7 +37,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_installs_distro.sh
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line40.sh
index c7e9251d7b9..c6c63e3b1b8 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line40.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line40.sh
@@ -30,23 +30,31 @@ installContainerRuntime() {
     if [ -f "$MANIFEST_FILEPATH" ]; then
         stable_containerd="$(jq -r .containerd.stable "$MANIFEST_FILEPATH")"
         latest_containerd="$(jq -r .containerd.latest "$MANIFEST_FILEPATH")"
+        edge_containerd="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
     else
         echo "WARNING: containerd version not found in manifest, defaulting to hardcoded."
     fi
 
     # todo(ace): read 1.22 from a manifest and track it against supported versions
-    if semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
+    if semverCompare ${KUBERNETES_VERSION} "1.24.0"; then
+        containerd_version="$(echo "$edge_containerd" | cut -d- -f1)"
+        containerd_patch_version="$(echo "$edge_containerd" | cut -d- -f2)"
+        if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
+            echo "invalid container version: $edge_containerd"
+            exit $ERR_CONTAINERD_INSTALL_TIMEOUT
+        fi        
+    elif semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
         containerd_version="$(echo "$latest_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$latest_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $latest_containerd"
+            echo "invalid container version: $latest_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     else
         containerd_version="$(echo "$stable_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$stable_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $stable_containerd"
+            echo "invalid container version: $stable_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line63.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData
index 4d18bec4a9e..963bc5cdcfe 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData
@@ -37,7 +37,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_installs_distro.sh
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line40.sh
index c7e9251d7b9..c6c63e3b1b8 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line40.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line40.sh
@@ -30,23 +30,31 @@ installContainerRuntime() {
     if [ -f "$MANIFEST_FILEPATH" ]; then
         stable_containerd="$(jq -r .containerd.stable "$MANIFEST_FILEPATH")"
         latest_containerd="$(jq -r .containerd.latest "$MANIFEST_FILEPATH")"
+        edge_containerd="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
     else
         echo "WARNING: containerd version not found in manifest, defaulting to hardcoded."
     fi
 
     # todo(ace): read 1.22 from a manifest and track it against supported versions
-    if semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
+    if semverCompare ${KUBERNETES_VERSION} "1.24.0"; then
+        containerd_version="$(echo "$edge_containerd" | cut -d- -f1)"
+        containerd_patch_version="$(echo "$edge_containerd" | cut -d- -f2)"
+        if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
+            echo "invalid container version: $edge_containerd"
+            exit $ERR_CONTAINERD_INSTALL_TIMEOUT
+        fi        
+    elif semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
         containerd_version="$(echo "$latest_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$latest_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $latest_containerd"
+            echo "invalid container version: $latest_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     else
         containerd_version="$(echo "$stable_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$stable_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $stable_containerd"
+            echo "invalid container version: $stable_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line63.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData
index 648da88bd5d..927bc28ffe7 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line63.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData
index 017d841f92c..25325be1c62 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line63.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData
index 784338a350d..cda8cabaa82 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData
@@ -37,7 +37,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/+R7+3fbNpb/7/4rbmnVj9SUbLfN9OsZ9buurCQ6diQfWUp3NpPVQCQoYUwBWgD0I7L2b98DgA+QhBzb6XS6Z5NzHIe4uLhvfC5Abn/TmhLamiIx39rqdCZX3eGHXqc76fUno/eX7RZbyhb6nHDcChiViFDMRSsI/CVnd/dNgfkNCXCTUD130Dnvjp46lQXXWOqZ/d6kM+i/6b2dnPWGba+FZdAKKGlRLJuhp8d/6fXTQcVVDU4JNUNng1/7F4PTs6sKQchuacxQKLytzrDXGV3klDYhJ4GMHbTFgongrZgFKE6XHPRHp71+d3jmXjlTNbSZDsf9jpOcJzSwCc9/unLSXSdTzCmWWNjU41/G/dF4MuxedE+vuu3GXiymE45jjAQGn4Mv9rdG3Yvu5WA4OptcXozfKq3qVpA4xkvGZUnm2sSNJjkfjq9GF93R5EN3eNUb9NvezWHzsHnkbb0/7ffedK9Gkze9i+7l6ehduqAJiwWiJMJCNv8hGPW2toIYI5osO7kJz+I3JMZibx9WWwAAfAE+j6CxyQdb660tQoVEcZwzGSZUkgXWPDQTHMwZeITCBkrw4Xz8S3fY7466V5lK0IbGqv547WmWt4jIScT4JCIxhqPjQziCTXrCNlAG+I5IYBQiROKEYyACQhyTKeZI4gO4xRChOJ6i4BqmOGa3TSO7NjoIiaYxnhShZo3FSGIhq2Mkgo/gR+A1ah7x4NOfQc4x1YTqT41922vs/eO/VEA1i4dNQ+Zkue/lzGryuJkZsseY4VjgnKvx4a+nw36v//YECkZwg7kgjAJlEiKW0BAIhcwBBxDiCCWxJHQGksEc8TBgIQ6bZo2IGDNvg2Qh20MB3j8BjlEIR83jY4g4WwDKuQGiIUiufEQkoBlSAQUiWapUwrkoIvOAwIsbzDtssUQcu8MJPLVQ89CruKRQcJJyVWY0VmjUTOzBAwSJBD/0wY+OLG9YfJZIBvPnczu2uJmo+gxeoy6fB5/g4QE+bhhst8GjSRwrMgddSbgSdcUwdkLfoJiEuNAxc8AJOJQqc1DZ2OgOhxOrsvT6V6PTi4vJqPe+OxiP8gkRqcfjo/6p5dNX+ecL3P53+qeu1Ff7J/0nLfJXEtEQxYziYncBr7Gq6772Ks9LuqYF/wl7iCXph+4w20Jc621Z21Yfy1vGry/jZEZovu8pRyoPrPrd0a+D4Xm6I689aIOn9xgPPlVNn3I8VcOdfs9hlOxpvq1W0RTsKNEyTNDp93KJFtch4eAvHZP0uHo6evsfGgg2Vup/RuSryXh4sb39qrWGbRgLDAp4wjQhqibDtiq8wPGC3WBAcQzBHHEBe94rbx+SpRqUcwwRoSgGr2V8wbHk98EinMywnEjEp2qi2oN/BK8uXctIk8q29qAm3VrFuxVxFoc81iyrnPNEyBjL3DRmH75OH08SHre9uZRLcdJqoUD4C8I5403tNhzOcJNi2crI/Vs0I63Gqgqp1q2Y0OSuhRbh6x/K1J5rVQVElkjOq2DNNdVEV2OPiNPh+9c/7Kt0PqrHk1ujApimuFM0pzGbNgPGcfOW0JDdCoeGiC9e/5DppH93CJZtx7qOfWPwS03Des3JA4JEkwxffa/C4fUhBAmPwY+uLsBnbm7Ww4THXjkYcrfUIiKv4PMFC+FPP/7o5g4AmWpWDGU5+sL0+tDvjiZ/7BxzifjMROvoVi03UdqnZS1H48g8vRxPToedd+3G3gzLzuX4lAfzfYBtnTjAOOhoqxq53h/aa+TPx8OLJ+RywIkvGYtF66axKou5VjmIOMEi7Tz9Oomvs8JvrDJd1k2JeHP22bNl0sbtmupal1J7v+w5Fflpf5LmgufSu5Xzy1YwNbK+xtrutiq+eYYXgoRzTOWHFOg09oxhwPczKH/8cyvENy0FMOABBA5hNzNfDvdbrdnuvlUIq9HhANvfNl+tm4d2BVyVZVlD+7+h5p56YTRgIJOkzoVFkEqLYtVM3Gf7Lw6bIK7JcqnakZIl1RyJ+AxLKPhWBHG0Rdsg50SoZpLR+B4CvQaECVcLBAI34cO7MwFizpI4hDm6wZlkWVjCkmM/QMEchyCY6lQpxqEqClkaNq3VSKRrxc08hJBhoZsum6tiNkXXODxQcZhwChjx+D7nUI1l76VJUTgx3SaeGtk1Z9p4qBb1Z73h2gFtLZuliufd58kGB5fxbWqcoyqGLZYY0yUKrrUbzQqESlZImB7NrAu2EnH4fHfzHFv4nTpDx77WKJOkmWjDy8ftt97aElgmy06/d0a42LDnpdxNiZizWwr+EDhj8kT9cNEo+fxhKqI16mBenDY+yr9GVpigPGoVQmsT/x0xcDn2v7gf16Legvi2I1UQ+Xefn8ZUhc9zPVcYrgaBfm+I81uZ0NVv/R52xHeSo0CeJ1P8S1rMc1ue/3RVBUpqP1TTT4d/1bCmcVxNlFXtLHqdMyscU+HjAB4uyFhj3TLL2ZCxwrmCFm0OJRCube1LjqiIGF+0PfHQfPWw45sFsv3kwQPfF3N2W1Di0KdogYXylK6bXxbyb7n3fV9ITpZ+wBZLRjGVov298mS5+wLrGJ+yEJuOLJniGMuNY1lxVVX1SWJZ0fDufom5YlKk1UVvMhoMLrI4SJvEOVvg1jyj9vNrgNYjp97LxDr46C3QDEMjYw+N1bu/XnaH2okaLJaCy2vodqh0uJFNNcdJgeSuM40IAqn8qz21RAGG659EkzDgCQXfVzbyFyyhEuT9ErenhIYHggdtvd5BKGT6G1tKwqjQBCf8tiYupAYcIXEN+Q0Z+AF4wbLi1dYqdeFB6q41GPUc0GJxk+qeud2DWoduBvxHLO/mpmCFk5uCVF/gVoKRuuL8EcycByRY8QLWyUBJbBJByIJrzG0pMZX8fskIleB54N8YTif6Z12c/4uertns2TZ6zE22t4Is8YsZLzJKYYwv8HnEHAXyODcLnhv6Uxqq3y45u7sv7gw746vR4P3E3pLKhwKNlYNkPLw4aa8r8OIzOGlLnXW98G1ncEYBl2zHyJs2yWCBrjGIhBsK3f7p4XuIcSRVS6hvr9TgF1YvztEMjN/gn1euAWXwV1uW1P3BqLu3QIRyHO6fwC0GfLfEgSzrcK80mGJIaIg5/N2xE/69CSPV2oqESKG1SLtsEFjq6zwWWcvqYMzNkwgcwvQeTs+v9J3dec4fkqWQHKOF3dWOBmcDS+YYy10BAmPlQ4oDLEQqMUok80MslT5KJJ0vLMp0K1KuDs02XP99OTTcdS9Hrs9KAnf3u630P7HjLWA0JKqQQzDHwTUwWoWPwGiAYXipkDad6evs9Dg4LPEmEeztpVdZbgtkd1le09O3WfBzG47+tL8POzvwEXwKXh0Zuq+dnmv5Ktdyo1+tmmAjl+yqZzIc9xUWTSGMdUXntHRFyhysGfRTV8Ylg3u+qel1Fta5QuW/5VszVWGfVZc3kXuPsXskMjeQe1tWJ46+u9tQnDaUJvtw4tlVDTZiZNixrimKCL0cDv59U3xuKw76PSiVKgjEvZB4ASgMGQU5R7pghySQSJrSpWKJsxiWMaIYBAMi02M8uithGrPgGlSthCVnN0QQRgmd5cu5kPoqw9tZ7Bfywo51R1Gfu7GXKPKg9/70bTfrK6E4KEviWL96McdAMjHqk9aQCEVmyVi6qbJE39wquG6BXh/CkepBDzfBWyOUEtN6yagQTLWge6kukixwCCyRkGn1qEY3BIEWdGfHfZ3dGSn6t5PLcXGnDftptd+guDlKfLbu6eHsP0vLVKqNippDwY26WkXucT1S4PrP0iOtoWU9zgad8+5GR5mM4Vii2denzLA7On1rP/7eyiS9hlJDo7oNWugT4gqb3yS3Hs0eiWZudzQqorwstrPz7xetZcVWGj0v4WO5+X1nqB0s3jDemROKck8rxK7YojjW9W4RcIgYhwVjNEDXuHT2sapBiPUTMMQ2iDmOYwPKQiLQNMbtq87x4dHrnAbFcS5je6+x95jrBMRESHiAGcdL2P3PRcCbCxJwJlgkmwFbtHbhAdDtNeyully11I2j9e6+I3FfIpntEPE0IYTk0AahZYn2vG/FybfCO4DG0QE0jvfXkEopJM/FzN6AyQxvS5Ha3GFpk3SqBJnLsIjQUHs0lVY5Vrvbs2tXwqm9pvZ+kO6/hEJ58Y//9uk7r/Zo7a3/DCGz79xoHkIHeWBhGpozDiJO1IMm+qwcGzwhVg6PbJGLiG7nMD2TeZ3evvoYdkXL4Rh74fw+1iweIIVTEoHzCghTHCD1IE3okGGhaNL3J40wqsQ1K43OS7Ml17CChEyNs9VsrEqWWG8+O3HyyzaOJ7FMYyNkFJuiorqur988frNqzhfOwvhVtZsvyGNMNxXpx0QxJVm/QD5emuypvJBlrtPT0Db2w3c60qwRwyuhgel2zfvoht0wKd7Hg+w1nnJU5hvq41bQkzTPiWSTUPUduHjvIa9/5TrrnXiN4/VuVhf9m27WZ1R6p8aD83Hz46H//z59t2HUdz+eeNl6jZVlJVUIJIdd9fdv1MrzWn641HzKBlTdY/7YalttdP6LCToFHCcBC3G78f8rAdPIx+CbNhy6w8QAz5zSMnQedVUTrz3Fz7WJQb6ROWc9wO2cxNi8767HSztPTcPsj6tkVdpLUq55Tla6AlYsurbT1I9qCWkaekeToF9xOjo+hOycujazqBb5sUmlbJjdby9EEu8fNPbmTEgVtfsH4J5oTibsCgRecT79BZaYhh0310LQ/Fz6yYIKibjsOGe7pNXHGvpU4uniVtmu8894hnoDx2FF2jRw9TX5ZTKNSdCJWRKaqDWX5wpHpw9rQfyvLbsGjuYYZ/dfVgifKoirNP1xSsc2oPgW3esTegVDDgDfYKpveVOvCOtdOcf0lOyWxHF2YP3q9OLiFXAcYY5pYC5HEMyIZqxE653B3tW70/0DJXQwT+cpOgaLJJjX13FWuAw2vrS2Ob5nyl8VKz6RSHNJ9w7V5KgDn7KIwu5FE7qhbOkbEXeFUXKk1yzpS3tpKa7vmfZolpCV4u2o0zWKup1dO0BWsdxjrrJcI3JVw9JeUbfTjouoarEdlzfC0geMwy98wMhuMOckxOmnIB1GIzIregDz1pn1PaX+WlYFhPnZDKJZM2z9dDjRbyVPKNbfPUVkpkZM0EiWBHNzamQzM1EcIAl/+Qt0B2/g559dRCGSSLCEB/hET9BxeVL09ctlfK+WVdKnS59AhFS8dwdvttZb2+qf/wkAAP//eLbrkHk8AAA=
+    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
 
 
 - path: /opt/azure/containers/provision_installs_distro.sh
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line40.sh
index c7e9251d7b9..c6c63e3b1b8 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line40.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line40.sh
@@ -30,23 +30,31 @@ installContainerRuntime() {
     if [ -f "$MANIFEST_FILEPATH" ]; then
         stable_containerd="$(jq -r .containerd.stable "$MANIFEST_FILEPATH")"
         latest_containerd="$(jq -r .containerd.latest "$MANIFEST_FILEPATH")"
+        edge_containerd="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
     else
         echo "WARNING: containerd version not found in manifest, defaulting to hardcoded."
     fi
 
     # todo(ace): read 1.22 from a manifest and track it against supported versions
-    if semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
+    if semverCompare ${KUBERNETES_VERSION} "1.24.0"; then
+        containerd_version="$(echo "$edge_containerd" | cut -d- -f1)"
+        containerd_patch_version="$(echo "$edge_containerd" | cut -d- -f2)"
+        if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
+            echo "invalid container version: $edge_containerd"
+            exit $ERR_CONTAINERD_INSTALL_TIMEOUT
+        fi        
+    elif semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
         containerd_version="$(echo "$latest_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$latest_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $latest_containerd"
+            echo "invalid container version: $latest_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     else
         containerd_version="$(echo "$stable_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$stable_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $stable_containerd"
+            echo "invalid container version: $stable_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line63.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData
index 63abdf37f96..870556c59ca 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData
@@ -37,7 +37,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_installs_distro.sh
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line40.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line40.sh
index c7e9251d7b9..c6c63e3b1b8 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line40.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line40.sh
@@ -30,23 +30,31 @@ installContainerRuntime() {
     if [ -f "$MANIFEST_FILEPATH" ]; then
         stable_containerd="$(jq -r .containerd.stable "$MANIFEST_FILEPATH")"
         latest_containerd="$(jq -r .containerd.latest "$MANIFEST_FILEPATH")"
+        edge_containerd="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
     else
         echo "WARNING: containerd version not found in manifest, defaulting to hardcoded."
     fi
 
     # todo(ace): read 1.22 from a manifest and track it against supported versions
-    if semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
+    if semverCompare ${KUBERNETES_VERSION} "1.24.0"; then
+        containerd_version="$(echo "$edge_containerd" | cut -d- -f1)"
+        containerd_patch_version="$(echo "$edge_containerd" | cut -d- -f2)"
+        if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
+            echo "invalid container version: $edge_containerd"
+            exit $ERR_CONTAINERD_INSTALL_TIMEOUT
+        fi        
+    elif semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
         containerd_version="$(echo "$latest_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$latest_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $latest_containerd"
+            echo "invalid container version: $latest_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     else
         containerd_version="$(echo "$stable_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$stable_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $stable_containerd"
+            echo "invalid container version: $stable_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line63.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData
index bdbf1cea715..f6a24185345 100644
--- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData
@@ -37,7 +37,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_installs_distro.sh
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line40.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line40.sh
index c7e9251d7b9..c6c63e3b1b8 100644
--- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line40.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line40.sh
@@ -30,23 +30,31 @@ installContainerRuntime() {
     if [ -f "$MANIFEST_FILEPATH" ]; then
         stable_containerd="$(jq -r .containerd.stable "$MANIFEST_FILEPATH")"
         latest_containerd="$(jq -r .containerd.latest "$MANIFEST_FILEPATH")"
+        edge_containerd="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
     else
         echo "WARNING: containerd version not found in manifest, defaulting to hardcoded."
     fi
 
     # todo(ace): read 1.22 from a manifest and track it against supported versions
-    if semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
+    if semverCompare ${KUBERNETES_VERSION} "1.24.0"; then
+        containerd_version="$(echo "$edge_containerd" | cut -d- -f1)"
+        containerd_patch_version="$(echo "$edge_containerd" | cut -d- -f2)"
+        if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
+            echo "invalid container version: $edge_containerd"
+            exit $ERR_CONTAINERD_INSTALL_TIMEOUT
+        fi        
+    elif semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
         containerd_version="$(echo "$latest_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$latest_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $latest_containerd"
+            echo "invalid container version: $latest_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     else
         containerd_version="$(echo "$stable_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$stable_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $stable_containerd"
+            echo "invalid container version: $stable_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line63.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData
index c20b2613e92..b14d211fbf9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData
@@ -37,7 +37,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/+R7+3fbNpb/7/4rbmnVj9SUbLfN9OsZ9buurCQ6diQfWUp3NpPVQCQoYUwBWgD0I7L2b98DgA+QhBzb6XS6Z5NzHIe4uLhvfC5Abn/TmhLamiIx39rqdCZX3eGHXqc76fUno/eX7RZbyhb6nHDcChiViFDMRSsI/CVnd/dNgfkNCXCTUD130Dnvjp46lQXXWOqZ/d6kM+i/6b2dnPWGba+FZdAKKGlRLJuhp8d/6fXTQcVVDU4JNUNng1/7F4PTs6sKQchuacxQKLytzrDXGV3klDYhJ4GMHbTFgongrZgFKE6XHPRHp71+d3jmXjlTNbSZDsf9jpOcJzSwCc9/unLSXSdTzCmWWNjU41/G/dF4MuxedE+vuu3GXiymE45jjAQGn4Mv9rdG3Yvu5WA4OptcXozfKq3qVpA4xkvGZUnm2sSNJjkfjq9GF93R5EN3eNUb9NvezWHzsHnkbb0/7ffedK9Gkze9i+7l6ehduqAJiwWiJMJCNv8hGPW2toIYI5osO7kJz+I3JMZibx9WWwAAfAE+j6CxyQdb660tQoVEcZwzGSZUkgXWPDQTHMwZeITCBkrw4Xz8S3fY7466V5lK0IbGqv547WmWt4jIScT4JCIxhqPjQziCTXrCNlAG+I5IYBQiROKEYyACQhyTKeZI4gO4xRChOJ6i4BqmOGa3TSO7NjoIiaYxnhShZo3FSGIhq2Mkgo/gR+A1ah7x4NOfQc4x1YTqT41922vs/eO/VEA1i4dNQ+Zkue/lzGryuJkZsseY4VjgnKvx4a+nw36v//YECkZwg7kgjAJlEiKW0BAIhcwBBxDiCCWxJHQGksEc8TBgIQ6bZo2IGDNvg2Qh20MB3j8BjlEIR83jY4g4WwDKuQGiIUiufEQkoBlSAQUiWapUwrkoIvOAwIsbzDtssUQcu8MJPLVQ89CruKRQcJJyVWY0VmjUTOzBAwSJBD/0wY+OLG9YfJZIBvPnczu2uJmo+gxeoy6fB5/g4QE+bhhst8GjSRwrMgddSbgSdcUwdkLfoJiEuNAxc8AJOJQqc1DZ2OgOhxOrsvT6V6PTi4vJqPe+OxiP8gkRqcfjo/6p5dNX+ecL3P53+qeu1Ff7J/0nLfJXEtEQxYziYncBr7Gq6772Ks9LuqYF/wl7iCXph+4w20Jc621Z21Yfy1vGry/jZEZovu8pRyoPrPrd0a+D4Xm6I689aIOn9xgPPlVNn3I8VcOdfs9hlOxpvq1W0RTsKNEyTNDp93KJFtch4eAvHZP0uHo6evsfGgg2Vup/RuSryXh4sb39qrWGbRgLDAp4wjQhqibDtiq8wPGC3WBAcQzBHHEBe94rbx+SpRqUcwwRoSgGr2V8wbHk98EinMywnEjEp2qi2oN/BK8uXctIk8q29qAm3VrFuxVxFoc81iyrnPNEyBjL3DRmH75OH08SHre9uZRLcdJqoUD4C8I5403tNhzOcJNi2crI/Vs0I63Gqgqp1q2Y0OSuhRbh6x/K1J5rVQVElkjOq2DNNdVEV2OPiNPh+9c/7Kt0PqrHk1ujApimuFM0pzGbNgPGcfOW0JDdCoeGiC9e/5DppH93CJZtx7qOfWPwS03Des3JA4JEkwxffa/C4fUhBAmPwY+uLsBnbm7Ww4THXjkYcrfUIiKv4PMFC+FPP/7o5g4AmWpWDGU5+sL0+tDvjiZ/7BxzifjMROvoVi03UdqnZS1H48g8vRxPToedd+3G3gzLzuX4lAfzfYBtnTjAOOhoqxq53h/aa+TPx8OLJ+RywIkvGYtF66axKou5VjmIOMEi7Tz9Oomvs8JvrDJd1k2JeHP22bNl0sbtmupal1J7v+w5Fflpf5LmgufSu5Xzy1YwNbK+xtrutiq+eYYXgoRzTOWHFOg09oxhwPczKH/8cyvENy0FMOABBA5hNzNfDvdbrdnuvlUIq9HhANvfNl+tm4d2BVyVZVlD+7+h5p56YTRgIJOkzoVFkEqLYtVM3Gf7Lw6bIK7JcqnakZIl1RyJ+AxLKPhWBHG0Rdsg50SoZpLR+B4CvQaECVcLBAI34cO7MwFizpI4hDm6wZlkWVjCkmM/QMEchyCY6lQpxqEqClkaNq3VSKRrxc08hJBhoZsum6tiNkXXODxQcZhwChjx+D7nUI1l76VJUTgx3SaeGtk1Z9p4qBb1Z73h2gFtLZuliufd58kGB5fxbWqcoyqGLZYY0yUKrrUbzQqESlZImB7NrAu2EnH4fHfzHFv4nTpDx77WKJOkmWjDy8ftt97aElgmy06/d0a42LDnpdxNiZizWwr+EDhj8kT9cNEo+fxhKqI16mBenDY+yr9GVpigPGoVQmsT/x0xcDn2v7gf16Legvi2I1UQ+Xefn8ZUhc9zPVcYrgaBfm+I81uZ0NVv/R52xHeSo0CeJ1P8S1rMc1ue/3RVBUpqP1TTT4d/1bCmcVxNlFXtLHqdMyscU+HjAB4uyFhj3TLL2ZCxwrmCFm0OJRCube1LjqiIGF+0PfHQfPWw45sFsv3kwQPfF3N2W1Di0KdogYXylK6bXxbyb7n3fV9ITpZ+wBZLRjGVov298mS5+wLrGJ+yEJuOLJniGMuNY1lxVVX1SWJZ0fDufom5YlKk1UVvMhoMLrI4SJvEOVvg1jyj9vNrgNYjp97LxDr46C3QDEMjYw+N1bu/XnaH2okaLJaCy2vodqh0uJFNNcdJgeSuM40IAqn8qz21RAGG659EkzDgCQXfVzbyFyyhEuT9ErenhIYHggdtvd5BKGT6G1tKwqjQBCf8tiYupAYcIXEN+Q0Z+AF4wbLi1dYqdeFB6q41GPUc0GJxk+qeud2DWoduBvxHLO/mpmCFk5uCVF/gVoKRuuL8EcycByRY8QLWyUBJbBJByIJrzG0pMZX8fskIleB54N8YTif6Z12c/4uertns2TZ6zE22t4Is8YsZLzJKYYwv8HnEHAXyODcLnhv6Uxqq3y45u7sv7gw746vR4P3E3pLKhwKNlYNkPLw4aa8r8OIzOGlLnXW98G1ncEYBl2zHyJs2yWCBrjGIhBsK3f7p4XuIcSRVS6hvr9TgF1YvztEMjN/gn1euAWXwV1uW1P3BqLu3QIRyHO6fwC0GfLfEgSzrcK80mGJIaIg5/N2xE/69CSPV2oqESKG1SLtsEFjq6zwWWcvqYMzNkwgcwvQeTs+v9J3dec4fkqWQHKOF3dWOBmcDS+YYy10BAmPlQ4oDLEQqMUok80MslT5KJJ0vLMp0K1KuDs02XP99OTTcdS9Hrs9KAnf3u630P7HjLWA0JKqQQzDHwTUwWoWPwGiAYXipkDad6evs9Dg4LPEmEeztpVdZbgtkd1le09O3WfBzG47+tL8POzvwEXwKXh0Zuq+dnmv5Ktdyo1+tmmAjl+yqZzIc9xUWTSGMdUXntHRFyhysGfRTV8Ylg3u+qel1Fta5QuW/5VszVWGfVZc3kXuPsXskMjeQe1tWJ46+u9tQnDaUJvtw4tlVDTZiZNixrimKCL0cDv59U3xuKw76PSiVKgjEvZB4ASgMGQU5R7pghySQSJrSpWKJsxiWMaIYBAMi02M8uithGrPgGlSthCVnN0QQRgmd5cu5kPoqw9tZ7Bfywo51R1Gfu7GXKPKg9/70bTfrK6E4KEviWL96McdAMjHqk9aQCEVmyVi6qbJE39wquG6BXh/CkepBDzfBWyOUEtN6yagQTLWge6kukixwCCyRkGn1qEY3BIEWdGfHfZ3dGSn6t5PLcXGnDftptd+guDlKfLbu6eHsP0vLVKqNippDwY26WkXucT1S4PrP0iOtoWU9zgad8+5GR5mM4Vii2denzLA7On1rP/7eyiS9hlJDo7oNWugT4gqb3yS3Hs0eiWZudzQqorwstrPz7xetZcVWGj0v4WO5+X1nqB0s3jDemROKck8rxK7YojjW9W4RcIgYhwVjNEDXuHT2sapBiPUTMMQ2iDmOYwPKQiLQNMbtq87x4dHrnAbFcS5je6+x95jrBMRESHiAGcdL2P3PRcCbCxJwJlgkmwFbtHbhAdDtNeyully11I2j9e6+I3FfIpntEPE0IYTk0AahZYn2vG/FybfCO4DG0QE0jvfXkEopJM/FzN6AyQxvS5Ha3GFpk3SqBJnLsIjQUHs0lVY5Vrvbs2tXwqm9pvZ+kO6/hEJ58Y//9uk7r/Zo7a3/DCGz79xoHkIHeWBhGpozDiJO1IMm+qwcGzwhVg6PbJGLiG7nMD2TeZ3evvoYdkXL4Rh74fw+1iweIIVTEoHzCghTHCD1IE3okGGhaNL3J40wqsQ1K43OS7Ml17CChEyNs9VsrEqWWG8+O3HyyzaOJ7FMYyNkFJuiorqur988frNqzhfOwvhVtZsvyGNMNxXpx0QxJVm/QD5emuypvJBlrtPT0Db2w3c60qwRwyuhgel2zfvoht0wKd7Hg+w1nnJU5hvq41bQkzTPiWSTUPUduHjvIa9/5TrrnXiN4/VuVhf9m27WZ1R6p8aD83Hz46H//z59t2HUdz+eeNl6jZVlJVUIJIdd9fdv1MrzWn641HzKBlTdY/7YalttdP6LCToFHCcBC3G78f8rAdPIx+CbNhy6w8QAz5zSMnQedVUTrz3Fz7WJQb6ROWc9wO2cxNi8767HSztPTcPsj6tkVdpLUq55Tla6AlYsurbT1I9qCWkaekeToF9xOjo+hOycujazqBb5sUmlbJjdby9EEu8fNPbmTEgVtfsH4J5oTibsCgRecT79BZaYhh0310LQ/Fz6yYIKibjsOGe7pNXHGvpU4uniVtmu8894hnoDx2FF2jRw9TX5ZTKNSdCJWRKaqDWX5wpHpw9rQfyvLbsGjuYYZ/dfVgifKoirNP1xSsc2oPgW3esTegVDDgDfYKpveVOvCOtdOcf0lOyWxHF2YP3q9OLiFXAcYY5pYC5HEMyIZqxE653B3tW70/0DJXQwT+cpOgaLJJjX13FWuAw2vrS2Ob5nyl8VKz6RSHNJ9w7V5KgDn7KIwu5FE7qhbOkbEXeFUXKk1yzpS3tpKa7vmfZolpCV4u2o0zWKup1dO0BWsdxjrrJcI3JVw9JeUbfTjouoarEdlzfC0geMwy98wMhuMOckxOmnIB1GIzIregDz1pn1PaX+WlYFhPnZDKJZM2z9dDjRbyVPKNbfPUVkpkZM0EiWBHNzamQzM1EcIAl/+Qt0B2/g559dRCGSSLCEB/hET9BxeVL09ctlfK+WVdKnS59AhFS8dwdvttZb2+qf/wkAAP//eLbrkHk8AAA=
+    H4sIAAAAAAAA/+Rbe3fbNpb/35/iDq36kZqU7baZrmfUXVVWEh07ko8spTubyWogEpQwpgAtAMp2ZO1n3wPwBZKQH0mn0zmbnOM4xMXFfeN3AXL3D80poc0pEvOdnU5nct0dfuh1upNefzJ6f9VqsqVsos8xx02fUYkIxVw0fd9dcnZ37wnMV8THHqF67qBz0R09dyrzb7DUM/u9SWfQf9N7OznvDVtOE0u/6VPSpFh6gaPHf+7100HFVQ1OCU2Gzge/9C8H7fPrCkHAbmnEUCCcnc6w1xld5pQmISe+jCy0xYKx4M2I+ShKlxz0R+1evzs8t6+cqRqYTIfjfsdKzmPqm4QXP15b6W7iKeYUSyxM6vHP4/5oPBl2L7vt626rcRCJ6YTjCCOBweXgisOdUfeyezUYjs4nV5fjt0qruhUkjvCScVmSuTZxq0kuhuPr0WV3NPnQHV73Bv2Wszr2jr0TZ+d9u997070eTd70LrtX7dG7dMEkLBaIkhAL6f1dMOrs7PgRRjRednITnkdvSITFwSGsdwAA+AJcHkJjmw92Njs7hAqJoihnMoypJAuseWgm2J8zcAiFLZTgwsX45+6w3x11rzOVoAWNdf3xxtEsbxGRk5DxSUgiDCenx3AC2/SEXaAM8B2RwCiEiEQxx0AEBDgiU8yRxEdwiyFEUTRF/g1MccRuvUR2bXQQEk0jPClCzRiLkMRCVsdICB/BDcFp1DziwKc/gZxjqgnVnxr7ltM4+Pv/qIDyiodeQmZleejkzGry2JklZE8xw8HsabkU0WOMcCRwwVEHwy/tYb/Xf3sGBRtYYS4Io0CZhJDFNABCIfPkEQQ4RHEkCZ2BZDBHPPBZgAMvWSMkib92QbKAHSAfH54BxyiAE+/0FELOFoByboBoAJIrZxMJaIZUZIKIlyoncS6KyFwp8GKFeYctlohje1yCc+Kdfu8dOxXfFgpOUq7KiIkVGhXzOvAAfizBDVxwwxPDDwaXJZL+/KW8Tg1eSWh+BqdRl82BT/DwAB+3DLZa4NA4ihSZha4kWom6YhSzKqxQRIJCwcz2Z1DTqDxd5XOjOxxOjNrU61+P2peXk1HvfXcwHuUTQpL9lgbkC3x6+kKf1vLvq7z6BLd/Sb/Wdfoaz9ZLzKPuqdXar3LPE9z+Jd1T1+mr3ZP+k+7/1xLRAEWM4gJ4gNNY11XfOJXnJVVTLPAMeGFI+qE7zNCFbb0dA9H0sbxl/OYqimeE5pBI+VE5YN3vjn4ZDC9SsLZxoAWOhh8OfKpaPuXYVsOdfs9ilOxpjriqQBv2lGgZXOz0e7lEi5uAcHCXlkl6XD0dvf0v3SM01up/icjXk/Hwcnf3VXMDuzAWGFRPAtOYqF0WdtVWChwv2AoDiiLw54gLOHBeOYcQL9WgnGMICUUROM3EFxxLfu8vgskMy4lEfKomKnj2Azh16ZqJNKlsGwdq0m1UuBsRZ3DIY82wygWPhYywzE2TQLSb9PEk5lHLmUu5FGfNJvKFuyCcM+5pt6ntxqNYNjNy9xbNSLOxrqLtTTMiNL5rokXw+vsytWNbVWHUJZLzKo63TU2iq3FARHv4/vX3hyqbT+rxZNeo6FnSlkR404hNPZ9x7N0SGrBbYdEQ8cXr7zOd9O8WwTKApcvYHxJoW9OwXnLygCDhJIPe36lweH0MfswjcMPrS3CZnZvxMOaRUw6G3C21iMgL+HzBAvjjDz/YuWdwICRmDGU5+oXp9aHfHU1+3zlmE/GFidbRXXxuorSFz7rRxkny9Go8aQ8771qNgxmWnatxm/vzQ4BdnTjAOOhoqxq5fnRgrpE/Hw8vn5HLPieuZCwSzVVjXRZzo3IQcYJFeijh1klcnRVuY53psvEk4t7ss2PKpI3bTaprXUrt/bLnVOSnrWuaC45N72bOL1shqZH1NTZmI17xzQu84MecYyo/pDincZAYBlw3a85Of2oGeNVU+AIeQOAA9jPz5Q1csznbPzQKYTU6LFD7G+/Vxjs2K+C6LMsGWv8LNffUC2MCBjJJ6lxYCKm0KFLt4X22/+LAA3FDlkvVYJYsqeZIxGdYQsG3Ioil0d0FOScCiABGo3vw9RoQxFwt4AvswYd35wLEnMVRAHO0wplkWVjCkmPXR/4cByAYUAYU40AVhSwNPWM1EupasZoHEDAsdBttclXMpugGB0cqDmNOASMe3eccqrHsfGlSFE5Mt4nnRnbNmSYeqkX9eW+4sSBbw2ap4vl5wtkWB5fxbWqckyqGLZYY0yXyb7QbkxUIlayQMD212xRsJeLw+W71Elu4nTpDy77WKJOkmWjCy8ftt9nZEVjGy06/d0642LLnpdyTEjFntxTcIXDG5Jn6YaNR8rnDVERj1MK8OIh+lH+NrDBBedQohMYm/hti4HLsP7kf16LegPimI1UQuXefn8dUhc9LPVcYrgaBfmuI82uZ0NZv/RZ2xHeSI19exFP8c1rMc1te/HhdBUpqP1TT28O/aFjTOK0myrp2TbHJmRWOqfCxAA8bZKyxbibLmZCxwrmCFk0OJRCube1KjqgIGV+0HPHgvXrYc5MFsv3kwQHXFXN2W1DiwKVogYXylK6bTwv519z7riskJ0vXZ4slo5hK0fpOebLcfYFxw0NZgJOOLJ7iCMutY1lxVVX1WWIZ0fDufom5YlKk1WVvMhoMLrM4SJvEOVvg5jyjdvMbouYjFyLL2Dj46C3QDEMjYw+N9bu/XHWH2okaLJaCy2nodqh0uJFNTU6TfMltZxoh+FL5V3tqiXwMNz8KjzDgMQXXVTZyFyymEuT9EremhAZHgvstvd5RIGT6G1tKwqjQBGf8tiYupAYcIXED+eUpuD44/rLi1eY6deFR6q4NJOpZoMVileqeud2BWoeeDLiPWN7OTcEKKzcFqZ7gVoKRuuL8HsycByQY8QLGyUBJbBJCwPwbzE0pMZX8fskIleA44K4STmf6Z12c/4+ertnsxTZ6zE2mt/ws8YsZX2SUwhhP8HnEHAXyuEgWvEjo2zRQv11xdndfXCd3xtejwfuJuSWVDwUaawvJeHh51tpU4MVnsNKWOut64dvN4IwCLtmOkTdtksEC3WAQMU8odPunh+8hwqFULaG+j1SDT6xenKMlMH6Lf17ZBpTBX+0YUvcHo+7BAhHKcXB4BrcY8N0S+7Ksw73SYIohpgHm8DfLTvg3D0aqtRUxkUJrkXbZILDUF7QsNJbVwZibJxY4gOk9tC+u9S3sRc4f4qWQHKOF2dWOBucDQ+YIy30BAmPlQ4p9LEQqMYolcwMslT5KJJ0vLMx0K1KuDs22XP49HRr2upcj1xclgb373VX6n5nx5jMaEFXIwZ9j/wYYrcJHYNTHMLxSSJvO9JsO6XFwUOJNQjg4SG+y7BbIrrIcz9GXWfBTC07+eHgIe3vwEVwKTh0Z2m+dXmr5Ktdyo1+tmmAil+yqZzIc9xUWTSGMcUNntXRFyhysJeinroxNBvv8pKbXWRjnCpX/lm/NVIV9UV3eRu48xu6RyNxC7uwYnTj69m5LcdpSmszDiRdXNdiKkWHPuKYoIvRqOPjPbfG5qzjoV+RUqiAQ90LiBaAgYBTkHOmCHRBfIpmULhVLnEWwjBDFIBgQmR7j0X0J04j5N6BqJSw5WxFBGCV0li9nQ+rrDG9nsV/IC3vGHUV97tZeosiD3vv2227WV0JxUBZHkX6ZZo6BZGLUJ20gForMkLF0U2WIvr1VsN0CvT6GE9WDHm+Dt4lQSkzj/bNCMNWCHqS6SLLAAbBYQqbVoxqtCAIt6N6e/Tq7M1L0bydX4+JOGw7Tar9F8eQo8cW6p4ez/ygtU6m2KpocCm7V1Shyj+uRAtd/lB5pDS3rcT7oXHS3OirJGI4lmn19ygy7o/Zb8/F3RibpNZQaGtVt0UKfEFfY/Cq59Wj2SDSzu6NREeXLYjs7//6itYzYSqPnS/gYbn7fGWoHizeMd+aEotzTCrErtiiKdL1b+BxCxmHBGPXRDS6dfaxrEGLzDAyxC2KOoygBZQERaBrh1nXn9PjkdU6DoiiXsXXQOHjMdQIiIiQ8wIzjJez/98Ln3oL4nAkWSs9ni+Y+PAC6vYH99ZKrlrpxstk/tCTul0hmOkQ8TwghObRAaFnCA+cbcfaNcI6gcXIEjdPDDaRSCslzMbM3YDLDm1KkNrdYOkk6VYKSy7CQ0EB7NJVWOVa72zFrV8ypuab2vp/uv4RCefGP//HpW6f2aONs/gQBM+/caB5CR3lgYRokZxxEnKkHHvqsHOs/I1aOT0yRi4hu5TA9k3mT3r66GPZF0+IYc+H8PjZZ3EcKp8QC5xUQpthH6kGa0AHDQtGkb8QmwqgS51UanS/NllzDChJKapypZmNdssRm+9mJlV+2cTyLZRobAaM4KSqq6/r6zeNXq+Z8YS2MX1W7+YI8xnRbkX5MlKQk628LxsskeyovZCXX6WloJ/bDdzrSjJGEV0z9pNtNPlVI2A3j4n08yF7jKUdlvqE+bgU9SfOcSDYJVN+Bi/ce8vpXrrPOmdM43exnddFddbM+o9I7NR6sj72Px+6/ffp2y6hrfzxxsvUaa8NKqhBIDvvq71+pkee1/LCp+ZwNqLrH/L7VNtro/Jck6BRwnPgswK3Gv1cCppGPwR9acGwPkwR45pSGofOoq5p44yh+tk0M8o3MOusBbuckwskXDHq8tPPUNMz+2EpWpb0k5ZpnZaUrYMWiGzNN3bCWkElDb2kS9CtOJ6fHkJ1T12YW1SI/NqmUjWT3OwiQxIdHjYM5E1JF7eER2CcmJxNmBQKnOJ9+giWmQcfOtRA0P5d+tqBCIi471tk2afWxhj6VeL64Vbab/Auvod7AcVCRNg1cfU1+FU8j4nciFgdJ1CaX5wpHpw9rQfzPLbsJHM0xzv4/rRA+VxBbafr9lI5dQNEtutcn9AqGHAFeYapveVOvCONdOcv0lOyWRFF2YP2qfXn5CjgOMcfUTy5HEMyIZqxE653DwfW79uGREtqfp/MUHYNF7M/r61grXAYbv7S2Wb5Qy18VKz6RSHNJ9w7V5KgDn7KIwuxFY7qlbOkbEXuFUXKk1yzpS3tpKa7vmeZolpCV4m2p0zWKup1tO0BWsexjtrJcI7JVw9JeUbfTno2oarE9mzeC0retwye+bWUrzDkJcPopSIfRkMyKHiB568z41FZ/SK0CIvnp+eHMC5o/Hk/0W8kTivVnTyGZqZEkaCSL/XlyamQyS6LYRxL+/GfoDt7ATz/ZiAIkkWAx9/GZnqDj8qzo65fL6F4tq6RPlz6DEKl47w7e7Gx2dtU//xcAAP//0WNoCJQ+AAA=
 
 
 - path: /opt/azure/containers/provision_installs_distro.sh
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line40.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line40.sh
index c7e9251d7b9..c6c63e3b1b8 100644
--- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line40.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line40.sh
@@ -30,23 +30,31 @@ installContainerRuntime() {
     if [ -f "$MANIFEST_FILEPATH" ]; then
         stable_containerd="$(jq -r .containerd.stable "$MANIFEST_FILEPATH")"
         latest_containerd="$(jq -r .containerd.latest "$MANIFEST_FILEPATH")"
+        edge_containerd="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
     else
         echo "WARNING: containerd version not found in manifest, defaulting to hardcoded."
     fi
 
     # todo(ace): read 1.22 from a manifest and track it against supported versions
-    if semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
+    if semverCompare ${KUBERNETES_VERSION} "1.24.0"; then
+        containerd_version="$(echo "$edge_containerd" | cut -d- -f1)"
+        containerd_patch_version="$(echo "$edge_containerd" | cut -d- -f2)"
+        if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
+            echo "invalid container version: $edge_containerd"
+            exit $ERR_CONTAINERD_INSTALL_TIMEOUT
+        fi        
+    elif semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
         containerd_version="$(echo "$latest_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$latest_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $latest_containerd"
+            echo "invalid container version: $latest_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     else
         containerd_version="$(echo "$stable_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$stable_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $stable_containerd"
+            echo "invalid container version: $stable_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line63.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData
index 7cea37fe723..a9daa8022a9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData
@@ -37,7 +37,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    H4sIAAAAAAAA/+Rbe3fbNpb/35/iDq36kZqU7baZrmfUXVVWEh07ko8spTubyWogEpQwpgAtAMp2ZO1n3wPwBZKQH0mn0zmbnOM4xMXFfeN3AXL3D80poc0pEvOdnU5nct0dfuh1upNefzJ6f9VqsqVsos8xx02fUYkIxVw0fd9dcnZ37wnMV8THHqF67qBz0R09dyrzb7DUM/u9SWfQf9N7OznvDVtOE0u/6VPSpFh6gaPHf+7100HFVQ1OCU2Gzge/9C8H7fPrCkHAbmnEUCCcnc6w1xld5pQmISe+jCy0xYKx4M2I+ShKlxz0R+1evzs8t6+cqRqYTIfjfsdKzmPqm4QXP15b6W7iKeYUSyxM6vHP4/5oPBl2L7vt626rcRCJ6YTjCCOBweXgisOdUfeyezUYjs4nV5fjt0qruhUkjvCScVmSuTZxq0kuhuPr0WV3NPnQHV73Bv2Wszr2jr0TZ+d9u997070eTd70LrtX7dG7dMEkLBaIkhAL6f1dMOrs7PgRRjRednITnkdvSITFwSGsdwAA+AJcHkJjmw92Njs7hAqJoihnMoypJAuseWgm2J8zcAiFLZTgwsX45+6w3x11rzOVoAWNdf3xxtEsbxGRk5DxSUgiDCenx3AC2/SEXaAM8B2RwCiEiEQxx0AEBDgiU8yRxEdwiyFEUTRF/g1MccRuvUR2bXQQEk0jPClCzRiLkMRCVsdICB/BDcFp1DziwKc/gZxjqgnVnxr7ltM4+Pv/qIDyiodeQmZleejkzGry2JklZE8xw8HsabkU0WOMcCRwwVEHwy/tYb/Xf3sGBRtYYS4Io0CZhJDFNABCIfPkEQQ4RHEkCZ2BZDBHPPBZgAMvWSMkib92QbKAHSAfH54BxyiAE+/0FELOFoByboBoAJIrZxMJaIZUZIKIlyoncS6KyFwp8GKFeYctlohje1yCc+Kdfu8dOxXfFgpOUq7KiIkVGhXzOvAAfizBDVxwwxPDDwaXJZL+/KW8Tg1eSWh+BqdRl82BT/DwAB+3DLZa4NA4ihSZha4kWom6YhSzKqxQRIJCwcz2Z1DTqDxd5XOjOxxOjNrU61+P2peXk1HvfXcwHuUTQpL9lgbkC3x6+kKf1vLvq7z6BLd/Sb/Wdfoaz9ZLzKPuqdXar3LPE9z+Jd1T1+mr3ZP+k+7/1xLRAEWM4gJ4gNNY11XfOJXnJVVTLPAMeGFI+qE7zNCFbb0dA9H0sbxl/OYqimeE5pBI+VE5YN3vjn4ZDC9SsLZxoAWOhh8OfKpaPuXYVsOdfs9ilOxpjriqQBv2lGgZXOz0e7lEi5uAcHCXlkl6XD0dvf0v3SM01up/icjXk/Hwcnf3VXMDuzAWGFRPAtOYqF0WdtVWChwv2AoDiiLw54gLOHBeOYcQL9WgnGMICUUROM3EFxxLfu8vgskMy4lEfKomKnj2Azh16ZqJNKlsGwdq0m1UuBsRZ3DIY82wygWPhYywzE2TQLSb9PEk5lHLmUu5FGfNJvKFuyCcM+5pt6ntxqNYNjNy9xbNSLOxrqLtTTMiNL5rokXw+vsytWNbVWHUJZLzKo63TU2iq3FARHv4/vX3hyqbT+rxZNeo6FnSlkR404hNPZ9x7N0SGrBbYdEQ8cXr7zOd9O8WwTKApcvYHxJoW9OwXnLygCDhJIPe36lweH0MfswjcMPrS3CZnZvxMOaRUw6G3C21iMgL+HzBAvjjDz/YuWdwICRmDGU5+oXp9aHfHU1+3zlmE/GFidbRXXxuorSFz7rRxkny9Go8aQ8771qNgxmWnatxm/vzQ4BdnTjAOOhoqxq5fnRgrpE/Hw8vn5HLPieuZCwSzVVjXRZzo3IQcYJFeijh1klcnRVuY53psvEk4t7ss2PKpI3bTaprXUrt/bLnVOSnrWuaC45N72bOL1shqZH1NTZmI17xzQu84MecYyo/pDincZAYBlw3a85Of2oGeNVU+AIeQOAA9jPz5Q1csznbPzQKYTU6LFD7G+/Vxjs2K+C6LMsGWv8LNffUC2MCBjJJ6lxYCKm0KFLt4X22/+LAA3FDlkvVYJYsqeZIxGdYQsG3Ioil0d0FOScCiABGo3vw9RoQxFwt4AvswYd35wLEnMVRAHO0wplkWVjCkmPXR/4cByAYUAYU40AVhSwNPWM1EupasZoHEDAsdBttclXMpugGB0cqDmNOASMe3eccqrHsfGlSFE5Mt4nnRnbNmSYeqkX9eW+4sSBbw2ap4vl5wtkWB5fxbWqckyqGLZYY0yXyb7QbkxUIlayQMD212xRsJeLw+W71Elu4nTpDy77WKJOkmWjCy8ftt9nZEVjGy06/d0642LLnpdyTEjFntxTcIXDG5Jn6YaNR8rnDVERj1MK8OIh+lH+NrDBBedQohMYm/hti4HLsP7kf16LegPimI1UQuXefn8dUhc9LPVcYrgaBfmuI82uZ0NZv/RZ2xHeSI19exFP8c1rMc1te/HhdBUpqP1TT28O/aFjTOK0myrp2TbHJmRWOqfCxAA8bZKyxbibLmZCxwrmCFk0OJRCube1KjqgIGV+0HPHgvXrYc5MFsv3kwQHXFXN2W1DiwKVogYXylK6bTwv519z7riskJ0vXZ4slo5hK0fpOebLcfYFxw0NZgJOOLJ7iCMutY1lxVVX1WWIZ0fDufom5YlKk1WVvMhoMLrM4SJvEOVvg5jyjdvMbouYjFyLL2Dj46C3QDEMjYw+N9bu/XHWH2okaLJaCy2nodqh0uJFNTU6TfMltZxoh+FL5V3tqiXwMNz8KjzDgMQXXVTZyFyymEuT9EremhAZHgvstvd5RIGT6G1tKwqjQBGf8tiYupAYcIXED+eUpuD44/rLi1eY6deFR6q4NJOpZoMVileqeud2BWoeeDLiPWN7OTcEKKzcFqZ7gVoKRuuL8HsycByQY8QLGyUBJbBJCwPwbzE0pMZX8fskIleA44K4STmf6Z12c/4+ertnsxTZ6zE2mt/ws8YsZX2SUwhhP8HnEHAXyuEgWvEjo2zRQv11xdndfXCd3xtejwfuJuSWVDwUaawvJeHh51tpU4MVnsNKWOut64dvN4IwCLtmOkTdtksEC3WAQMU8odPunh+8hwqFULaG+j1SDT6xenKMlMH6Lf17ZBpTBX+0YUvcHo+7BAhHKcXB4BrcY8N0S+7Ksw73SYIohpgHm8DfLTvg3D0aqtRUxkUJrkXbZILDUF7QsNJbVwZibJxY4gOk9tC+u9S3sRc4f4qWQHKOF2dWOBucDQ+YIy30BAmPlQ4p9LEQqMYolcwMslT5KJJ0vLMx0K1KuDs22XP49HRr2upcj1xclgb373VX6n5nx5jMaEFXIwZ9j/wYYrcJHYNTHMLxSSJvO9JsO6XFwUOJNQjg4SG+y7BbIrrIcz9GXWfBTC07+eHgIe3vwEVwKTh0Z2m+dXmr5Ktdyo1+tmmAil+yqZzIc9xUWTSGMcUNntXRFyhysJeinroxNBvv8pKbXWRjnCpX/lm/NVIV9UV3eRu48xu6RyNxC7uwYnTj69m5LcdpSmszDiRdXNdiKkWHPuKYoIvRqOPjPbfG5qzjoV+RUqiAQ90LiBaAgYBTkHOmCHRBfIpmULhVLnEWwjBDFIBgQmR7j0X0J04j5N6BqJSw5WxFBGCV0li9nQ+rrDG9nsV/IC3vGHUV97tZeosiD3vv2227WV0JxUBZHkX6ZZo6BZGLUJ20gForMkLF0U2WIvr1VsN0CvT6GE9WDHm+Dt4lQSkzj/bNCMNWCHqS6SLLAAbBYQqbVoxqtCAIt6N6e/Tq7M1L0bydX4+JOGw7Tar9F8eQo8cW6p4ez/ygtU6m2KpocCm7V1Shyj+uRAtd/lB5pDS3rcT7oXHS3OirJGI4lmn19ygy7o/Zb8/F3RibpNZQaGtVt0UKfEFfY/Cq59Wj2SDSzu6NREeXLYjs7//6itYzYSqPnS/gYbn7fGWoHizeMd+aEotzTCrErtiiKdL1b+BxCxmHBGPXRDS6dfaxrEGLzDAyxC2KOoygBZQERaBrh1nXn9PjkdU6DoiiXsXXQOHjMdQIiIiQ8wIzjJez/98Ln3oL4nAkWSs9ni+Y+PAC6vYH99ZKrlrpxstk/tCTul0hmOkQ8TwghObRAaFnCA+cbcfaNcI6gcXIEjdPDDaRSCslzMbM3YDLDm1KkNrdYOkk6VYKSy7CQ0EB7NJVWOVa72zFrV8ypuab2vp/uv4RCefGP//HpW6f2aONs/gQBM+/caB5CR3lgYRokZxxEnKkHHvqsHOs/I1aOT0yRi4hu5TA9k3mT3r66GPZF0+IYc+H8PjZZ3EcKp8QC5xUQpthH6kGa0AHDQtGkb8QmwqgS51UanS/NllzDChJKapypZmNdssRm+9mJlV+2cTyLZRobAaM4KSqq6/r6zeNXq+Z8YS2MX1W7+YI8xnRbkX5MlKQk628LxsskeyovZCXX6WloJ/bDdzrSjJGEV0z9pNtNPlVI2A3j4n08yF7jKUdlvqE+bgU9SfOcSDYJVN+Bi/ce8vpXrrPOmdM43exnddFddbM+o9I7NR6sj72Px+6/ffp2y6hrfzxxsvUaa8NKqhBIDvvq71+pkee1/LCp+ZwNqLrH/L7VNtro/Jck6BRwnPgswK3Gv1cCppGPwR9acGwPkwR45pSGofOoq5p44yh+tk0M8o3MOusBbuckwskXDHq8tPPUNMz+2EpWpb0k5ZpnZaUrYMWiGzNN3bCWkElDb2kS9CtOJ6fHkJ1T12YW1SI/NqmUjWT3OwiQxIdHjYM5E1JF7eER2CcmJxNmBQKnOJ9+giWmQcfOtRA0P5d+tqBCIi471tk2afWxhj6VeL64Vbab/Auvod7AcVCRNg1cfU1+FU8j4nciFgdJ1CaX5wpHpw9rQfzPLbsJHM0xzv4/rRA+VxBbafr9lI5dQNEtutcn9AqGHAFeYapveVOvCONdOcv0lOyWRFF2YP2qfXn5CjgOMcfUTy5HEMyIZqxE653DwfW79uGREtqfp/MUHYNF7M/r61grXAYbv7S2Wb5Qy18VKz6RSHNJ9w7V5KgDn7KIwuxFY7qlbOkbEXuFUXKk1yzpS3tpKa7vmeZolpCV4m2p0zWKup1tO0BWsexjtrJcI7JVw9JeUbfTno2oarE9mzeC0retwye+bWUrzDkJcPopSIfRkMyKHiB568z41FZ/SK0CIvnp+eHMC5o/Hk/0W8kTivVnTyGZqZEkaCSL/XlyamQyS6LYRxL+/GfoDt7ATz/ZiAIkkWAx9/GZnqDj8qzo65fL6F4tq6RPlz6DEKl47w7e7Gx2dtU//xcAAP//0WNoCJQ+AAA=
 
 
 - path: /opt/azure/containers/provision_installs_distro.sh
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 
diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line40.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line40.sh
index c7e9251d7b9..c6c63e3b1b8 100644
--- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line40.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line40.sh
@@ -30,23 +30,31 @@ installContainerRuntime() {
     if [ -f "$MANIFEST_FILEPATH" ]; then
         stable_containerd="$(jq -r .containerd.stable "$MANIFEST_FILEPATH")"
         latest_containerd="$(jq -r .containerd.latest "$MANIFEST_FILEPATH")"
+        edge_containerd="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
     else
         echo "WARNING: containerd version not found in manifest, defaulting to hardcoded."
     fi
 
     # todo(ace): read 1.22 from a manifest and track it against supported versions
-    if semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
+    if semverCompare ${KUBERNETES_VERSION} "1.24.0"; then
+        containerd_version="$(echo "$edge_containerd" | cut -d- -f1)"
+        containerd_patch_version="$(echo "$edge_containerd" | cut -d- -f2)"
+        if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
+            echo "invalid container version: $edge_containerd"
+            exit $ERR_CONTAINERD_INSTALL_TIMEOUT
+        fi        
+    elif semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
         containerd_version="$(echo "$latest_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$latest_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $latest_containerd"
+            echo "invalid container version: $latest_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     else
         containerd_version="$(echo "$stable_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$stable_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $stable_containerd"
+            echo "invalid container version: $stable_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line63.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line63.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/RawUbuntu/CustomData b/pkg/agent/testdata/RawUbuntu/CustomData
index cda28880251..688a3a6d75b 100644
--- a/pkg/agent/testdata/RawUbuntu/CustomData
+++ b/pkg/agent/testdata/RawUbuntu/CustomData
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 - path: /opt/azure/containers/provision_cis.sh
diff --git a/pkg/agent/testdata/RawUbuntu/line63.sh b/pkg/agent/testdata/RawUbuntu/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/RawUbuntu/line63.sh
+++ b/pkg/agent/testdata/RawUbuntu/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/agent/testdata/RawUbuntuContainerd/CustomData b/pkg/agent/testdata/RawUbuntuContainerd/CustomData
index 2a4b29033c3..4d0c6c45337 100644
--- a/pkg/agent/testdata/RawUbuntuContainerd/CustomData
+++ b/pkg/agent/testdata/RawUbuntuContainerd/CustomData
@@ -37,7 +37,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_installs_distro.sh
@@ -60,7 +60,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8RU0W7TMBR971dEoW9gu9nYA33ruqBVTOkUViSEpsiO74aFa1e208Kq/Duyy5q0ZCtUoL3ee3zuveecZN2LoiiKS60cFQoMj4fRphbqd0JCRucQD6N4rtkP1ACL/no8zW5GkyzNL4pPaf5xMs3q1/ShMoB2etejm/HlFoE5sPhNM4LrlZKa8itdUie08qOIXjjSjCKPGNv1cJZf+TdfnVvYISF+TcykZrjUBvBKKK5XFitwoUX2ziDPnEGY0EqURApVfff3Xs+KUT6+rPdJjtWizbmvyxKMFVrZeBh92VZDJ8FvcXKKTuJt+bb1TlIH1nlFEnyGkwQlbVbrKJOw6bZZ6g0mNpUqD0TAQ4r+Op9l499PDdUjDffE/97qwNq57gF7//bOY80c4AEy5buTFn63c9ZttFDWUSlh95Pd6AV3tJK/QjDApw1BveO2WgouaBNkf7MTwesnEnDIyGdce0qP266VuBEe84KLfKsYGAUO/s8SjxmmpUVzYYw2OGQL+D2EBDfzybK/DlFLL4oPs/O0OJ9ko/zzNniECUWNANt6g5TmgEKyUTuXjhp8//BnChQO5gv/O3kJF3p171U6fd/7GQAA//8jbFijoQYAAA==
+    H4sIAAAAAAAA/8SU3W7TMBTH7/sUUegd2G72gUTvui5oFVM6hRUJoSly4rNh4dqV7bSwKu+O7G5NUrIVKqbdnu9z/j973QuCIAgLJS3lEjQLh8HG5u23XEBC5xAOg3Cu8l+oDsz66/E0uR5Nkjg9z77E6efJNKne0vtSA2r5rkbX44ttBGaQh+/qFkytpFCUXaqCWq6ka0XUwpK6FXmMMV2Js/TS5Xy3dmGGhLgxcS5UjgulAa+4ZGplsATrXWRnDfLMGiTnSvKCCC7Ln27fq1k2SscX1W6RQ2/RrLl7lyVow5U04TD4trV6T4RPcHSMjsKt+aaRB+zOyxXh9/gERc2SglowduM8xVHU9hpLc/GQ2mxQbWJCXcpiDx0uJOuv01ky/vMK3nogC67w/6fAV+0cd4/y/7rnoToP8ADp4sNRI77tOe1mgEtjqRDQfs2be8EtLcUDBAN8XBeoWmrLJWec1oy7nS33Wj9BwD4hn1HtqXvcdI3ENHcxrzjIjzIHLcHCywzxyDAtDJpzrZXGni33sj3BdX+y7K89avF59ml2Fmdnk2SUft2CR3IuqeZgGjlIKgbIk42aXFqq8d39310gszBfuO/kNVToVb038fRj73cAAAD//2/x5r68BgAA
 
 
 - path: /opt/azure/containers/provision_cis.sh
diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line40.sh b/pkg/agent/testdata/RawUbuntuContainerd/line40.sh
index c7e9251d7b9..c6c63e3b1b8 100644
--- a/pkg/agent/testdata/RawUbuntuContainerd/line40.sh
+++ b/pkg/agent/testdata/RawUbuntuContainerd/line40.sh
@@ -30,23 +30,31 @@ installContainerRuntime() {
     if [ -f "$MANIFEST_FILEPATH" ]; then
         stable_containerd="$(jq -r .containerd.stable "$MANIFEST_FILEPATH")"
         latest_containerd="$(jq -r .containerd.latest "$MANIFEST_FILEPATH")"
+        edge_containerd="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
     else
         echo "WARNING: containerd version not found in manifest, defaulting to hardcoded."
     fi
 
     # todo(ace): read 1.22 from a manifest and track it against supported versions
-    if semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
+    if semverCompare ${KUBERNETES_VERSION} "1.24.0"; then
+        containerd_version="$(echo "$edge_containerd" | cut -d- -f1)"
+        containerd_patch_version="$(echo "$edge_containerd" | cut -d- -f2)"
+        if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
+            echo "invalid container version: $edge_containerd"
+            exit $ERR_CONTAINERD_INSTALL_TIMEOUT
+        fi        
+    elif semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
         containerd_version="$(echo "$latest_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$latest_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $latest_containerd"
+            echo "invalid container version: $latest_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     else
         containerd_version="$(echo "$stable_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$stable_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $stable_containerd"
+            echo "invalid container version: $stable_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     fi
diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line63.sh b/pkg/agent/testdata/RawUbuntuContainerd/line63.sh
index d0bdbb166ac..ca54e34db23 100644
--- a/pkg/agent/testdata/RawUbuntuContainerd/line63.sh
+++ b/pkg/agent/testdata/RawUbuntuContainerd/line63.sh
@@ -6,6 +6,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/pkg/templates/templates_generated.go b/pkg/templates/templates_generated.go
index 9afaa73e2bf..965e2431663 100644
--- a/pkg/templates/templates_generated.go
+++ b/pkg/templates/templates_generated.go
@@ -1447,23 +1447,31 @@ installContainerRuntime() {
     if [ -f "$MANIFEST_FILEPATH" ]; then
         stable_containerd="$(jq -r .containerd.stable "$MANIFEST_FILEPATH")"
         latest_containerd="$(jq -r .containerd.latest "$MANIFEST_FILEPATH")"
+        edge_containerd="$(jq -r .containerd.edge "$MANIFEST_FILEPATH")"
     else
         echo "WARNING: containerd version not found in manifest, defaulting to hardcoded."
     fi
 
     # todo(ace): read 1.22 from a manifest and track it against supported versions
-    if semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
+    if semverCompare ${KUBERNETES_VERSION} "1.24.0"; then
+        containerd_version="$(echo "$edge_containerd" | cut -d- -f1)"
+        containerd_patch_version="$(echo "$edge_containerd" | cut -d- -f2)"
+        if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
+            echo "invalid container version: $edge_containerd"
+            exit $ERR_CONTAINERD_INSTALL_TIMEOUT
+        fi        
+    elif semverCompare ${KUBERNETES_VERSION} "1.22.0"; then
         containerd_version="$(echo "$latest_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$latest_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $latest_containerd"
+            echo "invalid container version: $latest_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     else
         containerd_version="$(echo "$stable_containerd" | cut -d- -f1)"
         containerd_patch_version="$(echo "$stable_containerd" | cut -d- -f2)"
         if [ -z "$containerd_version" ] || [ "$containerd_version" == "null" ]  || [ "$containerd_patch_version" == "null" ]; then
-            echo "invalide container version: $stable_containerd"
+            echo "invalid container version: $stable_containerd"
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
     fi
@@ -2954,6 +2962,7 @@ var _linuxCloudInitArtifactsManifestJson = []byte(`{
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1",
         "stable": "1.4.13-2"
     },
diff --git a/schemas/manifest.cue b/schemas/manifest.cue
index ff9a4a75863..e4250cbcbd5 100644
--- a/schemas/manifest.cue
+++ b/schemas/manifest.cue
@@ -15,6 +15,7 @@
 }
 
 #containerd_version_tuple: {
+    edge: string
     stable: string
     latest: string
 }
@@ -25,6 +26,7 @@
 // containerd includes constraints from #dep and tighter bounds on version
 #containerd: #dep & {
 	versions: [...#containerd_ver]
+    edge: #containerd_ver
     latest: #containerd_ver
     stable: #containerd_ver
 }
@@ -51,6 +53,7 @@
         "versions": [
             "1.4.13-2"
         ],
+        "edge": "1.6.4-1",
         "latest": "1.5.11-1", // latest is default in vhd.
         "stable": "1.4.13-2", // we use latest vs stable at runtime depending on k8s version.
     },