diff --git a/.pipelines/.vsts-vhd-builder-release.yaml b/.pipelines/.vsts-vhd-builder-release.yaml
index d903a37ff92..2d7a9d3f2f7 100644
--- a/.pipelines/.vsts-vhd-builder-release.yaml
+++ b/.pipelines/.vsts-vhd-builder-release.yaml
@@ -98,6 +98,14 @@ parameters:
   displayName: Build 2004 FIPS Gen2 containerd
   type: boolean
   default: true
+- name: build2204fipscontainerd
+  displayName: Build 2204 FIPS containerd
+  type: boolean
+  default: false
+- name: build2204fipsgen2containerd
+  displayName: Build 2204 FIPS Gen2 containerd
+  type: boolean
+  default: false
 - name: build2204arm64gen2containerd
   displayName: Build 2204 ARM64 Gen2 containerd
   type: boolean
@@ -779,6 +787,60 @@ stages:
         - template: ./templates/.builder-release-template.yaml
           parameters:
             artifactName: 2004-fips-gen2-containerd
+  - stage: build_vhd_2204_fips_containerd
+    dependsOn: []
+    condition: eq('${{ parameters.build2204fipscontainerd }}', true)
+    jobs:
+    - job: build
+      timeoutInMinutes: 180
+      steps:
+        - bash: |
+            echo '##vso[task.setvariable variable=DRY_RUN]${{parameters.dryrun}}'
+            echo '##vso[task.setvariable variable=OS_SKU]Ubuntu'
+            echo '##vso[task.setvariable variable=OS_VERSION]22.04'
+            echo '##vso[task.setvariable variable=IMG_PUBLISHER]Canonical'
+            echo '##vso[task.setvariable variable=IMG_OFFER]0001-com-ubuntu-server-jammy'
+            echo '##vso[task.setvariable variable=IMG_SKU]22_04-lts'
+            echo '##vso[task.setvariable variable=HYPERV_GENERATION]V1'
+            echo '##vso[task.setvariable variable=AZURE_VM_SIZE]Standard_DS2_v2'
+            echo '##vso[task.setvariable variable=FEATURE_FLAGS]None'
+            echo '##vso[task.setvariable variable=CONTAINER_RUNTIME]containerd'
+            echo '##vso[task.setvariable variable=ARCHITECTURE]X86_64'
+            echo '##vso[task.setvariable variable=ENABLE_FIPS]True'
+            echo '##vso[task.setvariable variable=ENABLE_TRUSTED_LAUNCH]False'
+            echo '##vso[task.setvariable variable=SGX_INSTALL]False'
+            echo '##vso[task.setvariable variable=IMG_VERSION]latest'
+          displayName: Setup Build Variables
+        - template: ./templates/.builder-release-template.yaml
+          parameters:
+            artifactName: 2204-fips-containerd
+  - stage: build_vhd_2204_fips_gen2_containerd
+    dependsOn: []
+    condition: eq('${{ parameters.build2204fipsgen2containerd }}', true)
+    jobs:
+    - job: build
+      timeoutInMinutes: 180
+      steps:
+        - bash: |
+            echo '##vso[task.setvariable variable=DRY_RUN]${{parameters.dryrun}}'
+            echo '##vso[task.setvariable variable=OS_SKU]Ubuntu'
+            echo '##vso[task.setvariable variable=OS_VERSION]22.04'
+            echo '##vso[task.setvariable variable=IMG_PUBLISHER]Canonical'
+            echo '##vso[task.setvariable variable=IMG_OFFER]0001-com-ubuntu-server-jammy'
+            echo '##vso[task.setvariable variable=IMG_SKU]22_04-lts-gen2'
+            echo '##vso[task.setvariable variable=HYPERV_GENERATION]V2'
+            echo '##vso[task.setvariable variable=AZURE_VM_SIZE]Standard_DS2_v2'
+            echo '##vso[task.setvariable variable=FEATURE_FLAGS]None'
+            echo '##vso[task.setvariable variable=CONTAINER_RUNTIME]containerd'
+            echo '##vso[task.setvariable variable=ARCHITECTURE]X86_64'
+            echo '##vso[task.setvariable variable=ENABLE_FIPS]True'
+            echo '##vso[task.setvariable variable=ENABLE_TRUSTED_LAUNCH]False'
+            echo '##vso[task.setvariable variable=SGX_INSTALL]False'
+            echo '##vso[task.setvariable variable=IMG_VERSION]latest'
+          displayName: Setup Build Variables
+        - template: ./templates/.builder-release-template.yaml
+          parameters:
+            artifactName: 2204-fips-gen2-containerd
   - stage: build_vhd_2204_arm64_gen2_containerd
     dependsOn: []
     condition: eq('${{ parameters.build2204arm64gen2containerd }}', true)
diff --git a/.pipelines/templates/.builder-release-template.yaml b/.pipelines/templates/.builder-release-template.yaml
index dbbc9d785f1..4019a99ecc3 100644
--- a/.pipelines/templates/.builder-release-template.yaml
+++ b/.pipelines/templates/.builder-release-template.yaml
@@ -56,8 +56,7 @@ steps:
       if [[ ${OS_VERSION} == "V2" && ${ARCHITECTURE,,} == "arm64" ]]; then SKU_NAME="${SKU_NAME}arm64"; fi && \
       if [[ ${OS_VERSION} == "18.04" && ${ARCHITECTURE,,} == "arm64" ]]; then SKU_NAME="${SKU_NAME}arm64"; fi && \
       if [[ ${OS_VERSION} == "22.04" && ${ARCHITECTURE,,} == "arm64" ]]; then SKU_NAME="${SKU_NAME}arm64"; fi && \
-      if [[ ${OS_VERSION} == "18.04" && ${ENABLE_FIPS,,} == "true" ]]; then SKU_NAME="${SKU_NAME}fips"; fi && \
-      if [[ ${OS_VERSION} == "20.04" && ${ENABLE_FIPS,,} == "true" ]]; then SKU_NAME="${SKU_NAME}fips"; fi && \
+      if [[ (${OS_VERSION} == "18.04" || ${OS_VERSION} == "20.04" || ${OS_VERSION} == "22.04") && ${ENABLE_FIPS,,} == "true" ]]; then SKU_NAME="${SKU_NAME}fips"; fi && \
       if [[ ${OS_VERSION} == "V2" && ${ENABLE_FIPS,,} == "true" ]]; then SKU_NAME="${SKU_NAME}fips"; fi && \
       if [[ "$(FEATURE_FLAGS)" == *"fullgpu"* ]]; then SKU_NAME="${SKU_NAME}gpu"; fi && \
       if [[ "${IMG_SKU}" == "20_04-lts-cvm" ]]; then SKU_NAME="${SKU_NAME}CVM"; fi && \
diff --git a/Makefile b/Makefile
index fe2d4355177..5218e5d5799 100644
--- a/Makefile
+++ b/Makefile
@@ -208,5 +208,9 @@ ci: bootstrap test-style build test lint
 coverage:
 	@scripts/ginkgo.coverage.sh --codecov
 
+.PHONY: unit-tests
+unit-tests:
+	$(GO) test `go list ./... | grep -v e2e` -coverprofile coverage_raw.out -covermode count
+
 include versioning.mk
 include test.mk
diff --git a/parts/linux/cloud-init/artifacts/manifest.json b/parts/linux/cloud-init/artifacts/manifest.json
index ff6e600b539..b7f73a8e8c1 100644
--- a/parts/linux/cloud-init/artifacts/manifest.json
+++ b/parts/linux/cloud-init/artifacts/manifest.json
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/parts/linux/cloud-init/artifacts/sshd_config_2204_fips b/parts/linux/cloud-init/artifacts/sshd_config_2204_fips
new file mode 100644
index 00000000000..1b92a7d430f
--- /dev/null
+++ b/parts/linux/cloud-init/artifacts/sshd_config_2204_fips
@@ -0,0 +1,92 @@
+# This file is a copy of the default sshd_config file, but relaxes used encryption
+# for sshd to work with 5.15.0-1059-azure-fips
+
+# What ports, IPs and protocols we listen for
+Port 22
+# Use these options to restrict which interfaces/protocols sshd will bind to
+#ListenAddress ::
+#ListenAddress 0.0.0.0
+Protocol 2
+
+# 5.2.11 Ensure only approved MAC algorithms are used
+# Disabled for FIPS
+# MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128@openssh.com
+# KexAlgorithms curve25519-sha256@libssh.org
+# Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr
+
+# 5.2.12 Ensure SSH Idle Timeout Interval is configured
+ClientAliveInterval 120
+ClientAliveCountMax 3
+
+# HostKeys for protocol version 2
+HostKey /etc/ssh/ssh_host_rsa_key
+HostKey /etc/ssh/ssh_host_dsa_key
+HostKey /etc/ssh/ssh_host_ecdsa_key
+HostKey /etc/ssh/ssh_host_ed25519_key
+
+# Logging
+SyslogFacility AUTH
+LogLevel INFO
+
+# Authentication:
+LoginGraceTime 60
+
+# 5.2.8 Ensure SSH root login is disabled
+PermitRootLogin no
+# 5.2.10 Ensure SSH PermitUserEnvironment is disabled
+PermitUserEnvironment no
+
+StrictModes yes
+PubkeyAuthentication yes
+#AuthorizedKeysFile	%h/.ssh/authorized_keys
+
+# Don't read the user's ~/.rhosts and ~/.shosts files
+IgnoreRhosts yes
+# similar for protocol version 2
+HostbasedAuthentication no
+
+# To enable empty passwords, change to yes (NOT RECOMMENDED)
+PermitEmptyPasswords no
+
+# Change to yes to enable challenge-response passwords (beware issues with
+# some PAM modules and threads)
+ChallengeResponseAuthentication no
+
+# Change to no to disable tunnelled clear text passwords
+PasswordAuthentication no
+
+# 5.2.4 Ensure SSH X11 forwarding is disabled
+X11Forwarding no
+
+# 5.2.5 Ensure SSH MaxAuthTries is set to 4 or less
+MaxAuthTries 4
+
+X11DisplayOffset 10
+PrintMotd no
+PrintLastLog yes
+TCPKeepAlive yes
+#UseLogin no
+
+#MaxStartups 10:30:60
+Banner /etc/issue.net
+
+# Allow client to pass locale environment variables
+AcceptEnv LANG LC_*
+
+Subsystem sftp /usr/lib/openssh/sftp-server
+
+# Set this to 'yes' to enable PAM authentication, account processing,
+# and session processing. If this is enabled, PAM authentication will
+# be allowed through the ChallengeResponseAuthentication and
+# PasswordAuthentication.  Depending on your PAM configuration,
+# PAM authentication via ChallengeResponseAuthentication may bypass
+# the setting of "PermitRootLogin without-password".
+# If you just want the PAM account and session checks to run without
+# PAM authentication, then enable this but set PasswordAuthentication
+# and ChallengeResponseAuthentication to 'no'.
+UsePAM yes
+UseDNS no
+GSSAPIAuthentication no
+
+# Mariner AKS CIS Benchmark: Ensure SSH access is limited
+DenyUsers root omsagent nxautomation
diff --git a/parts/linux/cloud-init/artifacts/ubuntu/cse_install_ubuntu.sh b/parts/linux/cloud-init/artifacts/ubuntu/cse_install_ubuntu.sh
index 00777ee2fb0..43a27356515 100755
--- a/parts/linux/cloud-init/artifacts/ubuntu/cse_install_ubuntu.sh
+++ b/parts/linux/cloud-init/artifacts/ubuntu/cse_install_ubuntu.sh
@@ -130,7 +130,7 @@ installStandaloneContainerd() {
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
         # pin 18.04 to 1.7.1
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData
index 84914cd1e32..4e74eb97c39 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    H4sIAAAAAAAA/+Rae3PbtrL/X59iw+g2tltQDyfprTu6d2RJdnQiWxpKSqeTk+FAJCihIgkWAJM4tr77GZAUxadjO23P6Zz8kbGExb6w+9vFQs+ftVbUb62w2DQaxNow0OYs5Bb112AJYlJfSOy6pk2F5EwXG3AYh+Uq9GWoNRqceOwjuWKrm6NjuG0AAOBAmmsizSDkawKdNryC03YbPLa6QcRfU5/Ef1subez2HAbMl5j6hNsP4mOl5IpFouOQBCLdTR14/x6aR1T0javXL4+h14MOfPjwM8gN8SMS9e8TptJ0GDeVNJdZW5EucSL5jeXZJnVMB1M35MT0mSkklgI6XaVP9xVYIXcBOWI+gY2UgThrtQJsbfGaCN2jFmeCOVK3mNeymO/QdSuMXNdq3i7Pl9eLpWmMJqP+fLRLt6F0Gwo4s3WbrOD/oCW94F6Suzsgn6mE5sgwzKu5OTOmQ3M4OjeH01+uJ9P+0FyMr0bT5SIykLiC/HdY6tBGjY3wWlnWaYMdbNeA6DdInr29NPvDoXnRH08a++j1MN/+0p9QP/zcXxNfwoa5di60w8DGkuTZ9mcLczkb9hej1IxoT7Bdmy4VsndkYWQRLqlDLSyJAIsEG2Qxz2M+WGvOwgC5VBKwqCNQKKkrwGK+Lzm2tmCp/126Qjz0JfUIkJXEK5cIIHIjGXNhTSWs3VBIwh2hsjRSXbIAqE8lEjdCEg9tiBsQLoD6TFLnBqmtAiiL6ALOQkm6QANBJNAgkeA7yR+//Q4uXQXYQ8Gn30PsUnkTfbH/kHDzWOhL8JUWsXUBXX8BwSwsQdwIR8TGiRuhQhXUJ+Qqd8PnL4nhPpEWlogFxF8JG77QALi/TvhvPWbD2rLAw1sC9tYTkYkce45ISCJ2aEOwTbhAzaPQxx4BxI+TFY/ZoUsEIp8lx9n140YKQ6CVUkBTcKR1/ldvv9SgiEn7k/6+d2T7sY3H5aTNUK2ob/+E8rQOjRVwmYVdmM7fjYz5eHodfZd+6jWP1pwEMBzPF8b4fK8etIi0WieIE5dgQe7ACiUgB7qAbNB6WizhfDI9v1jOR+aemdbRX+qvtNxi97Da1bt6R8u7JdVk75HXlR6pEnWq/6hlE7yWZbWTaxRsaznvZZ3sspUTCtLtNW9Lm3fH1UXnWWXRickqdO12Y12LGwqqKDVOj9PVXFjUaJ1ROtUZ1MKBTeLHvemqzCucSvAQqA/N2z3n9ycfdj+DzbImPUthLanHcNqGDrxut6GZYVRh2m8s5D52LekCQj5DAV4TDijM7cvtyMPl+Hq+6E8mOdjPWGQzn6g2IUbbfiB/oXJztUf32Xb92Kbh3qTen2GFnY+os99aYVXFUge1r6eFYhYt5avZ9PzXyJmT8XxR8mQpxP46U7zQlRRza/OHG5WEx1Nbof+gI9rnbFWT00maHCuoFxPhPQ5kS6jWn4joW91uPVR+kjdFG3P4myREkmmR46Pbhuqr3qvz7WHPfv3yB8y9+P+N8+FrPk6cG4koBApIIqS6xHiY+prycY2NeX+gZFu0Gmm6S4LkPhu77cjGu7u69e6f7oPqAPuDvZBkTF2sPTFTtuRGHBTQsbDgDtbBGhCyCeYe46UU0dVysRu/nF2ab0e/Vl8DHpUaEfvUVZKrZthWX5Zz4itiH9np7xoNyyXYXwaXs+WQ04+EH6603ANkONC8nC3N4Wi+gBYLZGsdhJk78Fxi38Yu86tu1PkI6TWPXLEykyYPEAeU9I4J3WA6HF33r0qEVko4mF4v+uPrkTFMu6hmJ42QzOqsvxi8OXRazdvuGerstH2LuhamZCb5SHwpQOu/neuD+UhPTEoNMeIbi058EXJihL6lgXb4AM1bY3k92Es5Q5q20yAWMVgaxuh6cdDy6DBBAKS8TJkPSaNrgwaa6ndP4Q4EseGFuPt4d/cis/59tN45zjEfTK+uxosH8n6ZvSCgL6A1CzqWW4iiEVpbbxcb1pzPB2/7lyNzaUyUx6tXzno7LQPhz5QqdbS7cicUw9c4PqhoZHQw3eHMg1AQDtQPQnlWz1dL+T02FA7jJw0Of38ju0Pm7Jkevnkya5t98l2G7QOrC868pTHRoHap3mNPViMdla1mMRgrURfUJRpotWt5PYajc/NiPFH9bg7OMiR1DXkyXwwtixCb2CAZ7O8K3xg4nMiQ+9DOJcNz6qhw5QSoAJ9lZJj7tIwkxBKN2Q9KKmwwty2m1EuIMvlRzI70KlXKjApo1Dr6j3rnlfawe0TNvfVe3lqxt70fhjP08ckcIhDeJQ7ymQQREIs6lNjKQSrLbeLg0JV7B51VOwUVzi0jOzm5XOsdq7CMBKQSoazSk6WlGJng6FX/H1PDvBpfT42e1jyK5BdRGO5Acnihv4AX//RVBdgQbAPyoQt3EGAhCSBh68exhOFoPjZGwxrOJZ0fx1wQ7yPhA+YFmJOqeqFViIi3vunPzUtj1F+MjEwR/v/MMEbFYQVVHIpt1brCd9/FZBXui8maFeZXDDPic7ZCzokv3Zs9AhA7iwH7/GzeFszcgYeltSECPPwb47pHfcbhE5Ub2ND1hnAI1Hp1jOggtjQIVITd0y/ptcFJKwtdRteyyL9jbasAexXGrigUgqThnZvDsbFrFR5mzEp3nBxrhTEYckCrqy+Vg7C/V8krFacCOv8xfUQCjRpo967XFK+vIudfHxRfHhkUcX5eYOrGbYXLLHXfsrC1yQOLTVZazSjxAaf5DQf37w3DYn+0azTujZT0zlh5xYtWvK1NOaAgV9lyxx+R1U5dIXdB3msD3Tacll55e9Vx8yg3WAEg7ELzVt27B/3Bm1EUog+L0HojW49SoqIDTi1/eEmpPb2lMak6uXQ0oe6Cjzu+Qvgtrma9ynxXrJ8/P2nt8tMWK+Su6ahIjkdCr9v5NiXvylK0L65mO60aYOIbaZ3vK4cx1RD2SG0yw5bczx7uH0RAzRjCZtY2mhNkBgXRk5w2jFb2kaBlBgg/xMOHynFF5YAifgOMxreH3v8nvX2qd15qRYrqy8VLvXOaDgrynWipRTtDyWRCVZas1N2DO8EoKe2cB6paQSqUs7AkHOQG+3DEOJDfQ+yCZMcgMV8TCSssSIZJTqFyQ6jOtKoBrOjAapEtpYgdOhn3CmLLL4F7yuTyd6q39bqHwJRpRHVaeecrvsTFoKpSMPMznKJWJ+nvcnoZhU4qsLgmUHYngBB2XfYJKXhac2wTUfGGUAWMcU06JFGaV1EqFWZZxe+qp1hFqofMr7jK34oBRInXwe0HII2IyhCaWnEA0CK7A3LmiBOEKvNtJSwOqJQp9LXIm9kUtRGVPsodV05yqam4r20pSCpzfcKM6AmHUzkXWvSNy1EGhW87EUYX5zx5soroKfDROnpH73RR/CJTHut889znqfIKL/uPeOV+X+GGSEmF74hbP3WTV697iV7VIFl8OHVqDmZLs28M3vSaR2siB7Nln1ubY4Dn0RsZMA7RM1lNYY1iJVtVk9lKJ53ptyKSPUGr9SKZ5k9G/evR0CwFScHEmoeFYpH6H3SyL/51jKsX4o2NbLwU618ydqlhsCsHUZxbSV2MYD3ng1pOqtBilxNsZ4p0uXYq3NaLuZd9OIwfOxxovnszNCfTy3mEDrP+4k1J1RQ/Zv3FYmRc97RUX/NEz93i8nDZPHKob6cIlLuOApI3AQEHEI1+p6VlcCqRo+5WIBiXgN7BHUhMXRU1x5VTizzI1UT5n4KSJWzLJxB8vQdQnixH9dcreKVau0bj+Wh60fhXAAAA//8lcfEJTiwAAA==
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line62.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
index 9dd942ce282..75ab62479ac 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line62.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData
index 9dd942ce282..75ab62479ac 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line62.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData
index 6abfc5c9b52..b95090f3903 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/+Rae3PbtrL/X59iw+g2tltQDyfprTu6d2RJdnQiWxpKSqeTk+FAJCihIgkWAJM4tr77GZAUxadjO23P6Zz8kbGExb6w+9vFQs+ftVbUb62w2DQaxNow0OYs5Bb112AJYlJfSOy6pk2F5EwXG3AYh+Uq9GWoNRqceOwjuWKrm6NjuG0AAOBAmmsizSDkawKdNryC03YbPLa6QcRfU5/Ef1subez2HAbMl5j6hNsP4mOl5IpFouOQBCLdTR14/x6aR1T0javXL4+h14MOfPjwM8gN8SMS9e8TptJ0GDeVNJdZW5EucSL5jeXZJnVMB1M35MT0mSkklgI6XaVP9xVYIXcBOWI+gY2UgThrtQJsbfGaCN2jFmeCOVK3mNeymO/QdSuMXNdq3i7Pl9eLpWmMJqP+fLRLt6F0Gwo4s3WbrOD/oCW94F6Suzsgn6mE5sgwzKu5OTOmQ3M4OjeH01+uJ9P+0FyMr0bT5SIykLiC/HdY6tBGjY3wWlnWaYMdbNeA6DdInr29NPvDoXnRH08a++j1MN/+0p9QP/zcXxNfwoa5di60w8DGkuTZ9mcLczkb9hej1IxoT7Bdmy4VsndkYWQRLqlDLSyJAIsEG2Qxz2M+WGvOwgC5VBKwqCNQKKkrwGK+Lzm2tmCp/126Qjz0JfUIkJXEK5cIIHIjGXNhTSWs3VBIwh2hsjRSXbIAqE8lEjdCEg9tiBsQLoD6TFLnBqmtAiiL6ALOQkm6QANBJNAgkeA7yR+//Q4uXQXYQ8Gn30PsUnkTfbH/kHDzWOhL8JUWsXUBXX8BwSwsQdwIR8TGiRuhQhXUJ+Qqd8PnL4nhPpEWlogFxF8JG77QALi/TvhvPWbD2rLAw1sC9tYTkYkce45ISCJ2aEOwTbhAzaPQxx4BxI+TFY/ZoUsEIp8lx9n140YKQ6CVUkBTcKR1/ldvv9SgiEn7k/6+d2T7sY3H5aTNUK2ob/+E8rQOjRVwmYVdmM7fjYz5eHodfZd+6jWP1pwEMBzPF8b4fK8etIi0WieIE5dgQe7ACiUgB7qAbNB6WizhfDI9v1jOR+aemdbRX+qvtNxi97Da1bt6R8u7JdVk75HXlR6pEnWq/6hlE7yWZbWTaxRsaznvZZ3sspUTCtLtNW9Lm3fH1UXnWWXRickqdO12Y12LGwqqKDVOj9PVXFjUaJ1ROtUZ1MKBTeLHvemqzCucSvAQqA/N2z3n9ycfdj+DzbImPUthLanHcNqGDrxut6GZYVRh2m8s5D52LekCQj5DAV4TDijM7cvtyMPl+Hq+6E8mOdjPWGQzn6g2IUbbfiB/oXJztUf32Xb92Kbh3qTen2GFnY+os99aYVXFUge1r6eFYhYt5avZ9PzXyJmT8XxR8mQpxP46U7zQlRRza/OHG5WEx1Nbof+gI9rnbFWT00maHCuoFxPhPQ5kS6jWn4joW91uPVR+kjdFG3P4myREkmmR46Pbhuqr3qvz7WHPfv3yB8y9+P+N8+FrPk6cG4koBApIIqS6xHiY+prycY2NeX+gZFu0Gmm6S4LkPhu77cjGu7u69e6f7oPqAPuDvZBkTF2sPTFTtuRGHBTQsbDgDtbBGhCyCeYe46UU0dVysRu/nF2ab0e/Vl8DHpUaEfvUVZKrZthWX5Zz4itiH9np7xoNyyXYXwaXs+WQ04+EH6603ANkONC8nC3N4Wi+gBYLZGsdhJk78Fxi38Yu86tu1PkI6TWPXLEykyYPEAeU9I4J3WA6HF33r0qEVko4mF4v+uPrkTFMu6hmJ42QzOqsvxi8OXRazdvuGerstH2LuhamZCb5SHwpQOu/neuD+UhPTEoNMeIbi058EXJihL6lgXb4AM1bY3k92Es5Q5q20yAWMVgaxuh6cdDy6DBBAKS8TJkPSaNrgwaa6ndP4Q4EseGFuPt4d/cis/59tN45zjEfTK+uxosH8n6ZvSCgL6A1CzqWW4iiEVpbbxcb1pzPB2/7lyNzaUyUx6tXzno7LQPhz5QqdbS7cicUw9c4PqhoZHQw3eHMg1AQDtQPQnlWz1dL+T02FA7jJw0Of38ju0Pm7Jkevnkya5t98l2G7QOrC868pTHRoHap3mNPViMdla1mMRgrURfUJRpotWt5PYajc/NiPFH9bg7OMiR1DXkyXwwtixCb2CAZ7O8K3xg4nMiQ+9DOJcNz6qhw5QSoAJ9lZJj7tIwkxBKN2Q9KKmwwty2m1EuIMvlRzI70KlXKjApo1Dr6j3rnpfawe0TNvfVe3lqxt70fhjP08ckcIhDeJQ7ymQQREIs6lNjKQSrLbeLg0JV7B51VOwUVzi0jOzm5XOsdq7CMBKQSoazSk6WlGJng6FX/H1PDvBpfT42e1jyK5BdRGO5Acnihv4AX//RVBdgQbAPyoQt3EGAhCSBh68exhOFoPjZGwxrOJZ0fx1wQ7yPhA+YFmJOqeqFViIi3vunPzUtj1F+MjEwR/v/MMEbFYQVVHIpt1brCd9/FZBXui8maFeZXDDPic7ZCzokv3Zs9AhA7iwH7/GzeFszcgYeltSECPPwb47pHfcbhE5Ub2ND1hnAI1Hp1jOggtjQIVITd0y/ptcFJKwtdRteyyL9jbasAexXGrigUgqThnZvDsbFrFR5mzEp3nBxrhTEYckCrqy+Vg7C/V8krFacCOv8xfUQCjRpo967XFK+vIudfHxRfHhkUcX5eYOrGbYXLLHXfsrC1yQOLTVZazSjxAaf5DQf37w3DYn+0azTujZT0zlh5xYtWvK1NOaAgV9lyxx+R1U5dIXdB3msD3Tacll55e9Vx8yg3WAEg7ELzVt27B/3Bm1EUog+L0HojW49SoqIDTi1/eEmpPb2lMak6uXQ0oe6Cjzu+Qvgtrma9ynxXrJ8/P2nt8tMWK+Su6ahIjkdCr9v5NiXvylK0L65mO60aYOIbaZ3vK4cx1RD2SG0yw5bczx7uH0RAzRjCZtY2mhNkBgXRk5w2jFb2kaBlBgg/xMOHynFF5YAifgOMxreH3v8nvX2a3kYyFNWXi5d65zQdFOQ70VKLdoaSyYSqLFmpuwd3glFS2jkPVLWCVChnYUk4yA324YhxIL+H2AXJjkFiviYSVliQDJOcQuWGUJ1pVQNY0YHVIltKETt0Mu4VxJZfAveUyeXvVG/rdQ+BKdOI6rTyzld8iYtBVaVg5mc4Ra1O0t/l9DIKnVRgcU2g7E4AIey67BNS8LTm2Cai4g2hChjjmnRIojSvolQqzLKK31VPsYpUD5lfcZW/FQOIEq+D2w9AGhGVITS14gCgRXYH5MwRJwhV5ttKWBxQKVPoa5E3sylqIyp9lDuunORSU3Ff21KQVOb6hBnREw6nci606BuXowwK33YijC7OefJkFdFT4KN19I7e6aL4RaY81vnmuc9T5RVe9h/xyv2+wg2RkgrfEbd+6iavXvcSvapBsvhw6tQczJZm3xi86TWP1kQOZss+tzbHAM+jNzJgHKJnsprCGsVKtqoms5VOOtNvRSR7glbrRTLNn4z616OhWQqSgok1DwvFIvU/6GRf/OsYVy/EGxvZeCnWv2TsUsNgVw6iOLeSuhjBes4HtZxUocUuJ9jOFOly7VS4rRdzL/twGD92ONB892ZoTqaX8wgdZv3Fm5KqKX7M+ovFyLjuaam+5omeu8Xl4bJ55FDfThEodx0FJG8CAg4gGv1OS8vgVCJH3a1AMC4BvYM7kJi6KmqOK6cWeZCrifI/BSVL2JZPIPh6D6A8WY7qr1fwSrV2jcbz0fSi8a8AAAD//4VxpMNOLAAA
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line62.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData
index 6abfc5c9b52..b95090f3903 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line62.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData
index 84914cd1e32..4e74eb97c39 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line62.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+Docker/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+Docker/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData
index 7d59857be32..82d0a44d766 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line62.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData
index 18bc0a0c02f..306b8c99ea0 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line62.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData
index 26368746a77..b15e13b6074 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line62.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData
index 84914cd1e32..4e74eb97c39 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line62.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData
index 18bc0a0c02f..306b8c99ea0 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line62.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData
index 18bc0a0c02f..306b8c99ea0 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line62.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData
index 1598cc5fb7f..238ad1da18a 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/+Rae3PbtrL/X59iw+g2tltQDyfprTu6d2RJdnQiWxpKSqeTk+FAJCihIgkWAJM4tr77GZAUxadjO23P6Zz8kbGExb6w+9vFQs+ftVbUb62w2DQaxNow0OYs5Bb112AJYlJfSOy6pk2F5EwXG3AYh+Uq9GWoNRqceOwjuWKrm6NjuG0AAOBAmmsizSDkawKdNryC03YbPLa6QcRfU5/Ef1subez2HAbMl5j6hNsP4mOl5IpFouOQBCLdTR14/x6aR1T0javXL4+h14MOfPjwM8gN8SMS9e8TptJ0GDeVNJdZW5EucSL5jeXZJnVMB1M35MT0mSkklgI6XaVP9xVYIXcBOWI+gY2UgThrtQJsbfGaCN2jFmeCOVK3mNeymO/QdSuMXNdq3i7Pl9eLpWmMJqP+fLRLt6F0Gwo4s3WbrOD/oCW94F6Suzsgn6mE5sgwzKu5OTOmQ3M4OjeH01+uJ9P+0FyMr0bT5SIykLiC/HdY6tBGjY3wWlnWaYMdbNeA6DdInr29NPvDoXnRH08a++j1MN/+0p9QP/zcXxNfwoa5di60w8DGkuTZ9mcLczkb9hej1IxoT7Bdmy4VsndkYWQRLqlDLSyJAIsEG2Qxz2M+WGvOwgC5VBKwqCNQKKkrwGK+Lzm2tmCp/126Qjz0JfUIkJXEK5cIIHIjGXNhTSWs3VBIwh2hsjRSXbIAqE8lEjdCEg9tiBsQLoD6TFLnBqmtAiiL6ALOQkm6QANBJNAgkeA7yR+//Q4uXQXYQ8Gn30PsUnkTfbH/kHDzWOhL8JUWsXUBXX8BwSwsQdwIR8TGiRuhQhXUJ+Qqd8PnL4nhPpEWlogFxF8JG77QALi/TvhvPWbD2rLAw1sC9tYTkYkce45ISCJ2aEOwTbhAzaPQxx4BxI+TFY/ZoUsEIp8lx9n140YKQ6CVUkBTcKR1/ldvv9SgiEn7k/6+d2T7sY3H5aTNUK2ob/+E8rQOjRVwmYVdmM7fjYz5eHodfZd+6jWP1pwEMBzPF8b4fK8etIi0WieIE5dgQe7ACiUgB7qAbNB6WizhfDI9v1jOR+aemdbRX+qvtNxi97Da1bt6R8u7JdVk75HXlR6pEnWq/6hlE7yWZbWTaxRsaznvZZ3sspUTCtLtNW9Lm3fH1UXnWWXRickqdO12Y12LGwqqKDVOj9PVXFjUaJ1ROtUZ1MKBTeLHvemqzCucSvAQqA/N2z3n9ycfdj+DzbImPUthLanHcNqGDrxut6GZYVRh2m8s5D52LekCQj5DAV4TDijM7cvtyMPl+Hq+6E8mOdjPWGQzn6g2IUbbfiB/oXJztUf32Xb92Kbh3qTen2GFnY+os99aYVXFUge1r6eFYhYt5avZ9PzXyJmT8XxR8mQpxP46U7zQlRRza/OHG5WEx1Nbof+gI9rnbFWT00maHCuoFxPhPQ5kS6jWn4joW91uPVR+kjdFG3P4myREkmmR46Pbhuqr3qvz7WHPfv3yB8y9+P+N8+FrPk6cG4koBApIIqS6xHiY+prycY2NeX+gZFu0Gmm6S4LkPhu77cjGu7u69e6f7oPqAPuDvZBkTF2sPTFTtuRGHBTQsbDgDtbBGhCyCeYe46UU0dVysRu/nF2ab0e/Vl8DHpUaEfvUVZKrZthWX5Zz4itiH9np7xoNyyXYXwaXs+WQ04+EH6603ANkONC8nC3N4Wi+gBYLZGsdhJk78Fxi38Yu86tu1PkI6TWPXLEykyYPEAeU9I4J3WA6HF33r0qEVko4mF4v+uPrkTFMu6hmJ42QzOqsvxi8OXRazdvuGerstH2LuhamZCb5SHwpQOu/neuD+UhPTEoNMeIbi058EXJihL6lgXb4AM1bY3k92Es5Q5q20yAWMVgaxuh6cdDy6DBBAKS8TJkPSaNrgwaa6ndP4Q4EseGFuPt4d/cis/59tN45zjEfTK+uxosH8n6ZvSCgL6A1CzqWW4iiEVpbbxcb1pzPB2/7lyNzaUyUx6tXzno7LQPhz5QqdbS7cicUw9c4PqhoZHQw3eHMg1AQDtQPQnlWz1dL+T02FA7jJw0Of38ju0Pm7Jkevnkya5t98l2G7QOrC868pTHRoHap3mNPViMdla1mMRgrURfUJRpotWt5PYajc/NiPFH9bg7OMiR1DXkyXwwtixCb2CAZ7O8K3xg4nMiQ+9DOJcNz6qhw5QSoAJ9lZJj7tIwkxBKN2Q9KKmwwty2m1EuIMvlRzI70KlXKjApo1Dr6j3rnpfawe0TNvfVe3lqxt70fhjP08ckcIhDeJQ7ymQQREIs6lNjKQSrLbeLg0JV7B51VOwUVzi0jOzm5XOsdq7CMBKQSoazSk6WlGJng6FX/H1PDvBpfT42e1jyK5BdRGO5Acnihv4AX//RVBdgQbAPyoQt3EGAhCSBh68exhOFoPjZGwxrOJZ0fx1wQ7yPhA+YFmJOqeqFViIi3vunPzUtj1F+MjEwR/v/MMEbFYQVVHIpt1brCd9/FZBXui8maFeZXDDPic7ZCzokv3Zs9AhA7iwH7/GzeFszcgYeltSECPPwb47pHfcbhE5Ub2ND1hnAI1Hp1jOggtjQIVITd0y/ptcFJKwtdRteyyL9jbasAexXGrigUgqThnZvDsbFrFR5mzEp3nBxrhTEYckCrqy+Vg7C/V8krFacCOv8xfUQCjRpo967XFK+vIudfHxRfHhkUcX5eYOrGbYXLLHXfsrC1yQOLTVZazSjxAaf5DQf37w3DYn+0azTujZT0zlh5xYtWvK1NOaAgV9lyxx+R1U5dIXdB3msD3Tacll55e9Vx8yg3WAEg7ELzVt27B/3Bm1EUog+L0HojW49SoqIDTi1/eEmpPb2lMak6uXQ0oe6Cjzu+Qvgtrma9ynxXrJ8/P2nt8tMWK+Su6ahIjkdCr9v5NiXvylK0L65mO60aYOIbaZ3vK4cx1RD2SG0yw5bczx7uH0RAzRjCZtY2mhNkBgXRk5w2jFb2kaBlBgg/xMOHynFF5YAifgOMxreH3v8nvX2a3kYyFNWXi5d65zQdFOQ70VKLdoaSyYSqLFmpuwd3glFS2jkPVLWCVChnYUk4yA324YhxIL+H2AXJjkFiviYSVliQDJOcQuWGUJ1pVQNY0YHVIltKETt0Mu4VxJZfAveUyeXvVG/rdQ+BKdOI6rTyzld8iYtBVaVg5mc4Ra1O0t/l9DIKnVRgcU2g7E4AIey67BNS8LTm2Cai4g2hChjjmnRIojSvolQqzLKK31VPsYpUD5lfcZW/FQOIEq+D2w9AGhGVITS14gCgRXYH5MwRJwhV5ttKWBxQKVPoa5E3sylqIyp9lDuunORSU3Ff21KQVOb6hBnREw6nci606BuXowwK33YijC7OefJkFdFT4KN19I7e6aL4RaY81vnmuc9T5RVe9h/xyv2+wg2RkgrfEbd+6iavXvcSvapBsvhw6tQczJZm3xi86TWP1kQOZss+tzbHAM+jNzJgHKJnsprCGsVKtqoms5VOOtNvRSR7glbrRTLNn4z616OhWQqSgok1DwvFIvU/6GRf/OsYVy/EGxvZeCnWv2TsUsNgVw6iOLeSuhjBes4HtZxUocUuJ9jOFOly7VS4rRdzL/twGD92ONB892ZoTqaX8wgdZv3Fm5KqKX7M+ovFyLjuaam+5omeu8Xl4bJ55FDfThEodx0FJG8CAg4gGv1OS8vgVCJH3a1AMC4BvYM7kJi6KmqOK6cWeZCrifI/BSVL2JZPIPh6D6A8WY7qr1fwSrV2jcbz0fSi8a8AAAD//4VxpMNOLAAA
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line62.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData
index 84914cd1e32..4e74eb97c39 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line62.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData
index 7e1cb7e3577..a8b6a3664fb 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line62.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData
index 4eeae9b0a88..de71cfcad8a 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line62.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData
index 7e1cb7e3577..a8b6a3664fb 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line62.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData
index f528ab8e92e..a833edfe6b1 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData
index 0c96048d6b4..94dcd62e67c 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData
index 9278be40e4d..7386b0550c9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData
index e278758d688..342c9680a57 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData
index 6c987b68de8..75cbdce4019 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData
index e278758d688..342c9680a57 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData
index 396b7aad701..27fa6ad4fe1 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData
index e278758d688..342c9680a57 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData
index e278758d688..342c9680a57 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData
index 0c96048d6b4..94dcd62e67c 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData
index 0c96048d6b4..94dcd62e67c 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData
index 18bc0a0c02f..306b8c99ea0 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData
index cbf0a884de0..246ff9c1bf9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData
index e278758d688..342c9680a57 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData
index e278758d688..342c9680a57 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData
index 18bc0a0c02f..306b8c99ea0 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData
index 18bc0a0c02f..306b8c99ea0 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData
index e278758d688..342c9680a57 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData
index e278758d688..342c9680a57 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData
index 18bc0a0c02f..306b8c99ea0 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    H4sIAAAAAAAA/+Rae3PbtrL/X59iw+g2tltQDyfprTu6d2RJdnQiWxpKSqeTk+FAJCihIgkWAJM4tr77GZAUxadjO23P6Zz8kbGExb6w+9vFQs+ftVbUb62w2DQaxNow0OYs5Bb112AJYlJfSOy6pk2F5EwXG3AYh+Uq9GWoNRqceOwjuWKrm6NjuG0AAOBAmmsizSDkawKdNryC03YbPLa6QcRfU5/Ef1subez2HAbMl5j6hNsP4mOl5IpFouOQBCLdTR14/x6aR1T0javXL4+h14MOfPjwM8gN8SMS9e8TptJ0GDeVNJdZW5EucSL5jeXZJnVMB1M35MT0mSkklgI6XaVP9xVYIXcBOWI+gY2UgThrtQJsbfGaCN2jFmeCOVK3mNeymO/QdSuMXNdq3i7Pl9eLpWmMJqP+fLRLt6F0Gwo4s3WbrOD/oCW94F6Suzsgn6mE5sgwzKu5OTOmQ3M4OjeH01+uJ9P+0FyMr0bT5SIykLiC/HdY6tBGjY3wWlnWaYMdbNeA6DdInr29NPvDoXnRH08a++j1MN/+0p9QP/zcXxNfwoa5di60w8DGkuTZ9mcLczkb9hej1IxoT7Bdmy4VsndkYWQRLqlDLSyJAIsEG2Qxz2M+WGvOwgC5VBKwqCNQKKkrwGK+Lzm2tmCp/126Qjz0JfUIkJXEK5cIIHIjGXNhTSWs3VBIwh2hsjRSXbIAqE8lEjdCEg9tiBsQLoD6TFLnBqmtAiiL6ALOQkm6QANBJNAgkeA7yR+//Q4uXQXYQ8Gn30PsUnkTfbH/kHDzWOhL8JUWsXUBXX8BwSwsQdwIR8TGiRuhQhXUJ+Qqd8PnL4nhPpEWlogFxF8JG77QALi/TvhvPWbD2rLAw1sC9tYTkYkce45ISCJ2aEOwTbhAzaPQxx4BxI+TFY/ZoUsEIp8lx9n140YKQ6CVUkBTcKR1/ldvv9SgiEn7k/6+d2T7sY3H5aTNUK2ob/+E8rQOjRVwmYVdmM7fjYz5eHodfZd+6jWP1pwEMBzPF8b4fK8etIi0WieIE5dgQe7ACiUgB7qAbNB6WizhfDI9v1jOR+aemdbRX+qvtNxi97Da1bt6R8u7JdVk75HXlR6pEnWq/6hlE7yWZbWTaxRsaznvZZ3sspUTCtLtNW9Lm3fH1UXnWWXRickqdO12Y12LGwqqKDVOj9PVXFjUaJ1ROtUZ1MKBTeLHvemqzCucSvAQqA/N2z3n9ycfdj+DzbImPUthLanHcNqGDrxut6GZYVRh2m8s5D52LekCQj5DAV4TDijM7cvtyMPl+Hq+6E8mOdjPWGQzn6g2IUbbfiB/oXJztUf32Xb92Kbh3qTen2GFnY+os99aYVXFUge1r6eFYhYt5avZ9PzXyJmT8XxR8mQpxP46U7zQlRRza/OHG5WEx1Nbof+gI9rnbFWT00maHCuoFxPhPQ5kS6jWn4joW91uPVR+kjdFG3P4myREkmmR46Pbhuqr3qvz7WHPfv3yB8y9+P+N8+FrPk6cG4koBApIIqS6xHiY+prycY2NeX+gZFu0Gmm6S4LkPhu77cjGu7u69e6f7oPqAPuDvZBkTF2sPTFTtuRGHBTQsbDgDtbBGhCyCeYe46UU0dVysRu/nF2ab0e/Vl8DHpUaEfvUVZKrZthWX5Zz4itiH9np7xoNyyXYXwaXs+WQ04+EH6603ANkONC8nC3N4Wi+gBYLZGsdhJk78Fxi38Yu86tu1PkI6TWPXLEykyYPEAeU9I4J3WA6HF33r0qEVko4mF4v+uPrkTFMu6hmJ42QzOqsvxi8OXRazdvuGerstH2LuhamZCb5SHwpQOu/neuD+UhPTEoNMeIbi058EXJihL6lgXb4AM1bY3k92Es5Q5q20yAWMVgaxuh6cdDy6DBBAKS8TJkPSaNrgwaa6ndP4Q4EseGFuPt4d/cis/59tN45zjEfTK+uxosH8n6ZvSCgL6A1CzqWW4iiEVpbbxcb1pzPB2/7lyNzaUyUx6tXzno7LQPhz5QqdbS7cicUw9c4PqhoZHQw3eHMg1AQDtQPQnlWz1dL+T02FA7jJw0Of38ju0Pm7Jkevnkya5t98l2G7QOrC868pTHRoHap3mNPViMdla1mMRgrURfUJRpotWt5PYajc/NiPFH9bg7OMiR1DXkyXwwtixCb2CAZ7O8K3xg4nMiQ+9DOJcNz6qhw5QSoAJ9lZJj7tIwkxBKN2Q9KKmwwty2m1EuIMvlRzI70KlXKjApo1Dr6j3rnlfawe0TNvfVe3lqxt70fhjP08ckcIhDeJQ7ymQQREIs6lNjKQSrLbeLg0JV7B51VOwUVzi0jOzm5XOsdq7CMBKQSoazSk6WlGJng6FX/H1PDvBpfT42e1jyK5BdRGO5Acnihv4AX//RVBdgQbAPyoQt3EGAhCSBh68exhOFoPjZGwxrOJZ0fx1wQ7yPhA+YFmJOqeqFViIi3vunPzUtj1F+MjEwR/v/MMEbFYQVVHIpt1brCd9/FZBXui8maFeZXDDPic7ZCzokv3Zs9AhA7iwH7/GzeFszcgYeltSECPPwb47pHfcbhE5Ub2ND1hnAI1Hp1jOggtjQIVITd0y/ptcFJKwtdRteyyL9jbasAexXGrigUgqThnZvDsbFrFR5mzEp3nBxrhTEYckCrqy+Vg7C/V8krFacCOv8xfUQCjRpo967XFK+vIudfHxRfHhkUcX5eYOrGbYXLLHXfsrC1yQOLTVZazSjxAaf5DQf37w3DYn+0azTujZT0zlh5xYtWvK1NOaAgV9lyxx+R1U5dIXdB3msD3Tacll55e9Vx8yg3WAEg7ELzVt27B/3Bm1EUog+L0HojW49SoqIDTi1/eEmpPb2lMak6uXQ0oe6Cjzu+Qvgtrma9ynxXrJ8/P2nt8tMWK+Su6ahIjkdCr9v5NiXvylK0L65mO60aYOIbaZ3vK4cx1RD2SG0yw5bczx7uH0RAzRjCZtY2mhNkBgXRk5w2jFb2kaBlBgg/xMOHynFF5YAifgOMxreH3v8nvX2qd15qRYrqy8VLvXOaDgrynWipRTtDyWRCVZas1N2DO8EoKe2cB6paQSqUs7AkHOQG+3DEOJDfQ+yCZMcgMV8TCSssSIZJTqFyQ6jOtKoBrOjAapEtpYgdOhn3CmLLL4F7yuTyd6q39bqHwJRpRHVaeecrvsTFoKpSMPMznKJWJ+nvcnoZhU4qsLgmUHYngBB2XfYJKXhac2wTUfGGUAWMcU06JFGaV1EqFWZZxe+qp1hFqofMr7jK34oBRInXwe0HII2IyhCaWnEA0CK7A3LmiBOEKvNtJSwOqJQp9LXIm9kUtRGVPsodV05yqam4r20pSCpzfcKM6AmHUzkXWvSNy1EGhW87EUYX5zx5soroKfDROnpH73RR/CJTHut889znqfIKL/uPeOV+X+GGSEmF74hbP3WTV697iV7VIFl8OHVqDmZLs28M3vSaR2siB7Nln1ubY4Dn0RsZMA7RM1lNYY1iJVtVk9lKJ53ptyKSPUGr9SKZ5k9G/evR0CwFScHEmoeFYpH6H3SyL/51jKsX4o2NbLwU618ydqlhsCsHUZxbSV2MYD3ng1pOqtBilxNsZ4p0uXYq3NaLuZd9OIwfOxxovnszNCfTy3mEDrP+4k1J1RQ/Zv3FYmRc97RUX/NEz93i8nDZPHKob6cIlLuOApI3AQEHEI1+p6VlcCqRo+5WIBiXgN7BHUhMXRU1x5VTizzI1UT5n4KSJWzLJxB8vQdQnixH9dcreKVau0bj+Wh60fhXAAAA//8lcfEJTiwAAA==
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData
index 18bc0a0c02f..306b8c99ea0 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData
index 0844fa21d69..fa97b9e2b2d 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData
index f528ab8e92e..a833edfe6b1 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData
index 9278be40e4d..7386b0550c9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData
index adc8dd204e5..9f2a2ee42f4 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData
index 211ae11287f..bbf8af8ee61 100644
--- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line62.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line77.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData
index 8b8e7a05a84..8e167c1f138 100644
--- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line62.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line77.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData
index e278758d688..342c9680a57 100644
--- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line62.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line77.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData
index 77047401af4..ac7deda869c 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line62.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+China/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+China/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line77.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+China/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+China/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData
index 1a4a24a325a..328e630c36d 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line62.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line77.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData
index f692ed6359a..c78e48d2f70 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line62.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line77.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData
index 9243c476a18..cc2636124f3 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line62.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line77.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
index 05805df3186..e67a1e86afb 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line62.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line77.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData
index 77047401af4..ac7deda869c 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line62.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line77.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData
index 77047401af4..ac7deda869c 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line62.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line77.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData
index 43f5e278ab8..0534d605b1c 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line62.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line77.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData
index 4ab4c99aae6..52407ee4c49 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line62.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line77.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData
index f528ab8e92e..a833edfe6b1 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line62.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line77.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData
index 77047401af4..ac7deda869c 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line62.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line62.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line77.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line77.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData
index c33331be002..c2c5adeab6f 100644
--- a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData
+++ b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData
@@ -72,7 +72,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line75.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line75.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AzureLinuxV2+Kata/line75.sh
+++ b/pkg/agent/testdata/AzureLinuxV2+Kata/line75.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData
index c33331be002..c2c5adeab6f 100644
--- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData
+++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData
@@ -72,7 +72,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line75.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line75.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line75.sh
+++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line75.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData
index c33331be002..c2c5adeab6f 100644
--- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData
+++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData
@@ -72,7 +72,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line75.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line75.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line75.sh
+++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line75.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData
index c33331be002..c2c5adeab6f 100644
--- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData
+++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData
@@ -72,7 +72,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line75.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line75.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line75.sh
+++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line75.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData
index c33331be002..c2c5adeab6f 100644
--- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData
+++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData
@@ -72,7 +72,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line75.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line75.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line75.sh
+++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line75.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/CustomizedImage/CustomData b/pkg/agent/testdata/CustomizedImage/CustomData
index 95bef4a5b81..e73cc792659 100644
--- a/pkg/agent/testdata/CustomizedImage/CustomData
+++ b/pkg/agent/testdata/CustomizedImage/CustomData
@@ -54,7 +54,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/+Rae3PbtrL/X59iw+g2tltQDyfprTu6d2RJdnQiWxpKSqeTk+FAJCihIgkWAJM4tr77GZAUxadjO23P6Zz8kbGExb6w+9vFQs+ftVbUb62w2DQaxNow0OYs5Bb112AJYlJfSOy6pk2F5EwXG3AYh+Uq9GWoNRqceOwjuWKrm6NjuG0AAOBAmmsizSDkawKdNryC03YbPLa6QcRfU5/Ef1subez2HAbMl5j6hNsP4mOl5IpFouOQBCLdTR14/x6aR1T0javXL4+h14MOfPjwM8gN8SMS9e8TptJ0GDeVNJdZW5EucSL5jeXZJnVMB1M35MT0mSkklgI6XaVP9xVYIXcBOWI+gY2UgThrtQJsbfGaCN2jFmeCOVK3mNeymO/QdSuMXNdq3i7Pl9eLpWmMJqP+fLRLt6F0Gwo4s3WbrOD/oCW94F6Suzsgn6mE5sgwzKu5OTOmQ3M4OjeH01+uJ9P+0FyMr0bT5SIykLiC/HdY6tBGjY3wWlnWaYMdbNeA6DdInr29NPvDoXnRH08a++j1MN/+0p9QP/zcXxNfwoa5di60w8DGkuTZ9mcLczkb9hej1IxoT7Bdmy4VsndkYWQRLqlDLSyJAIsEG2Qxz2M+WGvOwgC5VBKwqCNQKKkrwGK+Lzm2tmCp/126Qjz0JfUIkJXEK5cIIHIjGXNhTSWs3VBIwh2hsjRSXbIAqE8lEjdCEg9tiBsQLoD6TFLnBqmtAiiL6ALOQkm6QANBJNAgkeA7yR+//Q4uXQXYQ8Gn30PsUnkTfbH/kHDzWOhL8JUWsXUBXX8BwSwsQdwIR8TGiRuhQhXUJ+Qqd8PnL4nhPpEWlogFxF8JG77QALi/TvhvPWbD2rLAw1sC9tYTkYkce45ISCJ2aEOwTbhAzaPQxx4BxI+TFY/ZoUsEIp8lx9n140YKQ6CVUkBTcKR1/ldvv9SgiEn7k/6+d2T7sY3H5aTNUK2ob/+E8rQOjRVwmYVdmM7fjYz5eHodfZd+6jWP1pwEMBzPF8b4fK8etIi0WieIE5dgQe7ACiUgB7qAbNB6WizhfDI9v1jOR+aemdbRX+qvtNxi97Da1bt6R8u7JdVk75HXlR6pEnWq/6hlE7yWZbWTaxRsaznvZZ3sspUTCtLtNW9Lm3fH1UXnWWXRickqdO12Y12LGwqqKDVOj9PVXFjUaJ1ROtUZ1MKBTeLHvemqzCucSvAQqA/N2z3n9ycfdj+DzbImPUthLanHcNqGDrxut6GZYVRh2m8s5D52LekCQj5DAV4TDijM7cvtyMPl+Hq+6E8mOdjPWGQzn6g2IUbbfiB/oXJztUf32Xb92Kbh3qTen2GFnY+os99aYVXFUge1r6eFYhYt5avZ9PzXyJmT8XxR8mQpxP46U7zQlRRza/OHG5WEx1Nbof+gI9rnbFWT00maHCuoFxPhPQ5kS6jWn4joW91uPVR+kjdFG3P4myREkmmR46Pbhuqr3qvz7WHPfv3yB8y9+P+N8+FrPk6cG4koBApIIqS6xHiY+prycY2NeX+gZFu0Gmm6S4LkPhu77cjGu7u69e6f7oPqAPuDvZBkTF2sPTFTtuRGHBTQsbDgDtbBGhCyCeYe46UU0dVysRu/nF2ab0e/Vl8DHpUaEfvUVZKrZthWX5Zz4itiH9np7xoNyyXYXwaXs+WQ04+EH6603ANkONC8nC3N4Wi+gBYLZGsdhJk78Fxi38Yu86tu1PkI6TWPXLEykyYPEAeU9I4J3WA6HF33r0qEVko4mF4v+uPrkTFMu6hmJ42QzOqsvxi8OXRazdvuGerstH2LuhamZCb5SHwpQOu/neuD+UhPTEoNMeIbi058EXJihL6lgXb4AM1bY3k92Es5Q5q20yAWMVgaxuh6cdDy6DBBAKS8TJkPSaNrgwaa6ndP4Q4EseGFuPt4d/cis/59tN45zjEfTK+uxosH8n6ZvSCgL6A1CzqWW4iiEVpbbxcb1pzPB2/7lyNzaUyUx6tXzno7LQPhz5QqdbS7cicUw9c4PqhoZHQw3eHMg1AQDtQPQnlWz1dL+T02FA7jJw0Of38ju0Pm7Jkevnkya5t98l2G7QOrC868pTHRoHap3mNPViMdla1mMRgrURfUJRpotWt5PYajc/NiPFH9bg7OMiR1DXkyXwwtixCb2CAZ7O8K3xg4nMiQ+9DOJcNz6qhw5QSoAJ9lZJj7tIwkxBKN2Q9KKmwwty2m1EuIMvlRzI70KlXKjApo1Dr6j3rnpfawe0TNvfVe3lqxt70fhjP08ckcIhDeJQ7ymQQREIs6lNjKQSrLbeLg0JV7B51VOwUVzi0jOzm5XOsdq7CMBKQSoazSk6WlGJng6FX/H1PDvBpfT42e1jyK5BdRGO5Acnihv4AX//RVBdgQbAPyoQt3EGAhCSBh68exhOFoPjZGwxrOJZ0fx1wQ7yPhA+YFmJOqeqFViIi3vunPzUtj1F+MjEwR/v/MMEbFYQVVHIpt1brCd9/FZBXui8maFeZXDDPic7ZCzokv3Zs9AhA7iwH7/GzeFszcgYeltSECPPwb47pHfcbhE5Ub2ND1hnAI1Hp1jOggtjQIVITd0y/ptcFJKwtdRteyyL9jbasAexXGrigUgqThnZvDsbFrFR5mzEp3nBxrhTEYckCrqy+Vg7C/V8krFacCOv8xfUQCjRpo967XFK+vIudfHxRfHhkUcX5eYOrGbYXLLHXfsrC1yQOLTVZazSjxAaf5DQf37w3DYn+0azTujZT0zlh5xYtWvK1NOaAgV9lyxx+R1U5dIXdB3msD3Tacll55e9Vx8yg3WAEg7ELzVt27B/3Bm1EUog+L0HojW49SoqIDTi1/eEmpPb2lMak6uXQ0oe6Cjzu+Qvgtrma9ynxXrJ8/P2nt8tMWK+Su6ahIjkdCr9v5NiXvylK0L65mO60aYOIbaZ3vK4cx1RD2SG0yw5bczx7uH0RAzRjCZtY2mhNkBgXRk5w2jFb2kaBlBgg/xMOHynFF5YAifgOMxreH3v8nvX2a3kYyFNWXi5d65zQdFOQ70VKLdoaSyYSqLFmpuwd3glFS2jkPVLWCVChnYUk4yA324YhxIL+H2AXJjkFiviYSVliQDJOcQuWGUJ1pVQNY0YHVIltKETt0Mu4VxJZfAveUyeXvVG/rdQ+BKdOI6rTyzld8iYtBVaVg5mc4Ra1O0t/l9DIKnVRgcU2g7E4AIey67BNS8LTm2Cai4g2hChjjmnRIojSvolQqzLKK31VPsYpUD5lfcZW/FQOIEq+D2w9AGhGVITS14gCgRXYH5MwRJwhV5ttKWBxQKVPoa5E3sylqIyp9lDuunORSU3Ff21KQVOb6hBnREw6nci606BuXowwK33YijC7OefJkFdFT4KN19I7e6aL4RaY81vnmuc9T5RVe9h/xyv2+wg2RkgrfEbd+6iavXvcSvapBsvhw6tQczJZm3xi86TWP1kQOZss+tzbHAM+jNzJgHKJnsprCGsVKtqoms5VOOtNvRSR7glbrRTLNn4z616OhWQqSgok1DwvFIvU/6GRf/OsYVy/EGxvZeCnWv2TsUsNgVw6iOLeSuhjBes4HtZxUocUuJ9jOFOly7VS4rRdzL/twGD92ONB892ZoTqaX8wgdZv3Fm5KqKX7M+ovFyLjuaam+5omeu8Xl4bJ55FDfThEodx0FJG8CAg4gGv1OS8vgVCJH3a1AMC4BvYM7kJi6KmqOK6cWeZCrifI/BSVL2JZPIPh6D6A8WY7qr1fwSrV2jcbz0fSi8a8AAAD//4VxpMNOLAAA
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -69,7 +69,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/CustomizedImage/line57.sh b/pkg/agent/testdata/CustomizedImage/line57.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/CustomizedImage/line57.sh
+++ b/pkg/agent/testdata/CustomizedImage/line57.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/CustomizedImage/line72.sh b/pkg/agent/testdata/CustomizedImage/line72.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/CustomizedImage/line72.sh
+++ b/pkg/agent/testdata/CustomizedImage/line72.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/CustomizedImageKata/CustomData b/pkg/agent/testdata/CustomizedImageKata/CustomData
index 95bef4a5b81..e73cc792659 100644
--- a/pkg/agent/testdata/CustomizedImageKata/CustomData
+++ b/pkg/agent/testdata/CustomizedImageKata/CustomData
@@ -54,7 +54,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -69,7 +69,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/CustomizedImageKata/line57.sh b/pkg/agent/testdata/CustomizedImageKata/line57.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/CustomizedImageKata/line57.sh
+++ b/pkg/agent/testdata/CustomizedImageKata/line57.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/CustomizedImageKata/line72.sh b/pkg/agent/testdata/CustomizedImageKata/line72.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/CustomizedImageKata/line72.sh
+++ b/pkg/agent/testdata/CustomizedImageKata/line72.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData
index a2b3ecf2450..e6113eb7094 100644
--- a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData
+++ b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData
@@ -72,7 +72,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line75.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line75.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/MarinerV2+CustomCloud/line75.sh
+++ b/pkg/agent/testdata/MarinerV2+CustomCloud/line75.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/MarinerV2+Kata/CustomData b/pkg/agent/testdata/MarinerV2+Kata/CustomData
index a08f4aad897..5f350ee6c13 100644
--- a/pkg/agent/testdata/MarinerV2+Kata/CustomData
+++ b/pkg/agent/testdata/MarinerV2+Kata/CustomData
@@ -72,7 +72,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/MarinerV2+Kata/line75.sh b/pkg/agent/testdata/MarinerV2+Kata/line75.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/MarinerV2+Kata/line75.sh
+++ b/pkg/agent/testdata/MarinerV2+Kata/line75.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData
index a08f4aad897..5f350ee6c13 100644
--- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData
+++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData
@@ -72,7 +72,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line75.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line75.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line75.sh
+++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line75.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData
index a08f4aad897..5f350ee6c13 100644
--- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData
+++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData
@@ -72,7 +72,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line75.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line75.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line75.sh
+++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line75.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData
index a08f4aad897..5f350ee6c13 100644
--- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData
+++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData
@@ -72,7 +72,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line75.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line75.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line75.sh
+++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line75.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData
index a08f4aad897..5f350ee6c13 100644
--- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData
+++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData
@@ -72,7 +72,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line75.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line75.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line75.sh
+++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line75.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/RawUbuntu/CustomData b/pkg/agent/testdata/RawUbuntu/CustomData
index 84914cd1e32..4e74eb97c39 100644
--- a/pkg/agent/testdata/RawUbuntu/CustomData
+++ b/pkg/agent/testdata/RawUbuntu/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/RawUbuntu/line62.sh b/pkg/agent/testdata/RawUbuntu/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/RawUbuntu/line62.sh
+++ b/pkg/agent/testdata/RawUbuntu/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/RawUbuntu/line77.sh b/pkg/agent/testdata/RawUbuntu/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/RawUbuntu/line77.sh
+++ b/pkg/agent/testdata/RawUbuntu/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/agent/testdata/RawUbuntuContainerd/CustomData b/pkg/agent/testdata/RawUbuntuContainerd/CustomData
index e278758d688..342c9680a57 100644
--- a/pkg/agent/testdata/RawUbuntuContainerd/CustomData
+++ b/pkg/agent/testdata/RawUbuntuContainerd/CustomData
@@ -59,7 +59,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh
@@ -74,7 +74,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi9lrC+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OJS78oHfeB7vnt4rRrBlNzTg+ly7/rtcGXJsycY0Zaku4vicHJufvP293OeZUSXen46TFbrADBlgrPsHAXPP/m/X9gHfs9+YMYLhfPcFk7oHS5zZc1whAHfMMJwjb0eXTEDwRk0nrpny/HOLsTWEpFMe16wkW9lSiWnirY0UXs8Lgj1DFAeltkDUFiC+8f/6HLPOs4Kb8WkFBIYBvXHNqTXxeGmuzMwomnyIR6jZDwLg+jzAU2YMo4lowW0N9wk98++mys6wRT0rsBVw1ur/oVd7lnkPnhrVftWdWhRB8C3qra8A/DOog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//Zuh0LvgHAAA=
+    H4sIAAAAAAAA/8STTW/TMBzG7/0UUegNYi+FrS+3tDVaRUmnrEFCCEVO7G0WqV05Tgur8t2RDW3S4mYIJu36+Pm//7zrOI7juJngCjNOJXFHzi/N6HcspyFeUXfkuCuR/vBqY9LdTRbhMpiFKJomn1B0O1uE1Wv8WErqHb3dBMvJ9cEBCE3dN3UJIrY8F5jMRYYVE1yXgmKtYF0K7j2FLTCO5jrmQal1MYJQtwnSXKQgE5KCLeNEbAvAqTJP8GQM2DIG7O7icRwu42SymKIw+IgqmDNeftez38RJEE2uq9OErXsp05Kr8pA2QnMU3KKqbNlXs9bp7jZUFkzwwh05X7429DXjnB6f0uj+4OKd3pUP+sD3fPfwWjWCKbmnB9Pl3vXb4cqSZ08woi1JdxfF4eTc/Obt7+c8y4gu9fx0mKzWAWDKBGfZOQqef/J/v7AP/J79wIwXCue5LZzQO1zmyprhCAO+YYThGns9umIGgjNoPHXPluOdXYitJSKZ9rxgI9/KlEpOFW1povZ4XBDqGaA8LLMHoLAE94//0eWedZwV3opJKSQwDOqPbUivi8NNd2dgRNPkQzxGyXgWBtHnA5owZRxLRgtob7hJ7p99N1d0ginoXYGrhrdW/Qu73LPIffDWqvat6tCiDoBvVW15B+DSog6BreEhaHydYzwSRVfrHKsX+SudqvMKLd53fgYAAP//bupWl/gHAAA=
 
 - path: /opt/azure/containers/init-aks-custom-cloud.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line62.sh b/pkg/agent/testdata/RawUbuntuContainerd/line62.sh
index ed036b8cc45..e01934cdff9 100644
--- a/pkg/agent/testdata/RawUbuntuContainerd/line62.sh
+++ b/pkg/agent/testdata/RawUbuntuContainerd/line62.sh
@@ -116,7 +116,7 @@ installStandaloneContainerd() {
 
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line77.sh b/pkg/agent/testdata/RawUbuntuContainerd/line77.sh
index ff6e600b539..b7f73a8e8c1 100644
--- a/pkg/agent/testdata/RawUbuntuContainerd/line77.sh
+++ b/pkg/agent/testdata/RawUbuntuContainerd/line77.sh
@@ -7,7 +7,7 @@
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/pkg/parser/utilities.go b/pkg/parser/utilities.go
index 3fd14d6908d..44f2e5347b2 100644
--- a/pkg/parser/utilities.go
+++ b/pkg/parser/utilities.go
@@ -21,25 +21,6 @@ func getBaseTemplate() *nbcontractv1.Configuration {
 	}
 }
 
-func getBoolStr(state nbcontractv1.FeatureState) string {
-	if state == nbcontractv1.FeatureState_FEATURE_STATE_ENABLED {
-		return "true"
-	}
-
-	return "false"
-}
-
-func getInverseBoolStr(state nbcontractv1.FeatureState) string {
-	if state == nbcontractv1.FeatureState_FEATURE_STATE_ENABLED {
-		return "false"
-	}
-
-	return "true"
-}
-
 func getFuncMap() template.FuncMap {
-	return template.FuncMap{
-		"getBoolStr":        getBoolStr,
-		"getInverseBoolStr": getInverseBoolStr,
-	}
+	return template.FuncMap{}
 }
diff --git a/pkg/proto/nbcontract/v1/apiserverconfig.pb.go b/pkg/proto/nbcontract/v1/apiserverconfig.pb.go
index 1da9af58788..c6c6f5f016d 100644
--- a/pkg/proto/nbcontract/v1/apiserverconfig.pb.go
+++ b/pkg/proto/nbcontract/v1/apiserverconfig.pb.go
@@ -25,8 +25,8 @@ type ApiServerConfig struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	ApiserverPublicKey string `protobuf:"bytes,1,opt,name=apiserver_public_key,json=apiserverPublicKey,proto3" json:"apiserver_public_key,omitempty"`
-	ApiserverName      string `protobuf:"bytes,2,opt,name=apiserver_name,json=apiserverName,proto3" json:"apiserver_name,omitempty"`
+	ApiServerPublicKey string `protobuf:"bytes,1,opt,name=api_server_public_key,json=apiServerPublicKey,proto3" json:"api_server_public_key,omitempty"`
+	ApiServerName      string `protobuf:"bytes,2,opt,name=api_server_name,json=apiServerName,proto3" json:"api_server_name,omitempty"`
 }
 
 func (x *ApiServerConfig) Reset() {
@@ -61,16 +61,16 @@ func (*ApiServerConfig) Descriptor() ([]byte, []int) {
 	return file_pkg_proto_nbcontract_v1_apiserverconfig_proto_rawDescGZIP(), []int{0}
 }
 
-func (x *ApiServerConfig) GetApiserverPublicKey() string {
+func (x *ApiServerConfig) GetApiServerPublicKey() string {
 	if x != nil {
-		return x.ApiserverPublicKey
+		return x.ApiServerPublicKey
 	}
 	return ""
 }
 
-func (x *ApiServerConfig) GetApiserverName() string {
+func (x *ApiServerConfig) GetApiServerName() string {
 	if x != nil {
-		return x.ApiserverName
+		return x.ApiServerName
 	}
 	return ""
 }
@@ -81,30 +81,27 @@ var file_pkg_proto_nbcontract_v1_apiserverconfig_proto_rawDesc = []byte{
 	0x0a, 0x2d, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f,
 	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x65, 0x72,
 	0x76, 0x65, 0x72, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
-	0x0d, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x1a, 0x2a,
-	0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74,
-	0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73,
-	0x74, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x6a, 0x0a, 0x0f, 0x41, 0x70,
-	0x69, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x30, 0x0a,
-	0x14, 0x61, 0x70, 0x69, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x70, 0x75, 0x62, 0x6c, 0x69,
-	0x63, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x61, 0x70, 0x69,
-	0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x12,
-	0x25, 0x0a, 0x0e, 0x61, 0x70, 0x69, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x61, 0x70, 0x69, 0x73, 0x65, 0x72, 0x76,
-	0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x42, 0xc0, 0x01, 0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x2e, 0x6e,
-	0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x42, 0x14, 0x41, 0x70,
-	0x69, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f,
-	0x74, 0x6f, 0x50, 0x01, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
-	0x2f, 0x41, 0x7a, 0x75, 0x72, 0x65, 0x2f, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x42, 0x61, 0x6b, 0x65,
-	0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f,
-	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74,
-	0x72, 0x61, 0x63, 0x74, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x4e, 0x58, 0x58, 0xaa, 0x02, 0x0d, 0x4e,
-	0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0d, 0x4e,
-	0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x19, 0x4e,
-	0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42,
-	0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, 0x4e, 0x62, 0x63, 0x6f, 0x6e,
-	0x74, 0x72, 0x61, 0x63, 0x74, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x0d, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x22, 0x6c,
+	0x0a, 0x0f, 0x41, 0x70, 0x69, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x12, 0x31, 0x0a, 0x15, 0x61, 0x70, 0x69, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f,
+	0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x12, 0x61, 0x70, 0x69, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x50, 0x75, 0x62, 0x6c, 0x69,
+	0x63, 0x4b, 0x65, 0x79, 0x12, 0x26, 0x0a, 0x0f, 0x61, 0x70, 0x69, 0x5f, 0x73, 0x65, 0x72, 0x76,
+	0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x61,
+	0x70, 0x69, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x42, 0xc0, 0x01, 0x0a,
+	0x11, 0x63, 0x6f, 0x6d, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e,
+	0x76, 0x31, 0x42, 0x14, 0x41, 0x70, 0x69, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68,
+	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x41, 0x7a, 0x75, 0x72, 0x65, 0x2f, 0x41, 0x67, 0x65,
+	0x6e, 0x74, 0x42, 0x61, 0x6b, 0x65, 0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x3b,
+	0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x4e,
+	0x58, 0x58, 0xaa, 0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e,
+	0x56, 0x31, 0xca, 0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c,
+	0x56, 0x31, 0xe2, 0x02, 0x19, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c,
+	0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02,
+	0x0e, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x3a, 0x3a, 0x56, 0x31, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -136,7 +133,6 @@ func file_pkg_proto_nbcontract_v1_apiserverconfig_proto_init() {
 	if File_pkg_proto_nbcontract_v1_apiserverconfig_proto != nil {
 		return
 	}
-	file_pkg_proto_nbcontract_v1_featurestate_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_pkg_proto_nbcontract_v1_apiserverconfig_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ApiServerConfig); i {
diff --git a/pkg/proto/nbcontract/v1/apiserverconfig.proto b/pkg/proto/nbcontract/v1/apiserverconfig.proto
index f7efff12142..32400c776c0 100644
--- a/pkg/proto/nbcontract/v1/apiserverconfig.proto
+++ b/pkg/proto/nbcontract/v1/apiserverconfig.proto
@@ -1,8 +1,7 @@
 syntax = "proto3";
 package nbcontract.v1;
-import "pkg/proto/nbcontract/v1/featurestate.proto";
 
 message ApiServerConfig {
-    string apiserver_public_key = 1;
-    string apiserver_name = 2;
+    string api_server_public_key = 1;
+    string api_server_name = 2;
   }
\ No newline at end of file
diff --git a/pkg/proto/nbcontract/v1/clusterconfig.pb.go b/pkg/proto/nbcontract/v1/clusterconfig.pb.go
index 416bca3ba47..224b83d4759 100644
--- a/pkg/proto/nbcontract/v1/clusterconfig.pb.go
+++ b/pkg/proto/nbcontract/v1/clusterconfig.pb.go
@@ -20,102 +20,102 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-type VmType int32
+type ClusterConfig_VM int32
 
 const (
-	VmType_VM_TYPE_UNSPECIFIED VmType = 0
-	VmType_VM_TYPE_STANDARD    VmType = 1
-	VmType_VM_TYPE_VMSS        VmType = 2
+	ClusterConfig_UNSPECIFIED ClusterConfig_VM = 0
+	ClusterConfig_STANDARD    ClusterConfig_VM = 1
+	ClusterConfig_VMSS        ClusterConfig_VM = 2
 )
 
-// Enum value maps for VmType.
+// Enum value maps for ClusterConfig_VM.
 var (
-	VmType_name = map[int32]string{
-		0: "VM_TYPE_UNSPECIFIED",
-		1: "VM_TYPE_STANDARD",
-		2: "VM_TYPE_VMSS",
+	ClusterConfig_VM_name = map[int32]string{
+		0: "UNSPECIFIED",
+		1: "STANDARD",
+		2: "VMSS",
 	}
-	VmType_value = map[string]int32{
-		"VM_TYPE_UNSPECIFIED": 0,
-		"VM_TYPE_STANDARD":    1,
-		"VM_TYPE_VMSS":        2,
+	ClusterConfig_VM_value = map[string]int32{
+		"UNSPECIFIED": 0,
+		"STANDARD":    1,
+		"VMSS":        2,
 	}
 )
 
-func (x VmType) Enum() *VmType {
-	p := new(VmType)
+func (x ClusterConfig_VM) Enum() *ClusterConfig_VM {
+	p := new(ClusterConfig_VM)
 	*p = x
 	return p
 }
 
-func (x VmType) String() string {
+func (x ClusterConfig_VM) String() string {
 	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
 }
 
-func (VmType) Descriptor() protoreflect.EnumDescriptor {
+func (ClusterConfig_VM) Descriptor() protoreflect.EnumDescriptor {
 	return file_pkg_proto_nbcontract_v1_clusterconfig_proto_enumTypes[0].Descriptor()
 }
 
-func (VmType) Type() protoreflect.EnumType {
+func (ClusterConfig_VM) Type() protoreflect.EnumType {
 	return &file_pkg_proto_nbcontract_v1_clusterconfig_proto_enumTypes[0]
 }
 
-func (x VmType) Number() protoreflect.EnumNumber {
+func (x ClusterConfig_VM) Number() protoreflect.EnumNumber {
 	return protoreflect.EnumNumber(x)
 }
 
-// Deprecated: Use VmType.Descriptor instead.
-func (VmType) EnumDescriptor() ([]byte, []int) {
-	return file_pkg_proto_nbcontract_v1_clusterconfig_proto_rawDescGZIP(), []int{0}
+// Deprecated: Use ClusterConfig_VM.Descriptor instead.
+func (ClusterConfig_VM) EnumDescriptor() ([]byte, []int) {
+	return file_pkg_proto_nbcontract_v1_clusterconfig_proto_rawDescGZIP(), []int{0, 0}
 }
 
-type LoadBalancerSku int32
+type LoadBalancerConfig_LoadBalancerSku int32
 
 const (
-	LoadBalancerSku_LOAD_BALANCER_SKU_UNSPECIFIED LoadBalancerSku = 0
-	LoadBalancerSku_LOAD_BALANCER_SKU_BASIC       LoadBalancerSku = 1
-	LoadBalancerSku_LOAD_BALANCER_SKU_STANDARD    LoadBalancerSku = 2
+	LoadBalancerConfig_UNSPECIFIED LoadBalancerConfig_LoadBalancerSku = 0
+	LoadBalancerConfig_BASIC       LoadBalancerConfig_LoadBalancerSku = 1
+	LoadBalancerConfig_STANDARD    LoadBalancerConfig_LoadBalancerSku = 2
 )
 
-// Enum value maps for LoadBalancerSku.
+// Enum value maps for LoadBalancerConfig_LoadBalancerSku.
 var (
-	LoadBalancerSku_name = map[int32]string{
-		0: "LOAD_BALANCER_SKU_UNSPECIFIED",
-		1: "LOAD_BALANCER_SKU_BASIC",
-		2: "LOAD_BALANCER_SKU_STANDARD",
+	LoadBalancerConfig_LoadBalancerSku_name = map[int32]string{
+		0: "UNSPECIFIED",
+		1: "BASIC",
+		2: "STANDARD",
 	}
-	LoadBalancerSku_value = map[string]int32{
-		"LOAD_BALANCER_SKU_UNSPECIFIED": 0,
-		"LOAD_BALANCER_SKU_BASIC":       1,
-		"LOAD_BALANCER_SKU_STANDARD":    2,
+	LoadBalancerConfig_LoadBalancerSku_value = map[string]int32{
+		"UNSPECIFIED": 0,
+		"BASIC":       1,
+		"STANDARD":    2,
 	}
 )
 
-func (x LoadBalancerSku) Enum() *LoadBalancerSku {
-	p := new(LoadBalancerSku)
+func (x LoadBalancerConfig_LoadBalancerSku) Enum() *LoadBalancerConfig_LoadBalancerSku {
+	p := new(LoadBalancerConfig_LoadBalancerSku)
 	*p = x
 	return p
 }
 
-func (x LoadBalancerSku) String() string {
+func (x LoadBalancerConfig_LoadBalancerSku) String() string {
 	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
 }
 
-func (LoadBalancerSku) Descriptor() protoreflect.EnumDescriptor {
+func (LoadBalancerConfig_LoadBalancerSku) Descriptor() protoreflect.EnumDescriptor {
 	return file_pkg_proto_nbcontract_v1_clusterconfig_proto_enumTypes[1].Descriptor()
 }
 
-func (LoadBalancerSku) Type() protoreflect.EnumType {
+func (LoadBalancerConfig_LoadBalancerSku) Type() protoreflect.EnumType {
 	return &file_pkg_proto_nbcontract_v1_clusterconfig_proto_enumTypes[1]
 }
 
-func (x LoadBalancerSku) Number() protoreflect.EnumNumber {
+func (x LoadBalancerConfig_LoadBalancerSku) Number() protoreflect.EnumNumber {
 	return protoreflect.EnumNumber(x)
 }
 
-// Deprecated: Use LoadBalancerSku.Descriptor instead.
-func (LoadBalancerSku) EnumDescriptor() ([]byte, []int) {
-	return file_pkg_proto_nbcontract_v1_clusterconfig_proto_rawDescGZIP(), []int{1}
+// Deprecated: Use LoadBalancerConfig_LoadBalancerSku.Descriptor instead.
+func (LoadBalancerConfig_LoadBalancerSku) EnumDescriptor() ([]byte, []int) {
+	return file_pkg_proto_nbcontract_v1_clusterconfig_proto_rawDescGZIP(), []int{2, 0}
 }
 
 // Cluster Config fields stored in azure.json used by cloud-provider-azure
@@ -126,7 +126,7 @@ type ClusterConfig struct {
 
 	ResourceGroup          string                `protobuf:"bytes,1,opt,name=resource_group,json=resourceGroup,proto3" json:"resource_group,omitempty"`
 	Location               string                `protobuf:"bytes,2,opt,name=location,proto3" json:"location,omitempty"`
-	VmType                 VmType                `protobuf:"varint,3,opt,name=vm_type,json=vmType,proto3,enum=nbcontract.v1.VmType" json:"vm_type,omitempty"` // default to standard for v1.27 and below versions and vmss for v1.28+ versions
+	VmType                 ClusterConfig_VM      `protobuf:"varint,3,opt,name=vm_type,json=vmType,proto3,enum=nbcontract.v1.ClusterConfig_VM" json:"vm_type,omitempty"` // default to standard for v1.27 and below versions and vmss for v1.28+ versions
 	PrimaryAvailabilitySet string                `protobuf:"bytes,4,opt,name=primary_availability_set,json=primaryAvailabilitySet,proto3" json:"primary_availability_set,omitempty"`
 	PrimaryScaleSet        string                `protobuf:"bytes,5,opt,name=primary_scale_set,json=primaryScaleSet,proto3" json:"primary_scale_set,omitempty"`
 	VirtualNetworkConfig   *ClusterNetworkConfig `protobuf:"bytes,6,opt,name=virtual_network_config,json=virtualNetworkConfig,proto3" json:"virtual_network_config,omitempty"`
@@ -180,11 +180,11 @@ func (x *ClusterConfig) GetLocation() string {
 	return ""
 }
 
-func (x *ClusterConfig) GetVmType() VmType {
+func (x *ClusterConfig) GetVmType() ClusterConfig_VM {
 	if x != nil {
 		return x.VmType
 	}
-	return VmType_VM_TYPE_UNSPECIFIED
+	return ClusterConfig_UNSPECIFIED
 }
 
 func (x *ClusterConfig) GetPrimaryAvailabilitySet() string {
@@ -306,9 +306,10 @@ type LoadBalancerConfig struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	LoadBalancerSku                       LoadBalancerSku `protobuf:"varint,1,opt,name=load_balancer_sku,json=loadBalancerSku,proto3,enum=nbcontract.v1.LoadBalancerSku" json:"load_balancer_sku,omitempty"`                                            // default to basic
-	ExcludeMasterFromStandardLoadBalancer *bool           `protobuf:"varint,2,opt,name=exclude_master_from_standard_load_balancer,json=excludeMasterFromStandardLoadBalancer,proto3,oneof" json:"exclude_master_from_standard_load_balancer,omitempty"` // default to true
-	MaxLoadBalancerRuleCount              *int32          `protobuf:"varint,3,opt,name=max_load_balancer_rule_count,json=maxLoadBalancerRuleCount,proto3,oneof" json:"max_load_balancer_rule_count,omitempty"`                                          // default to 148
+	LoadBalancerSku                       LoadBalancerConfig_LoadBalancerSku `protobuf:"varint,1,opt,name=load_balancer_sku,json=loadBalancerSku,proto3,enum=nbcontract.v1.LoadBalancerConfig_LoadBalancerSku" json:"load_balancer_sku,omitempty"`                         // default to basic
+	ExcludeMasterFromStandardLoadBalancer *bool                              `protobuf:"varint,2,opt,name=exclude_master_from_standard_load_balancer,json=excludeMasterFromStandardLoadBalancer,proto3,oneof" json:"exclude_master_from_standard_load_balancer,omitempty"` // default to true
+	MaxLoadBalancerRuleCount              *int32                             `protobuf:"varint,3,opt,name=max_load_balancer_rule_count,json=maxLoadBalancerRuleCount,proto3,oneof" json:"max_load_balancer_rule_count,omitempty"`                                          // default to 148
+	DisableOutboundSnat                   *bool                              `protobuf:"varint,4,opt,name=disable_outbound_snat,json=disableOutboundSnat,proto3,oneof" json:"disable_outbound_snat,omitempty"`                                                             // default to false
 }
 
 func (x *LoadBalancerConfig) Reset() {
@@ -343,11 +344,11 @@ func (*LoadBalancerConfig) Descriptor() ([]byte, []int) {
 	return file_pkg_proto_nbcontract_v1_clusterconfig_proto_rawDescGZIP(), []int{2}
 }
 
-func (x *LoadBalancerConfig) GetLoadBalancerSku() LoadBalancerSku {
+func (x *LoadBalancerConfig) GetLoadBalancerSku() LoadBalancerConfig_LoadBalancerSku {
 	if x != nil {
 		return x.LoadBalancerSku
 	}
-	return LoadBalancerSku_LOAD_BALANCER_SKU_UNSPECIFIED
+	return LoadBalancerConfig_UNSPECIFIED
 }
 
 func (x *LoadBalancerConfig) GetExcludeMasterFromStandardLoadBalancer() bool {
@@ -364,101 +365,110 @@ func (x *LoadBalancerConfig) GetMaxLoadBalancerRuleCount() int32 {
 	return 0
 }
 
+func (x *LoadBalancerConfig) GetDisableOutboundSnat() bool {
+	if x != nil && x.DisableOutboundSnat != nil {
+		return *x.DisableOutboundSnat
+	}
+	return false
+}
+
 var File_pkg_proto_nbcontract_v1_clusterconfig_proto protoreflect.FileDescriptor
 
 var file_pkg_proto_nbcontract_v1_clusterconfig_proto_rawDesc = []byte{
 	0x0a, 0x2b, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f,
 	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65,
 	0x72, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0d, 0x6e,
-	0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x22, 0xcc, 0x03, 0x0a,
+	0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x22, 0x85, 0x04, 0x0a,
 	0x0d, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x25,
 	0x0a, 0x0e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70,
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
 	0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f,
 	0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x12, 0x2e, 0x0a, 0x07, 0x76, 0x6d, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x0e, 0x32, 0x15, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e,
-	0x76, 0x31, 0x2e, 0x56, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x52, 0x06, 0x76, 0x6d, 0x54, 0x79, 0x70,
-	0x65, 0x12, 0x38, 0x0a, 0x18, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x5f, 0x61, 0x76, 0x61,
-	0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x73, 0x65, 0x74, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x16, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x41, 0x76, 0x61, 0x69,
-	0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x53, 0x65, 0x74, 0x12, 0x2a, 0x0a, 0x11, 0x70,
-	0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x5f, 0x73, 0x65, 0x74,
-	0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x53,
-	0x63, 0x61, 0x6c, 0x65, 0x53, 0x65, 0x74, 0x12, 0x59, 0x0a, 0x16, 0x76, 0x69, 0x72, 0x74, 0x75,
-	0x61, 0x6c, 0x5f, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74,
-	0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e,
-	0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x14, 0x76, 0x69,
-	0x72, 0x74, 0x75, 0x61, 0x6c, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x12, 0x32, 0x0a, 0x15, 0x75, 0x73, 0x65, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e,
-	0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x07, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x13, 0x75, 0x73, 0x65, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4d, 0x65,
-	0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x53, 0x0a, 0x14, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62,
-	0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x08,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63,
-	0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65,
-	0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x12, 0x6c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c,
-	0x61, 0x6e, 0x63, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0xcc, 0x01, 0x0a, 0x14,
-	0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x12, 0x1b, 0x0a, 0x09, 0x76, 0x6e, 0x65, 0x74, 0x5f, 0x6e, 0x61, 0x6d,
-	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x76, 0x6e, 0x65, 0x74, 0x4e, 0x61, 0x6d,
-	0x65, 0x12, 0x2e, 0x0a, 0x13, 0x76, 0x6e, 0x65, 0x74, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11,
-	0x76, 0x6e, 0x65, 0x74, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x47, 0x72, 0x6f, 0x75,
-	0x70, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x75, 0x62, 0x6e, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x06, 0x73, 0x75, 0x62, 0x6e, 0x65, 0x74, 0x12, 0x2e, 0x0a, 0x13, 0x73, 0x65, 0x63,
-	0x75, 0x72, 0x69, 0x74, 0x79, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x6e, 0x61, 0x6d, 0x65,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79,
-	0x47, 0x72, 0x6f, 0x75, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x6f, 0x75,
-	0x74, 0x65, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
-	0x72, 0x6f, 0x75, 0x74, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x22, 0xd5, 0x02, 0x0a, 0x12, 0x4c,
+	0x6e, 0x12, 0x38, 0x0a, 0x07, 0x76, 0x6d, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x0e, 0x32, 0x1f, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e,
+	0x76, 0x31, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x56, 0x4d, 0x52, 0x06, 0x76, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x12, 0x38, 0x0a, 0x18, 0x70,
+	0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x5f, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c,
+	0x69, 0x74, 0x79, 0x5f, 0x73, 0x65, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x70,
+	0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69,
+	0x74, 0x79, 0x53, 0x65, 0x74, 0x12, 0x2a, 0x0a, 0x11, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79,
+	0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x5f, 0x73, 0x65, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x0f, 0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x53, 0x65,
+	0x74, 0x12, 0x59, 0x0a, 0x16, 0x76, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x5f, 0x6e, 0x65, 0x74,
+	0x77, 0x6f, 0x72, 0x6b, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x23, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76,
+	0x31, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x14, 0x76, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x4e,
+	0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x32, 0x0a, 0x15,
+	0x75, 0x73, 0x65, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x6d, 0x65, 0x74,
+	0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x75, 0x73, 0x65,
+	0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
+	0x12, 0x53, 0x0a, 0x14, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65,
+	0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21,
+	0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4c,
 	0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x12, 0x4a, 0x0a, 0x11, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63,
-	0x65, 0x72, 0x5f, 0x73, 0x6b, 0x75, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x6e,
-	0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x6f, 0x61,
-	0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x53, 0x6b, 0x75, 0x52, 0x0f, 0x6c, 0x6f,
-	0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x53, 0x6b, 0x75, 0x12, 0x5e, 0x0a,
-	0x2a, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x5f,
-	0x66, 0x72, 0x6f, 0x6d, 0x5f, 0x73, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x5f, 0x6c, 0x6f,
-	0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x08, 0x48, 0x00, 0x52, 0x25, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x4d, 0x61, 0x73, 0x74,
-	0x65, 0x72, 0x46, 0x72, 0x6f, 0x6d, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x4c, 0x6f,
-	0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x88, 0x01, 0x01, 0x12, 0x43, 0x0a,
-	0x1c, 0x6d, 0x61, 0x78, 0x5f, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63,
-	0x65, 0x72, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x05, 0x48, 0x01, 0x52, 0x18, 0x6d, 0x61, 0x78, 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61,
-	0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x52, 0x75, 0x6c, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x88,
-	0x01, 0x01, 0x42, 0x2d, 0x0a, 0x2b, 0x5f, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x6d,
-	0x61, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x66, 0x72, 0x6f, 0x6d, 0x5f, 0x73, 0x74, 0x61, 0x6e, 0x64,
-	0x61, 0x72, 0x64, 0x5f, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65,
-	0x72, 0x42, 0x1f, 0x0a, 0x1d, 0x5f, 0x6d, 0x61, 0x78, 0x5f, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62,
-	0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x5f, 0x63, 0x6f, 0x75,
-	0x6e, 0x74, 0x2a, 0x49, 0x0a, 0x06, 0x56, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x12, 0x17, 0x0a, 0x13,
-	0x56, 0x4d, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46,
-	0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x56, 0x4d, 0x5f, 0x54, 0x59, 0x50, 0x45,
-	0x5f, 0x53, 0x54, 0x41, 0x4e, 0x44, 0x41, 0x52, 0x44, 0x10, 0x01, 0x12, 0x10, 0x0a, 0x0c, 0x56,
-	0x4d, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x56, 0x4d, 0x53, 0x53, 0x10, 0x02, 0x2a, 0x71, 0x0a,
-	0x0f, 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x53, 0x6b, 0x75,
-	0x12, 0x21, 0x0a, 0x1d, 0x4c, 0x4f, 0x41, 0x44, 0x5f, 0x42, 0x41, 0x4c, 0x41, 0x4e, 0x43, 0x45,
-	0x52, 0x5f, 0x53, 0x4b, 0x55, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45,
-	0x44, 0x10, 0x00, 0x12, 0x1b, 0x0a, 0x17, 0x4c, 0x4f, 0x41, 0x44, 0x5f, 0x42, 0x41, 0x4c, 0x41,
-	0x4e, 0x43, 0x45, 0x52, 0x5f, 0x53, 0x4b, 0x55, 0x5f, 0x42, 0x41, 0x53, 0x49, 0x43, 0x10, 0x01,
-	0x12, 0x1e, 0x0a, 0x1a, 0x4c, 0x4f, 0x41, 0x44, 0x5f, 0x42, 0x41, 0x4c, 0x41, 0x4e, 0x43, 0x45,
-	0x52, 0x5f, 0x53, 0x4b, 0x55, 0x5f, 0x53, 0x54, 0x41, 0x4e, 0x44, 0x41, 0x52, 0x44, 0x10, 0x02,
-	0x42, 0xbe, 0x01, 0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72,
-	0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x42, 0x12, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x40, 0x67, 0x69,
-	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x41, 0x7a, 0x75, 0x72, 0x65, 0x2f, 0x41,
-	0x67, 0x65, 0x6e, 0x74, 0x42, 0x61, 0x6b, 0x65, 0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76,
-	0x31, 0x3b, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x76, 0x31, 0xa2, 0x02,
-	0x03, 0x4e, 0x58, 0x58, 0xaa, 0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63,
-	0x74, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63,
-	0x74, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x19, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63,
-	0x74, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
-	0xea, 0x02, 0x0e, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x3a, 0x3a, 0x56,
-	0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x67, 0x52, 0x12, 0x6c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0x2d, 0x0a, 0x02, 0x56, 0x4d, 0x12, 0x0f, 0x0a, 0x0b, 0x55,
+	0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08,
+	0x53, 0x54, 0x41, 0x4e, 0x44, 0x41, 0x52, 0x44, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x56, 0x4d,
+	0x53, 0x53, 0x10, 0x02, 0x22, 0xcc, 0x01, 0x0a, 0x14, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
+	0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1b, 0x0a,
+	0x09, 0x76, 0x6e, 0x65, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x08, 0x76, 0x6e, 0x65, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x2e, 0x0a, 0x13, 0x76, 0x6e,
+	0x65, 0x74, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x67, 0x72, 0x6f, 0x75,
+	0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x76, 0x6e, 0x65, 0x74, 0x52, 0x65, 0x73,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x75,
+	0x62, 0x6e, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x75, 0x62, 0x6e,
+	0x65, 0x74, 0x12, 0x2e, 0x0a, 0x13, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x5f, 0x67,
+	0x72, 0x6f, 0x75, 0x70, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x11, 0x73, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4e, 0x61,
+	0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x5f, 0x74, 0x61, 0x62, 0x6c,
+	0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x54, 0x61,
+	0x62, 0x6c, 0x65, 0x22, 0xf8, 0x03, 0x0a, 0x12, 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61,
+	0x6e, 0x63, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x5d, 0x0a, 0x11, 0x6c, 0x6f,
+	0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x5f, 0x73, 0x6b, 0x75, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x31, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61,
+	0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63,
+	0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c,
+	0x61, 0x6e, 0x63, 0x65, 0x72, 0x53, 0x6b, 0x75, 0x52, 0x0f, 0x6c, 0x6f, 0x61, 0x64, 0x42, 0x61,
+	0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x53, 0x6b, 0x75, 0x12, 0x5e, 0x0a, 0x2a, 0x65, 0x78, 0x63,
+	0x6c, 0x75, 0x64, 0x65, 0x5f, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x66, 0x72, 0x6f, 0x6d,
+	0x5f, 0x73, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x5f, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62,
+	0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52,
+	0x25, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x46, 0x72,
+	0x6f, 0x6d, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61,
+	0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x88, 0x01, 0x01, 0x12, 0x43, 0x0a, 0x1c, 0x6d, 0x61, 0x78,
+	0x5f, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x5f, 0x72,
+	0x75, 0x6c, 0x65, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x48,
+	0x01, 0x52, 0x18, 0x6d, 0x61, 0x78, 0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63,
+	0x65, 0x72, 0x52, 0x75, 0x6c, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x88, 0x01, 0x01, 0x12, 0x37,
+	0x0a, 0x15, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6f, 0x75, 0x74, 0x62, 0x6f, 0x75,
+	0x6e, 0x64, 0x5f, 0x73, 0x6e, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x48, 0x02, 0x52,
+	0x13, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x4f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64,
+	0x53, 0x6e, 0x61, 0x74, 0x88, 0x01, 0x01, 0x22, 0x3b, 0x0a, 0x0f, 0x4c, 0x6f, 0x61, 0x64, 0x42,
+	0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x53, 0x6b, 0x75, 0x12, 0x0f, 0x0a, 0x0b, 0x55, 0x4e,
+	0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x42,
+	0x41, 0x53, 0x49, 0x43, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x53, 0x54, 0x41, 0x4e, 0x44, 0x41,
+	0x52, 0x44, 0x10, 0x02, 0x42, 0x2d, 0x0a, 0x2b, 0x5f, 0x65, 0x78, 0x63, 0x6c, 0x75, 0x64, 0x65,
+	0x5f, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x66, 0x72, 0x6f, 0x6d, 0x5f, 0x73, 0x74, 0x61,
+	0x6e, 0x64, 0x61, 0x72, 0x64, 0x5f, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e,
+	0x63, 0x65, 0x72, 0x42, 0x1f, 0x0a, 0x1d, 0x5f, 0x6d, 0x61, 0x78, 0x5f, 0x6c, 0x6f, 0x61, 0x64,
+	0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x72, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x5f, 0x63,
+	0x6f, 0x75, 0x6e, 0x74, 0x42, 0x18, 0x0a, 0x16, 0x5f, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65,
+	0x5f, 0x6f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x73, 0x6e, 0x61, 0x74, 0x42, 0xbe,
+	0x01, 0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63,
+	0x74, 0x2e, 0x76, 0x31, 0x42, 0x12, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68,
+	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x41, 0x7a, 0x75, 0x72, 0x65, 0x2f, 0x41, 0x67, 0x65,
+	0x6e, 0x74, 0x42, 0x61, 0x6b, 0x65, 0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x3b,
+	0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x4e,
+	0x58, 0x58, 0xaa, 0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e,
+	0x56, 0x31, 0xca, 0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c,
+	0x56, 0x31, 0xe2, 0x02, 0x19, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c,
+	0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02,
+	0x0e, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x3a, 0x3a, 0x56, 0x31, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -476,17 +486,17 @@ func file_pkg_proto_nbcontract_v1_clusterconfig_proto_rawDescGZIP() []byte {
 var file_pkg_proto_nbcontract_v1_clusterconfig_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
 var file_pkg_proto_nbcontract_v1_clusterconfig_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
 var file_pkg_proto_nbcontract_v1_clusterconfig_proto_goTypes = []interface{}{
-	(VmType)(0),                  // 0: nbcontract.v1.VmType
-	(LoadBalancerSku)(0),         // 1: nbcontract.v1.LoadBalancerSku
-	(*ClusterConfig)(nil),        // 2: nbcontract.v1.ClusterConfig
-	(*ClusterNetworkConfig)(nil), // 3: nbcontract.v1.ClusterNetworkConfig
-	(*LoadBalancerConfig)(nil),   // 4: nbcontract.v1.LoadBalancerConfig
+	(ClusterConfig_VM)(0),                   // 0: nbcontract.v1.ClusterConfig.VM
+	(LoadBalancerConfig_LoadBalancerSku)(0), // 1: nbcontract.v1.LoadBalancerConfig.LoadBalancerSku
+	(*ClusterConfig)(nil),                   // 2: nbcontract.v1.ClusterConfig
+	(*ClusterNetworkConfig)(nil),            // 3: nbcontract.v1.ClusterNetworkConfig
+	(*LoadBalancerConfig)(nil),              // 4: nbcontract.v1.LoadBalancerConfig
 }
 var file_pkg_proto_nbcontract_v1_clusterconfig_proto_depIdxs = []int32{
-	0, // 0: nbcontract.v1.ClusterConfig.vm_type:type_name -> nbcontract.v1.VmType
+	0, // 0: nbcontract.v1.ClusterConfig.vm_type:type_name -> nbcontract.v1.ClusterConfig.VM
 	3, // 1: nbcontract.v1.ClusterConfig.virtual_network_config:type_name -> nbcontract.v1.ClusterNetworkConfig
 	4, // 2: nbcontract.v1.ClusterConfig.load_balancer_config:type_name -> nbcontract.v1.LoadBalancerConfig
-	1, // 3: nbcontract.v1.LoadBalancerConfig.load_balancer_sku:type_name -> nbcontract.v1.LoadBalancerSku
+	1, // 3: nbcontract.v1.LoadBalancerConfig.load_balancer_sku:type_name -> nbcontract.v1.LoadBalancerConfig.LoadBalancerSku
 	4, // [4:4] is the sub-list for method output_type
 	4, // [4:4] is the sub-list for method input_type
 	4, // [4:4] is the sub-list for extension type_name
diff --git a/pkg/proto/nbcontract/v1/clusterconfig.proto b/pkg/proto/nbcontract/v1/clusterconfig.proto
index c837334daaf..4c24478ba4d 100644
--- a/pkg/proto/nbcontract/v1/clusterconfig.proto
+++ b/pkg/proto/nbcontract/v1/clusterconfig.proto
@@ -5,18 +5,18 @@ package nbcontract.v1;
 message ClusterConfig {
   string resource_group = 1;
   string location = 2;
-  VmType vm_type = 3; // default to standard for v1.27 and below versions and vmss for v1.28+ versions
+  VM vm_type = 3; // default to standard for v1.27 and below versions and vmss for v1.28+ versions
   string primary_availability_set = 4;
   string primary_scale_set = 5;
   ClusterNetworkConfig virtual_network_config = 6;
   bool use_instance_metadata = 7; // default to false
   LoadBalancerConfig load_balancer_config = 8;
-}
 
-enum VmType {
-  VM_TYPE_UNSPECIFIED = 0;
-  VM_TYPE_STANDARD = 1;
-  VM_TYPE_VMSS = 2;
+  enum VM {
+    UNSPECIFIED = 0;
+    STANDARD = 1;
+    VMSS = 2;
+  }
 }
 
 message ClusterNetworkConfig {
@@ -31,10 +31,12 @@ message LoadBalancerConfig {
   LoadBalancerSku load_balancer_sku = 1; // default to basic
   optional bool exclude_master_from_standard_load_balancer = 2; // default to true
   optional int32 max_load_balancer_rule_count = 3; // default to 148
+  optional bool disable_outbound_snat = 4; // default to false
+
+  enum LoadBalancerSku {
+    UNSPECIFIED = 0;
+    BASIC = 1;
+    STANDARD = 2;
+  }
 }
 
-enum LoadBalancerSku {
-  LOAD_BALANCER_SKU_UNSPECIFIED = 0;
-  LOAD_BALANCER_SKU_BASIC = 1;
-  LOAD_BALANCER_SKU_STANDARD = 2;
-}
\ No newline at end of file
diff --git a/pkg/proto/nbcontract/v1/config.pb.go b/pkg/proto/nbcontract/v1/config.pb.go
index 77d22a15c75..6ecf87545d6 100644
--- a/pkg/proto/nbcontract/v1/config.pb.go
+++ b/pkg/proto/nbcontract/v1/config.pb.go
@@ -452,184 +452,182 @@ var file_pkg_proto_nbcontract_v1_config_proto_rawDesc = []byte{
 	0x75, 0x74, 0x68, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
 	0x2b, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e,
 	0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x2a, 0x70, 0x6b,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x2c, 0x70, 0x6b,
 	0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61,
-	0x63, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x74, 0x61,
-	0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x2c, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76,
-	0x31, 0x2f, 0x74, 0x65, 0x6c, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x28, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x2f,
-	0x72, 0x75, 0x6e, 0x63, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x1a, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f,
-	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d,
-	0x63, 0x6c, 0x6f, 0x75, 0x64, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x1a, 0x2d, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63,
-	0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x61, 0x70, 0x69, 0x73, 0x65,
-	0x72, 0x76, 0x65, 0x72, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x1a, 0x34, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f,
-	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x6c, 0x73, 0x62, 0x6f, 0x6f,
-	0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x2b, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x2f,
-	0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x22, 0xbf, 0x11, 0x0a, 0x0d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x42, 0x0a, 0x1d, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x61, 0x75, 0x74,
-	0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x1b, 0x63, 0x6c,
-	0x75, 0x73, 0x74, 0x65, 0x72, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65,
-	0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x12, 0x5f, 0x0a, 0x18, 0x74, 0x6c, 0x73,
-	0x5f, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x5f, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x6e, 0x62,
-	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x4c, 0x53, 0x42,
-	0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x52, 0x16, 0x74, 0x6c, 0x73, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70,
-	0x70, 0x69, 0x6e, 0x67, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x2d, 0x0a, 0x12, 0x6b, 0x75,
-	0x62, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74,
-	0x65, 0x73, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x4d, 0x0a, 0x12, 0x6b, 0x75, 0x62,
-	0x65, 0x5f, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61,
-	0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4b, 0x75, 0x62, 0x65, 0x42, 0x69, 0x6e, 0x61, 0x72, 0x79,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x10, 0x6b, 0x75, 0x62, 0x65, 0x42, 0x69, 0x6e, 0x61,
-	0x72, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x55, 0x0a, 0x13, 0x63, 0x75, 0x73, 0x74,
-	0x6f, 0x6d, 0x5f, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18,
-	0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61,
-	0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, 0x6c, 0x6f, 0x75,
-	0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x00, 0x52, 0x11, 0x63, 0x75, 0x73, 0x74, 0x6f,
-	0x6d, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x88, 0x01, 0x01, 0x12,
-	0x23, 0x0a, 0x0d, 0x6b, 0x75, 0x62, 0x65, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x75, 0x72, 0x6c,
-	0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x6b, 0x75, 0x62, 0x65, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x55, 0x72, 0x6c, 0x12, 0x49, 0x0a, 0x10, 0x61, 0x70, 0x69, 0x73, 0x65, 0x72, 0x76, 0x65,
-	0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e,
-	0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x41,
-	0x70, 0x69, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0f,
-	0x61, 0x70, 0x69, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12,
-	0x43, 0x0a, 0x0e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74,
-	0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0d, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x12, 0x3a, 0x0a, 0x0b, 0x61, 0x75, 0x74, 0x68, 0x5f, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6e, 0x62, 0x63, 0x6f,
-	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x75, 0x74, 0x68, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x52, 0x0a, 0x61, 0x75, 0x74, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x12, 0x3a, 0x0a, 0x0b, 0x72, 0x75, 0x6e, 0x63, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18,
-	0x10, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61,
-	0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x75, 0x6e, 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x52, 0x0a, 0x72, 0x75, 0x6e, 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x17, 0x0a, 0x07,
-	0x76, 0x6d, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x76,
-	0x6d, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x30, 0x0a, 0x14, 0x6c, 0x69, 0x6e, 0x75, 0x78, 0x5f, 0x61,
-	0x64, 0x6d, 0x69, 0x6e, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x12, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x12, 0x6c, 0x69, 0x6e, 0x75, 0x78, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x55,
-	0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x4c, 0x0a, 0x11, 0x63, 0x6f, 0x6e, 0x74, 0x61,
-	0x69, 0x6e, 0x65, 0x72, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x16, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e,
-	0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x52, 0x10, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x15, 0x0a, 0x06, 0x69, 0x73, 0x5f, 0x76, 0x68, 0x64, 0x18,
-	0x17, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x56, 0x68, 0x64, 0x12, 0x43, 0x0a, 0x0e,
-	0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x18,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63,
-	0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x52, 0x0d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x12, 0x46, 0x0a, 0x0f, 0x74, 0x65, 0x6c, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6e, 0x62, 0x63,
-	0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x65, 0x6c, 0x65, 0x70,
-	0x6f, 0x72, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0e, 0x74, 0x65, 0x6c, 0x65, 0x70,
-	0x6f, 0x72, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1d, 0x0a, 0x0a, 0x65, 0x6e, 0x61,
-	0x62, 0x6c, 0x65, 0x5f, 0x73, 0x73, 0x68, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x65,
-	0x6e, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x73, 0x68, 0x12, 0x3a, 0x0a, 0x19, 0x65, 0x6e, 0x61, 0x62,
-	0x6c, 0x65, 0x5f, 0x75, 0x6e, 0x61, 0x74, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x64, 0x5f, 0x75, 0x70,
-	0x67, 0x72, 0x61, 0x64, 0x65, 0x18, 0x1c, 0x20, 0x01, 0x28, 0x08, 0x52, 0x17, 0x65, 0x6e, 0x61,
-	0x62, 0x6c, 0x65, 0x55, 0x6e, 0x61, 0x74, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x64, 0x55, 0x70, 0x67,
-	0x72, 0x61, 0x64, 0x65, 0x12, 0x2b, 0x0a, 0x12, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f,
-	0x6f, 0x66, 0x5f, 0x74, 0x68, 0x65, 0x5f, 0x64, 0x61, 0x79, 0x18, 0x1d, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x66, 0x54, 0x68, 0x65, 0x44, 0x61,
-	0x79, 0x12, 0x43, 0x0a, 0x0e, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x5f, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6e, 0x62, 0x63, 0x6f,
-	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4b, 0x75, 0x62, 0x65, 0x6c, 0x65,
-	0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0d, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x39, 0x0a, 0x19, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65,
-	0x5f, 0x68, 0x6f, 0x73, 0x74, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x61, 0x67,
-	0x65, 0x6e, 0x74, 0x18, 0x20, 0x20, 0x01, 0x28, 0x08, 0x52, 0x16, 0x65, 0x6e, 0x61, 0x62, 0x6c,
-	0x65, 0x48, 0x6f, 0x73, 0x74, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x41, 0x67, 0x65, 0x6e,
-	0x74, 0x12, 0x26, 0x0a, 0x0f, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x63, 0x61, 0x5f, 0x63,
-	0x65, 0x72, 0x74, 0x73, 0x18, 0x21, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x75, 0x73, 0x74,
-	0x6f, 0x6d, 0x43, 0x61, 0x43, 0x65, 0x72, 0x74, 0x73, 0x12, 0x29, 0x0a, 0x10, 0x70, 0x72, 0x6f,
-	0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x18, 0x22, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x4f, 0x75,
-	0x74, 0x70, 0x75, 0x74, 0x12, 0x49, 0x0a, 0x10, 0x77, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64,
-	0x5f, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x28, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1e,
-	0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x57,
-	0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x52, 0x0f,
-	0x77, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x12,
-	0x35, 0x0a, 0x17, 0x69, 0x70, 0x76, 0x36, 0x5f, 0x64, 0x75, 0x61, 0x6c, 0x5f, 0x73, 0x74, 0x61,
-	0x63, 0x6b, 0x5f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x2a, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x14, 0x69, 0x70, 0x76, 0x36, 0x44, 0x75, 0x61, 0x6c, 0x53, 0x74, 0x61, 0x63, 0x6b, 0x45,
-	0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x29, 0x0a, 0x10, 0x6f, 0x75, 0x74, 0x62, 0x6f, 0x75,
-	0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x18, 0x2b, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0f, 0x6f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e,
-	0x64, 0x12, 0x48, 0x0a, 0x21, 0x65, 0x6e, 0x73, 0x75, 0x72, 0x65, 0x5f, 0x6e, 0x6f, 0x5f, 0x64,
-	0x75, 0x70, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x6d, 0x69, 0x73, 0x63, 0x75, 0x6f, 0x75, 0x73, 0x5f,
-	0x62, 0x72, 0x69, 0x64, 0x67, 0x65, 0x18, 0x2d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x1d, 0x65, 0x6e,
-	0x73, 0x75, 0x72, 0x65, 0x4e, 0x6f, 0x44, 0x75, 0x70, 0x65, 0x50, 0x72, 0x6f, 0x6d, 0x69, 0x73,
-	0x63, 0x75, 0x6f, 0x75, 0x73, 0x42, 0x72, 0x69, 0x64, 0x67, 0x65, 0x12, 0x53, 0x0a, 0x14, 0x63,
-	0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x5f, 0x64, 0x6f, 0x6d,
-	0x61, 0x69, 0x6e, 0x18, 0x2e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x6e, 0x62, 0x63, 0x6f,
+	0x63, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x65, 0x6c, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x28, 0x70, 0x6b, 0x67, 0x2f,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74,
+	0x2f, 0x76, 0x31, 0x2f, 0x72, 0x75, 0x6e, 0x63, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f,
+	0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x75,
+	0x73, 0x74, 0x6f, 0x6d, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x2d, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x61,
+	0x70, 0x69, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x34, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f,
+	0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x6c,
+	0x73, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x2b, 0x70, 0x6b, 0x67, 0x2f,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74,
+	0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xbf, 0x11, 0x0a, 0x0d, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x42, 0x0a, 0x1d, 0x63, 0x6c, 0x75,
+	0x73, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65,
+	0x5f, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x1b, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69,
+	0x63, 0x61, 0x74, 0x65, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x12, 0x5f, 0x0a,
+	0x18, 0x74, 0x6c, 0x73, 0x5f, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x70, 0x69,
+	0x6e, 0x67, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x25, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e,
+	0x54, 0x4c, 0x53, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x16, 0x74, 0x6c, 0x73, 0x42, 0x6f, 0x6f, 0x74, 0x73,
+	0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x2d,
+	0x0a, 0x12, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x5f, 0x76, 0x65, 0x72,
+	0x73, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x6b, 0x75, 0x62, 0x65,
+	0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x4d, 0x0a,
+	0x12, 0x6b, 0x75, 0x62, 0x65, 0x5f, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x5f, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6e, 0x62, 0x63, 0x6f,
+	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4b, 0x75, 0x62, 0x65, 0x42, 0x69,
+	0x6e, 0x61, 0x72, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x10, 0x6b, 0x75, 0x62, 0x65,
+	0x42, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x55, 0x0a, 0x13,
+	0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x5f, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6e, 0x62, 0x63, 0x6f,
 	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d,
-	0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x52, 0x12, 0x63, 0x75,
+	0x43, 0x6c, 0x6f, 0x75, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x00, 0x52, 0x11, 0x63,
+	0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0d, 0x6b, 0x75, 0x62, 0x65, 0x70, 0x72, 0x6f, 0x78, 0x79,
+	0x5f, 0x75, 0x72, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x6b, 0x75, 0x62, 0x65,
+	0x70, 0x72, 0x6f, 0x78, 0x79, 0x55, 0x72, 0x6c, 0x12, 0x49, 0x0a, 0x10, 0x61, 0x70, 0x69, 0x73,
+	0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x07, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e,
+	0x76, 0x31, 0x2e, 0x41, 0x70, 0x69, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x52, 0x0f, 0x61, 0x70, 0x69, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x43, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x12, 0x43, 0x0a, 0x0e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6e, 0x62,
+	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6c, 0x75, 0x73,
+	0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0d, 0x63, 0x6c, 0x75, 0x73, 0x74,
+	0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x3a, 0x0a, 0x0b, 0x61, 0x75, 0x74, 0x68,
+	0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e,
+	0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x75,
+	0x74, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0a, 0x61, 0x75, 0x74, 0x68, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x12, 0x3a, 0x0a, 0x0b, 0x72, 0x75, 0x6e, 0x63, 0x5f, 0x63, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6e, 0x62, 0x63, 0x6f,
+	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x75, 0x6e, 0x63, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x52, 0x0a, 0x72, 0x75, 0x6e, 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x12, 0x17, 0x0a, 0x07, 0x76, 0x6d, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x11, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x06, 0x76, 0x6d, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x30, 0x0a, 0x14, 0x6c, 0x69, 0x6e,
+	0x75, 0x78, 0x5f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d,
+	0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x6c, 0x69, 0x6e, 0x75, 0x78, 0x41, 0x64,
+	0x6d, 0x69, 0x6e, 0x55, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x4c, 0x0a, 0x11, 0x63,
+	0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x18, 0x16, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72,
+	0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72,
+	0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x10, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e,
+	0x65, 0x72, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x15, 0x0a, 0x06, 0x69, 0x73, 0x5f,
+	0x76, 0x68, 0x64, 0x18, 0x17, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x56, 0x68, 0x64,
+	0x12, 0x43, 0x0a, 0x0e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x5f, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x18, 0x18, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e,
+	0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x46, 0x0a, 0x0f, 0x74, 0x65, 0x6c, 0x65, 0x70, 0x6f, 0x72,
+	0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d,
+	0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x54,
+	0x65, 0x6c, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0e, 0x74,
+	0x65, 0x6c, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1d, 0x0a,
+	0x0a, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x73, 0x73, 0x68, 0x18, 0x1b, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x09, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x73, 0x68, 0x12, 0x3a, 0x0a, 0x19,
+	0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x75, 0x6e, 0x61, 0x74, 0x74, 0x65, 0x6e, 0x64, 0x65,
+	0x64, 0x5f, 0x75, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x18, 0x1c, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x17, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x55, 0x6e, 0x61, 0x74, 0x74, 0x65, 0x6e, 0x64, 0x65,
+	0x64, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x12, 0x2b, 0x0a, 0x12, 0x6d, 0x65, 0x73, 0x73,
+	0x61, 0x67, 0x65, 0x5f, 0x6f, 0x66, 0x5f, 0x74, 0x68, 0x65, 0x5f, 0x64, 0x61, 0x79, 0x18, 0x1d,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x66, 0x54,
+	0x68, 0x65, 0x44, 0x61, 0x79, 0x12, 0x43, 0x0a, 0x0e, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74,
+	0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e,
+	0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4b, 0x75,
+	0x62, 0x65, 0x6c, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0d, 0x6b, 0x75, 0x62,
+	0x65, 0x6c, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x39, 0x0a, 0x19, 0x65, 0x6e,
+	0x61, 0x62, 0x6c, 0x65, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x5f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x18, 0x20, 0x20, 0x01, 0x28, 0x08, 0x52, 0x16, 0x65,
+	0x6e, 0x61, 0x62, 0x6c, 0x65, 0x48, 0x6f, 0x73, 0x74, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x41, 0x67, 0x65, 0x6e, 0x74, 0x12, 0x26, 0x0a, 0x0f, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f,
+	0x63, 0x61, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x73, 0x18, 0x21, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d,
+	0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, 0x61, 0x43, 0x65, 0x72, 0x74, 0x73, 0x12, 0x29, 0x0a,
+	0x10, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x6f, 0x75, 0x74, 0x70, 0x75,
+	0x74, 0x18, 0x22, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x73, 0x69,
+	0x6f, 0x6e, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x12, 0x49, 0x0a, 0x10, 0x77, 0x6f, 0x72, 0x6b,
+	0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x28, 0x20, 0x01,
+	0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e,
+	0x76, 0x31, 0x2e, 0x57, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x52, 0x75, 0x6e, 0x74, 0x69,
+	0x6d, 0x65, 0x52, 0x0f, 0x77, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x52, 0x75, 0x6e, 0x74,
+	0x69, 0x6d, 0x65, 0x12, 0x35, 0x0a, 0x17, 0x69, 0x70, 0x76, 0x36, 0x5f, 0x64, 0x75, 0x61, 0x6c,
+	0x5f, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x5f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x2a,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x14, 0x69, 0x70, 0x76, 0x36, 0x44, 0x75, 0x61, 0x6c, 0x53, 0x74,
+	0x61, 0x63, 0x6b, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x29, 0x0a, 0x10, 0x6f, 0x75,
+	0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x18, 0x2b,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x6f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x6f,
+	0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x12, 0x48, 0x0a, 0x21, 0x65, 0x6e, 0x73, 0x75, 0x72, 0x65, 0x5f,
+	0x6e, 0x6f, 0x5f, 0x64, 0x75, 0x70, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x6d, 0x69, 0x73, 0x63, 0x75,
+	0x6f, 0x75, 0x73, 0x5f, 0x62, 0x72, 0x69, 0x64, 0x67, 0x65, 0x18, 0x2d, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x1d, 0x65, 0x6e, 0x73, 0x75, 0x72, 0x65, 0x4e, 0x6f, 0x44, 0x75, 0x70, 0x65, 0x50, 0x72,
+	0x6f, 0x6d, 0x69, 0x73, 0x63, 0x75, 0x6f, 0x75, 0x73, 0x42, 0x72, 0x69, 0x64, 0x67, 0x65, 0x12,
+	0x53, 0x0a, 0x14, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68,
+	0x5f, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x2e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e,
+	0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x75,
 	0x73, 0x74, 0x6f, 0x6d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e,
-	0x12, 0x57, 0x0a, 0x16, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x6c, 0x69, 0x6e, 0x75, 0x78,
-	0x5f, 0x6f, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x2f, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x22, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31,
-	0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4c, 0x69, 0x6e, 0x75, 0x78, 0x4f, 0x53, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x52, 0x13, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4c, 0x69, 0x6e, 0x75,
-	0x78, 0x4f, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x41, 0x0a, 0x1d, 0x61, 0x7a, 0x75,
-	0x72, 0x65, 0x5f, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x5f, 0x72, 0x65, 0x67, 0x69, 0x73,
-	0x74, 0x72, 0x79, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x18, 0x38, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x1a, 0x61, 0x7a, 0x75, 0x72, 0x65, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x52, 0x65,
-	0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x12, 0x3f, 0x0a, 0x1c,
-	0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x5f, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x39, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x19, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x45, 0x67, 0x72, 0x65, 0x73,
-	0x73, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x3a, 0x0a,
-	0x19, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x61, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74,
-	0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x18, 0x3a, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x17, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x41, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74,
-	0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x12, 0x17, 0x0a, 0x07, 0x69, 0x73, 0x5f,
-	0x6b, 0x61, 0x74, 0x61, 0x18, 0x3b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x4b, 0x61,
-	0x74, 0x61, 0x12, 0x25, 0x0a, 0x0e, 0x6e, 0x65, 0x65, 0x64, 0x73, 0x5f, 0x63, 0x67, 0x72, 0x6f,
-	0x75, 0x70, 0x76, 0x32, 0x18, 0x3c, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x6e, 0x65, 0x65, 0x64,
-	0x73, 0x43, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x76, 0x32, 0x12, 0x4f, 0x0a, 0x11, 0x68, 0x74, 0x74,
-	0x70, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x3d,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63,
-	0x74, 0x2e, 0x76, 0x31, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x48, 0x01, 0x52, 0x0f, 0x68, 0x74, 0x74, 0x70, 0x50, 0x72, 0x6f, 0x78,
-	0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x88, 0x01, 0x01, 0x12, 0x3c, 0x0a, 0x0a, 0x67, 0x70,
-	0x75, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x3e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18,
-	0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x47,
-	0x50, 0x55, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x02, 0x52, 0x09, 0x67, 0x70, 0x75, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x88, 0x01, 0x01, 0x42, 0x16, 0x0a, 0x14, 0x5f, 0x63, 0x75, 0x73,
-	0x74, 0x6f, 0x6d, 0x5f, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x42, 0x14, 0x0a, 0x12, 0x5f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x67, 0x70, 0x75, 0x5f, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2a, 0x47, 0x0a, 0x0f, 0x57, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61,
-	0x64, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x0e, 0x57, 0x52, 0x5f, 0x55,
-	0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d,
-	0x4f, 0x43, 0x49, 0x5f, 0x43, 0x4f, 0x4e, 0x54, 0x41, 0x49, 0x4e, 0x45, 0x52, 0x10, 0x01, 0x12,
-	0x0d, 0x0a, 0x09, 0x57, 0x41, 0x53, 0x4d, 0x5f, 0x57, 0x41, 0x53, 0x49, 0x10, 0x02, 0x42, 0xb7,
-	0x01, 0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63,
-	0x74, 0x2e, 0x76, 0x31, 0x42, 0x0b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x50, 0x01, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x41, 0x7a, 0x75, 0x72, 0x65, 0x2f, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x42, 0x61, 0x6b, 0x65, 0x72,
-	0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e,
-	0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72,
-	0x61, 0x63, 0x74, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x4e, 0x58, 0x58, 0xaa, 0x02, 0x0d, 0x4e, 0x62,
-	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0d, 0x4e, 0x62,
-	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x19, 0x4e, 0x62,
-	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d,
-	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74,
-	0x72, 0x61, 0x63, 0x74, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x52, 0x12, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x44, 0x6f,
+	0x6d, 0x61, 0x69, 0x6e, 0x12, 0x57, 0x0a, 0x16, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x6c,
+	0x69, 0x6e, 0x75, 0x78, 0x5f, 0x6f, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x2f,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63,
+	0x74, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4c, 0x69, 0x6e, 0x75, 0x78,
+	0x4f, 0x53, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x13, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d,
+	0x4c, 0x69, 0x6e, 0x75, 0x78, 0x4f, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x41, 0x0a,
+	0x1d, 0x61, 0x7a, 0x75, 0x72, 0x65, 0x5f, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x5f, 0x72,
+	0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x18, 0x38,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x1a, 0x61, 0x7a, 0x75, 0x72, 0x65, 0x50, 0x72, 0x69, 0x76, 0x61,
+	0x74, 0x65, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72,
+	0x12, 0x3f, 0x0a, 0x1c, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x5f, 0x65, 0x67, 0x72, 0x65,
+	0x73, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
+	0x18, 0x39, 0x20, 0x01, 0x28, 0x09, 0x52, 0x19, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x45,
+	0x67, 0x72, 0x65, 0x73, 0x73, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73,
+	0x73, 0x12, 0x3a, 0x0a, 0x19, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x61, 0x72, 0x74, 0x69,
+	0x66, 0x61, 0x63, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x18, 0x3a,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x17, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x41, 0x72, 0x74, 0x69,
+	0x66, 0x61, 0x63, 0x74, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x12, 0x17, 0x0a,
+	0x07, 0x69, 0x73, 0x5f, 0x6b, 0x61, 0x74, 0x61, 0x18, 0x3b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06,
+	0x69, 0x73, 0x4b, 0x61, 0x74, 0x61, 0x12, 0x25, 0x0a, 0x0e, 0x6e, 0x65, 0x65, 0x64, 0x73, 0x5f,
+	0x63, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x76, 0x32, 0x18, 0x3c, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d,
+	0x6e, 0x65, 0x65, 0x64, 0x73, 0x43, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x76, 0x32, 0x12, 0x4f, 0x0a,
+	0x11, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x18, 0x3d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e,
+	0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x50, 0x72, 0x6f,
+	0x78, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x01, 0x52, 0x0f, 0x68, 0x74, 0x74, 0x70,
+	0x50, 0x72, 0x6f, 0x78, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x88, 0x01, 0x01, 0x12, 0x3c,
+	0x0a, 0x0a, 0x67, 0x70, 0x75, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x3e, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e,
+	0x76, 0x31, 0x2e, 0x47, 0x50, 0x55, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x02, 0x52, 0x09,
+	0x67, 0x70, 0x75, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x88, 0x01, 0x01, 0x42, 0x16, 0x0a, 0x14,
+	0x5f, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x5f, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x42, 0x14, 0x0a, 0x12, 0x5f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x70, 0x72,
+	0x6f, 0x78, 0x79, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x67,
+	0x70, 0x75, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2a, 0x47, 0x0a, 0x0f, 0x57, 0x6f, 0x72,
+	0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x0e,
+	0x57, 0x52, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00,
+	0x12, 0x11, 0x0a, 0x0d, 0x4f, 0x43, 0x49, 0x5f, 0x43, 0x4f, 0x4e, 0x54, 0x41, 0x49, 0x4e, 0x45,
+	0x52, 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09, 0x57, 0x41, 0x53, 0x4d, 0x5f, 0x57, 0x41, 0x53, 0x49,
+	0x10, 0x02, 0x42, 0xb7, 0x01, 0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e,
+	0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x42, 0x0b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
+	0x63, 0x6f, 0x6d, 0x2f, 0x41, 0x7a, 0x75, 0x72, 0x65, 0x2f, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x42,
+	0x61, 0x6b, 0x65, 0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e,
+	0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x6e, 0x62, 0x63,
+	0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x4e, 0x58, 0x58, 0xaa,
+	0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x56, 0x31, 0xca,
+	0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0xe2,
+	0x02, 0x19, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0x5c,
+	0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, 0x4e, 0x62,
+	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -703,7 +701,6 @@ func file_pkg_proto_nbcontract_v1_config_proto_init() {
 	file_pkg_proto_nbcontract_v1_networkconfig_proto_init()
 	file_pkg_proto_nbcontract_v1_authconfig_proto_init()
 	file_pkg_proto_nbcontract_v1_kubeletconfig_proto_init()
-	file_pkg_proto_nbcontract_v1_featurestate_proto_init()
 	file_pkg_proto_nbcontract_v1_teleportconfig_proto_init()
 	file_pkg_proto_nbcontract_v1_runcconfig_proto_init()
 	file_pkg_proto_nbcontract_v1_customcloudconfig_proto_init()
diff --git a/pkg/proto/nbcontract/v1/config.proto b/pkg/proto/nbcontract/v1/config.proto
index 8883bfda235..d8b58fba92d 100644
--- a/pkg/proto/nbcontract/v1/config.proto
+++ b/pkg/proto/nbcontract/v1/config.proto
@@ -11,7 +11,6 @@ import "pkg/proto/nbcontract/v1/containerdconfig.proto";
 import "pkg/proto/nbcontract/v1/networkconfig.proto";
 import "pkg/proto/nbcontract/v1/authconfig.proto";
 import "pkg/proto/nbcontract/v1/kubeletconfig.proto";
-import "pkg/proto/nbcontract/v1/featurestate.proto";
 import "pkg/proto/nbcontract/v1/teleportconfig.proto";
 import "pkg/proto/nbcontract/v1/runcconfig.proto";
 import "pkg/proto/nbcontract/v1/customcloudconfig.proto";
diff --git a/pkg/proto/nbcontract/v1/customcloudconfig.pb.go b/pkg/proto/nbcontract/v1/customcloudconfig.pb.go
index 648332f0460..ce4e971dab6 100644
--- a/pkg/proto/nbcontract/v1/customcloudconfig.pb.go
+++ b/pkg/proto/nbcontract/v1/customcloudconfig.pb.go
@@ -25,14 +25,14 @@ type CustomCloudConfig struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Status shows whether CustomCloudConfig is enabled or not
-	Status *FeatureState `protobuf:"varint,1,opt,name=status,proto3,enum=nbcontract.v1.FeatureState,oneof" json:"status,omitempty"`
+	// IsAKSCustomCloud is a flag to indicate if it is AKS custom cloud
+	IsAksCustomCloud bool `protobuf:"varint,1,opt,name=is_aks_custom_cloud,json=isAksCustomCloud,proto3" json:"is_aks_custom_cloud,omitempty"`
 	// InitFilePath is the path to the file that contains the init script
-	InitFilePath *string `protobuf:"bytes,2,opt,name=init_file_path,json=initFilePath,proto3,oneof" json:"init_file_path,omitempty"`
+	InitFilePath string `protobuf:"bytes,2,opt,name=init_file_path,json=initFilePath,proto3" json:"init_file_path,omitempty"`
 	// RepoDepotEndpoint is the endpoint of the repo depot
-	RepoDepotEndpoint    *string `protobuf:"bytes,3,opt,name=repo_depot_endpoint,json=repoDepotEndpoint,proto3,oneof" json:"repo_depot_endpoint,omitempty"`
-	TargetEnvironment    string  `protobuf:"bytes,4,opt,name=target_environment,json=targetEnvironment,proto3" json:"target_environment,omitempty"`
-	CustomEnvJsonContent string  `protobuf:"bytes,5,opt,name=custom_env_json_content,json=customEnvJsonContent,proto3" json:"custom_env_json_content,omitempty"` // can be generated on the VHD, also rename
+	RepoDepotEndpoint    string `protobuf:"bytes,3,opt,name=repo_depot_endpoint,json=repoDepotEndpoint,proto3" json:"repo_depot_endpoint,omitempty"`
+	TargetEnvironment    string `protobuf:"bytes,4,opt,name=target_environment,json=targetEnvironment,proto3" json:"target_environment,omitempty"`
+	CustomEnvJsonContent string `protobuf:"bytes,5,opt,name=custom_env_json_content,json=customEnvJsonContent,proto3" json:"custom_env_json_content,omitempty"`
 }
 
 func (x *CustomCloudConfig) Reset() {
@@ -67,23 +67,23 @@ func (*CustomCloudConfig) Descriptor() ([]byte, []int) {
 	return file_pkg_proto_nbcontract_v1_customcloudconfig_proto_rawDescGZIP(), []int{0}
 }
 
-func (x *CustomCloudConfig) GetStatus() FeatureState {
-	if x != nil && x.Status != nil {
-		return *x.Status
+func (x *CustomCloudConfig) GetIsAksCustomCloud() bool {
+	if x != nil {
+		return x.IsAksCustomCloud
 	}
-	return FeatureState_FEATURE_STATE_UNSPECIFIED
+	return false
 }
 
 func (x *CustomCloudConfig) GetInitFilePath() string {
-	if x != nil && x.InitFilePath != nil {
-		return *x.InitFilePath
+	if x != nil {
+		return x.InitFilePath
 	}
 	return ""
 }
 
 func (x *CustomCloudConfig) GetRepoDepotEndpoint() string {
-	if x != nil && x.RepoDepotEndpoint != nil {
-		return *x.RepoDepotEndpoint
+	if x != nil {
+		return x.RepoDepotEndpoint
 	}
 	return ""
 }
@@ -109,43 +109,35 @@ var file_pkg_proto_nbcontract_v1_customcloudconfig_proto_rawDesc = []byte{
 	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d,
 	0x63, 0x6c, 0x6f, 0x75, 0x64, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x12, 0x0d, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31,
-	0x1a, 0x2a, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f,
-	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72,
-	0x65, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc9, 0x02, 0x0a,
-	0x11, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x12, 0x38, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0e, 0x32, 0x1b, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e,
-	0x76, 0x31, 0x2e, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x48,
-	0x00, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x88, 0x01, 0x01, 0x12, 0x29, 0x0a, 0x0e,
-	0x69, 0x6e, 0x69, 0x74, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x0c, 0x69, 0x6e, 0x69, 0x74, 0x46, 0x69, 0x6c, 0x65,
-	0x50, 0x61, 0x74, 0x68, 0x88, 0x01, 0x01, 0x12, 0x33, 0x0a, 0x13, 0x72, 0x65, 0x70, 0x6f, 0x5f,
-	0x64, 0x65, 0x70, 0x6f, 0x74, 0x5f, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x11, 0x72, 0x65, 0x70, 0x6f, 0x44, 0x65, 0x70, 0x6f,
-	0x74, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x88, 0x01, 0x01, 0x12, 0x2d, 0x0a, 0x12,
-	0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65,
-	0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74,
-	0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x35, 0x0a, 0x17, 0x63,
-	0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x65, 0x6e, 0x76, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x63,
-	0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x14, 0x63, 0x75,
-	0x73, 0x74, 0x6f, 0x6d, 0x45, 0x6e, 0x76, 0x4a, 0x73, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65,
-	0x6e, 0x74, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x11, 0x0a,
-	0x0f, 0x5f, 0x69, 0x6e, 0x69, 0x74, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x70, 0x61, 0x74, 0x68,
-	0x42, 0x16, 0x0a, 0x14, 0x5f, 0x72, 0x65, 0x70, 0x6f, 0x5f, 0x64, 0x65, 0x70, 0x6f, 0x74, 0x5f,
-	0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x42, 0xc2, 0x01, 0x0a, 0x11, 0x63, 0x6f, 0x6d,
-	0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x42, 0x16,
-	0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
-	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x41, 0x7a, 0x75, 0x72, 0x65, 0x2f, 0x41, 0x67, 0x65, 0x6e, 0x74,
-	0x42, 0x61, 0x6b, 0x65, 0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f,
-	0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x6e, 0x62,
-	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x4e, 0x58, 0x58,
-	0xaa, 0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x56, 0x31,
-	0xca, 0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31,
-	0xe2, 0x02, 0x19, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31,
-	0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, 0x4e,
-	0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x22, 0xfe, 0x01, 0x0a, 0x11, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, 0x6c, 0x6f, 0x75, 0x64,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x2d, 0x0a, 0x13, 0x69, 0x73, 0x5f, 0x61, 0x6b, 0x73,
+	0x5f, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x10, 0x69, 0x73, 0x41, 0x6b, 0x73, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d,
+	0x43, 0x6c, 0x6f, 0x75, 0x64, 0x12, 0x24, 0x0a, 0x0e, 0x69, 0x6e, 0x69, 0x74, 0x5f, 0x66, 0x69,
+	0x6c, 0x65, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x69,
+	0x6e, 0x69, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x2e, 0x0a, 0x13, 0x72,
+	0x65, 0x70, 0x6f, 0x5f, 0x64, 0x65, 0x70, 0x6f, 0x74, 0x5f, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69,
+	0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x72, 0x65, 0x70, 0x6f, 0x44, 0x65,
+	0x70, 0x6f, 0x74, 0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x2d, 0x0a, 0x12, 0x74,
+	0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e,
+	0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x45,
+	0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x35, 0x0a, 0x17, 0x63, 0x75,
+	0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x65, 0x6e, 0x76, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x63, 0x6f,
+	0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x14, 0x63, 0x75, 0x73,
+	0x74, 0x6f, 0x6d, 0x45, 0x6e, 0x76, 0x4a, 0x73, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e,
+	0x74, 0x42, 0xc2, 0x01, 0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74,
+	0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x42, 0x16, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x63,
+	0x6c, 0x6f, 0x75, 0x64, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
+	0x01, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x41, 0x7a,
+	0x75, 0x72, 0x65, 0x2f, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x42, 0x61, 0x6b, 0x65, 0x72, 0x2f, 0x70,
+	0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72,
+	0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63,
+	0x74, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x4e, 0x58, 0x58, 0xaa, 0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f,
+	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f,
+	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x19, 0x4e, 0x62, 0x63, 0x6f,
+	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74,
+	0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61,
+	0x63, 0x74, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -163,15 +155,13 @@ func file_pkg_proto_nbcontract_v1_customcloudconfig_proto_rawDescGZIP() []byte {
 var file_pkg_proto_nbcontract_v1_customcloudconfig_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_pkg_proto_nbcontract_v1_customcloudconfig_proto_goTypes = []interface{}{
 	(*CustomCloudConfig)(nil), // 0: nbcontract.v1.CustomCloudConfig
-	(FeatureState)(0),         // 1: nbcontract.v1.FeatureState
 }
 var file_pkg_proto_nbcontract_v1_customcloudconfig_proto_depIdxs = []int32{
-	1, // 0: nbcontract.v1.CustomCloudConfig.status:type_name -> nbcontract.v1.FeatureState
-	1, // [1:1] is the sub-list for method output_type
-	1, // [1:1] is the sub-list for method input_type
-	1, // [1:1] is the sub-list for extension type_name
-	1, // [1:1] is the sub-list for extension extendee
-	0, // [0:1] is the sub-list for field type_name
+	0, // [0:0] is the sub-list for method output_type
+	0, // [0:0] is the sub-list for method input_type
+	0, // [0:0] is the sub-list for extension type_name
+	0, // [0:0] is the sub-list for extension extendee
+	0, // [0:0] is the sub-list for field type_name
 }
 
 func init() { file_pkg_proto_nbcontract_v1_customcloudconfig_proto_init() }
@@ -179,7 +169,6 @@ func file_pkg_proto_nbcontract_v1_customcloudconfig_proto_init() {
 	if File_pkg_proto_nbcontract_v1_customcloudconfig_proto != nil {
 		return
 	}
-	file_pkg_proto_nbcontract_v1_featurestate_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_pkg_proto_nbcontract_v1_customcloudconfig_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CustomCloudConfig); i {
@@ -194,7 +183,6 @@ func file_pkg_proto_nbcontract_v1_customcloudconfig_proto_init() {
 			}
 		}
 	}
-	file_pkg_proto_nbcontract_v1_customcloudconfig_proto_msgTypes[0].OneofWrappers = []interface{}{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
diff --git a/pkg/proto/nbcontract/v1/customcloudconfig.proto b/pkg/proto/nbcontract/v1/customcloudconfig.proto
index 176c967b405..57258710c00 100644
--- a/pkg/proto/nbcontract/v1/customcloudconfig.proto
+++ b/pkg/proto/nbcontract/v1/customcloudconfig.proto
@@ -1,18 +1,18 @@
 syntax = "proto3";
 package nbcontract.v1;
-import "pkg/proto/nbcontract/v1/featurestate.proto";
 
 message CustomCloudConfig {
 
-    // Status shows whether CustomCloudConfig is enabled or not
-    optional FeatureState status = 1;
+    // IsAKSCustomCloud is a flag to indicate if it is AKS custom cloud
+    bool is_aks_custom_cloud = 1;
 
     // InitFilePath is the path to the file that contains the init script
-    optional string init_file_path = 2;
+    string init_file_path = 2;
 
     // RepoDepotEndpoint is the endpoint of the repo depot
-    optional string repo_depot_endpoint = 3;
+    string repo_depot_endpoint = 3;
 
     string target_environment = 4;
-    string custom_env_json_content = 5; // can be generated on the VHD, also rename
+
+    string custom_env_json_content = 5;
 }
\ No newline at end of file
diff --git a/pkg/proto/nbcontract/v1/featurestate.pb.go b/pkg/proto/nbcontract/v1/featurestate.pb.go
deleted file mode 100644
index 87df1cd5cf2..00000000000
--- a/pkg/proto/nbcontract/v1/featurestate.pb.go
+++ /dev/null
@@ -1,147 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.33.0
-// 	protoc        (unknown)
-// source: pkg/proto/nbcontract/v1/featurestate.proto
-
-package nbcontractv1
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type FeatureState int32
-
-const (
-	FeatureState_FEATURE_STATE_UNSPECIFIED FeatureState = 0
-	FeatureState_FEATURE_STATE_ENABLED     FeatureState = 1
-	FeatureState_FEATURE_STATE_DISABLED    FeatureState = 2
-)
-
-// Enum value maps for FeatureState.
-var (
-	FeatureState_name = map[int32]string{
-		0: "FEATURE_STATE_UNSPECIFIED",
-		1: "FEATURE_STATE_ENABLED",
-		2: "FEATURE_STATE_DISABLED",
-	}
-	FeatureState_value = map[string]int32{
-		"FEATURE_STATE_UNSPECIFIED": 0,
-		"FEATURE_STATE_ENABLED":     1,
-		"FEATURE_STATE_DISABLED":    2,
-	}
-)
-
-func (x FeatureState) Enum() *FeatureState {
-	p := new(FeatureState)
-	*p = x
-	return p
-}
-
-func (x FeatureState) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (FeatureState) Descriptor() protoreflect.EnumDescriptor {
-	return file_pkg_proto_nbcontract_v1_featurestate_proto_enumTypes[0].Descriptor()
-}
-
-func (FeatureState) Type() protoreflect.EnumType {
-	return &file_pkg_proto_nbcontract_v1_featurestate_proto_enumTypes[0]
-}
-
-func (x FeatureState) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use FeatureState.Descriptor instead.
-func (FeatureState) EnumDescriptor() ([]byte, []int) {
-	return file_pkg_proto_nbcontract_v1_featurestate_proto_rawDescGZIP(), []int{0}
-}
-
-var File_pkg_proto_nbcontract_v1_featurestate_proto protoreflect.FileDescriptor
-
-var file_pkg_proto_nbcontract_v1_featurestate_proto_rawDesc = []byte{
-	0x0a, 0x2a, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f,
-	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72,
-	0x65, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0d, 0x6e, 0x62,
-	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2a, 0x64, 0x0a, 0x0c, 0x46,
-	0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1d, 0x0a, 0x19, 0x46,
-	0x45, 0x41, 0x54, 0x55, 0x52, 0x45, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x45, 0x5f, 0x55, 0x4e, 0x53,
-	0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x15, 0x46, 0x45,
-	0x41, 0x54, 0x55, 0x52, 0x45, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x45, 0x5f, 0x45, 0x4e, 0x41, 0x42,
-	0x4c, 0x45, 0x44, 0x10, 0x01, 0x12, 0x1a, 0x0a, 0x16, 0x46, 0x45, 0x41, 0x54, 0x55, 0x52, 0x45,
-	0x5f, 0x53, 0x54, 0x41, 0x54, 0x45, 0x5f, 0x44, 0x49, 0x53, 0x41, 0x42, 0x4c, 0x45, 0x44, 0x10,
-	0x02, 0x42, 0xbd, 0x01, 0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74,
-	0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x42, 0x11, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65,
-	0x73, 0x74, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x40, 0x67, 0x69,
-	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x41, 0x7a, 0x75, 0x72, 0x65, 0x2f, 0x41,
-	0x67, 0x65, 0x6e, 0x74, 0x42, 0x61, 0x6b, 0x65, 0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76,
-	0x31, 0x3b, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x76, 0x31, 0xa2, 0x02,
-	0x03, 0x4e, 0x58, 0x58, 0xaa, 0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63,
-	0x74, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63,
-	0x74, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x19, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63,
-	0x74, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
-	0xea, 0x02, 0x0e, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x3a, 0x3a, 0x56,
-	0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pkg_proto_nbcontract_v1_featurestate_proto_rawDescOnce sync.Once
-	file_pkg_proto_nbcontract_v1_featurestate_proto_rawDescData = file_pkg_proto_nbcontract_v1_featurestate_proto_rawDesc
-)
-
-func file_pkg_proto_nbcontract_v1_featurestate_proto_rawDescGZIP() []byte {
-	file_pkg_proto_nbcontract_v1_featurestate_proto_rawDescOnce.Do(func() {
-		file_pkg_proto_nbcontract_v1_featurestate_proto_rawDescData = protoimpl.X.CompressGZIP(file_pkg_proto_nbcontract_v1_featurestate_proto_rawDescData)
-	})
-	return file_pkg_proto_nbcontract_v1_featurestate_proto_rawDescData
-}
-
-var file_pkg_proto_nbcontract_v1_featurestate_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_pkg_proto_nbcontract_v1_featurestate_proto_goTypes = []interface{}{
-	(FeatureState)(0), // 0: nbcontract.v1.FeatureState
-}
-var file_pkg_proto_nbcontract_v1_featurestate_proto_depIdxs = []int32{
-	0, // [0:0] is the sub-list for method output_type
-	0, // [0:0] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_pkg_proto_nbcontract_v1_featurestate_proto_init() }
-func file_pkg_proto_nbcontract_v1_featurestate_proto_init() {
-	if File_pkg_proto_nbcontract_v1_featurestate_proto != nil {
-		return
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pkg_proto_nbcontract_v1_featurestate_proto_rawDesc,
-			NumEnums:      1,
-			NumMessages:   0,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pkg_proto_nbcontract_v1_featurestate_proto_goTypes,
-		DependencyIndexes: file_pkg_proto_nbcontract_v1_featurestate_proto_depIdxs,
-		EnumInfos:         file_pkg_proto_nbcontract_v1_featurestate_proto_enumTypes,
-	}.Build()
-	File_pkg_proto_nbcontract_v1_featurestate_proto = out.File
-	file_pkg_proto_nbcontract_v1_featurestate_proto_rawDesc = nil
-	file_pkg_proto_nbcontract_v1_featurestate_proto_goTypes = nil
-	file_pkg_proto_nbcontract_v1_featurestate_proto_depIdxs = nil
-}
diff --git a/pkg/proto/nbcontract/v1/featurestate.proto b/pkg/proto/nbcontract/v1/featurestate.proto
deleted file mode 100644
index a66767a3135..00000000000
--- a/pkg/proto/nbcontract/v1/featurestate.proto
+++ /dev/null
@@ -1,8 +0,0 @@
-syntax = "proto3";
-package nbcontract.v1;
-
-enum FeatureState {
-  FEATURE_STATE_UNSPECIFIED = 0;
-  FEATURE_STATE_ENABLED = 1;
-  FEATURE_STATE_DISABLED = 2;
-}
\ No newline at end of file
diff --git a/pkg/proto/nbcontract/v1/gpuconfig.pb.go b/pkg/proto/nbcontract/v1/gpuconfig.pb.go
index 31c0602e33f..3d8bea6cff9 100644
--- a/pkg/proto/nbcontract/v1/gpuconfig.pb.go
+++ b/pkg/proto/nbcontract/v1/gpuconfig.pb.go
@@ -92,32 +92,29 @@ var file_pkg_proto_nbcontract_v1_gpuconfig_proto_rawDesc = []byte{
 	0x0a, 0x27, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f,
 	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x70, 0x75, 0x63, 0x6f, 0x6e,
 	0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0d, 0x6e, 0x62, 0x63, 0x6f, 0x6e,
-	0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x1a, 0x2a, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76,
-	0x31, 0x2f, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x22, 0x95, 0x01, 0x0a, 0x09, 0x47, 0x50, 0x55, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x12, 0x2a, 0x0a, 0x11, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x67, 0x70, 0x75,
-	0x5f, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x47, 0x70, 0x75, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x12, 0x2a,
-	0x0a, 0x11, 0x67, 0x70, 0x75, 0x5f, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x70, 0x6c, 0x75,
-	0x67, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x67, 0x70, 0x75, 0x44, 0x65,
-	0x76, 0x69, 0x63, 0x65, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x12, 0x30, 0x0a, 0x14, 0x67, 0x70,
-	0x75, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x66, 0x69,
-	0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x67, 0x70, 0x75, 0x49, 0x6e, 0x73,
-	0x74, 0x61, 0x6e, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x42, 0xba, 0x01, 0x0a,
-	0x11, 0x63, 0x6f, 0x6d, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e,
-	0x76, 0x31, 0x42, 0x0e, 0x47, 0x70, 0x75, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f,
-	0x74, 0x6f, 0x50, 0x01, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
-	0x2f, 0x41, 0x7a, 0x75, 0x72, 0x65, 0x2f, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x42, 0x61, 0x6b, 0x65,
-	0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f,
-	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74,
-	0x72, 0x61, 0x63, 0x74, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x4e, 0x58, 0x58, 0xaa, 0x02, 0x0d, 0x4e,
-	0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0d, 0x4e,
-	0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x19, 0x4e,
-	0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42,
-	0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, 0x4e, 0x62, 0x63, 0x6f, 0x6e,
-	0x74, 0x72, 0x61, 0x63, 0x74, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x22, 0x95, 0x01, 0x0a, 0x09, 0x47, 0x50, 0x55,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x2a, 0x0a, 0x11, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x5f, 0x67, 0x70, 0x75, 0x5f, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x0f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x47, 0x70, 0x75, 0x44, 0x72, 0x69, 0x76,
+	0x65, 0x72, 0x12, 0x2a, 0x0a, 0x11, 0x67, 0x70, 0x75, 0x5f, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65,
+	0x5f, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x67,
+	0x70, 0x75, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x12, 0x30,
+	0x0a, 0x14, 0x67, 0x70, 0x75, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x70,
+	0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x67, 0x70,
+	0x75, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65,
+	0x42, 0xba, 0x01, 0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72,
+	0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x42, 0x0e, 0x47, 0x70, 0x75, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
+	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x41, 0x7a, 0x75, 0x72, 0x65, 0x2f, 0x41, 0x67, 0x65, 0x6e, 0x74,
+	0x42, 0x61, 0x6b, 0x65, 0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f,
+	0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x6e, 0x62,
+	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x4e, 0x58, 0x58,
+	0xaa, 0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x56, 0x31,
+	0xca, 0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31,
+	0xe2, 0x02, 0x19, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31,
+	0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, 0x4e,
+	0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -149,7 +146,6 @@ func file_pkg_proto_nbcontract_v1_gpuconfig_proto_init() {
 	if File_pkg_proto_nbcontract_v1_gpuconfig_proto != nil {
 		return
 	}
-	file_pkg_proto_nbcontract_v1_featurestate_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_pkg_proto_nbcontract_v1_gpuconfig_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GPUConfig); i {
diff --git a/pkg/proto/nbcontract/v1/gpuconfig.proto b/pkg/proto/nbcontract/v1/gpuconfig.proto
index f7979e1d12b..e0456108171 100644
--- a/pkg/proto/nbcontract/v1/gpuconfig.proto
+++ b/pkg/proto/nbcontract/v1/gpuconfig.proto
@@ -1,8 +1,6 @@
 syntax = "proto3";
 package nbcontract.v1;
 
-import "pkg/proto/nbcontract/v1/featurestate.proto";
-
 message GPUConfig {
   // ConfigGpuDriver specifies whether bootstrap process should install and configure the GPU driver when necessary. Configuration includes appropriate set up of components like the fabric manager where applicable.
   bool config_gpu_driver = 1;
diff --git a/pkg/proto/nbcontract/v1/httpproxyconfig.pb.go b/pkg/proto/nbcontract/v1/httpproxyconfig.pb.go
index 419bef06f76..6230e1e4be1 100644
--- a/pkg/proto/nbcontract/v1/httpproxyconfig.pb.go
+++ b/pkg/proto/nbcontract/v1/httpproxyconfig.pb.go
@@ -101,33 +101,31 @@ var file_pkg_proto_nbcontract_v1_httpproxyconfig_proto_rawDesc = []byte{
 	0x0a, 0x2d, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f,
 	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x70, 0x72,
 	0x6f, 0x78, 0x79, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
-	0x0d, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x1a, 0x2a,
-	0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74,
-	0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73,
-	0x74, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa5, 0x01, 0x0a, 0x0f, 0x48,
-	0x54, 0x54, 0x50, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1d,
-	0x0a, 0x0a, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x09, 0x68, 0x74, 0x74, 0x70, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x12, 0x1f, 0x0a,
-	0x0b, 0x68, 0x74, 0x74, 0x70, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0a, 0x68, 0x74, 0x74, 0x70, 0x73, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x12, 0x28,
-	0x0a, 0x10, 0x6e, 0x6f, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x69,
-	0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x6e, 0x6f, 0x50, 0x72, 0x6f, 0x78,
-	0x79, 0x45, 0x6e, 0x74, 0x72, 0x69, 0x65, 0x73, 0x12, 0x28, 0x0a, 0x10, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x5f, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x63, 0x61, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0e, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x54, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64,
-	0x43, 0x61, 0x42, 0xc0, 0x01, 0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e,
-	0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x42, 0x14, 0x48, 0x74, 0x74, 0x70, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
-	0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x41, 0x7a, 0x75,
-	0x72, 0x65, 0x2f, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x42, 0x61, 0x6b, 0x65, 0x72, 0x2f, 0x70, 0x6b,
-	0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61,
-	0x63, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74,
-	0x76, 0x31, 0xa2, 0x02, 0x03, 0x4e, 0x58, 0x58, 0xaa, 0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e,
-	0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e,
-	0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x19, 0x4e, 0x62, 0x63, 0x6f, 0x6e,
-	0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61,
-	0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63,
-	0x74, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x0d, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x22, 0xa5,
+	0x01, 0x0a, 0x0f, 0x48, 0x54, 0x54, 0x50, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x12, 0x1d, 0x0a, 0x0a, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x74, 0x74, 0x70, 0x50, 0x72, 0x6f, 0x78,
+	0x79, 0x12, 0x1f, 0x0a, 0x0b, 0x68, 0x74, 0x74, 0x70, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x68, 0x74, 0x74, 0x70, 0x73, 0x50, 0x72, 0x6f,
+	0x78, 0x79, 0x12, 0x28, 0x0a, 0x10, 0x6e, 0x6f, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x65,
+	0x6e, 0x74, 0x72, 0x69, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x6e, 0x6f,
+	0x50, 0x72, 0x6f, 0x78, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x69, 0x65, 0x73, 0x12, 0x28, 0x0a, 0x10,
+	0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x74, 0x72, 0x75, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x63, 0x61,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x54, 0x72, 0x75,
+	0x73, 0x74, 0x65, 0x64, 0x43, 0x61, 0x42, 0xc0, 0x01, 0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x2e, 0x6e,
+	0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x42, 0x14, 0x48, 0x74,
+	0x74, 0x70, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f,
+	0x74, 0x6f, 0x50, 0x01, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
+	0x2f, 0x41, 0x7a, 0x75, 0x72, 0x65, 0x2f, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x42, 0x61, 0x6b, 0x65,
+	0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f,
+	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74,
+	0x72, 0x61, 0x63, 0x74, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x4e, 0x58, 0x58, 0xaa, 0x02, 0x0d, 0x4e,
+	0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0d, 0x4e,
+	0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x19, 0x4e,
+	0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42,
+	0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, 0x4e, 0x62, 0x63, 0x6f, 0x6e,
+	0x74, 0x72, 0x61, 0x63, 0x74, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (
@@ -159,7 +157,6 @@ func file_pkg_proto_nbcontract_v1_httpproxyconfig_proto_init() {
 	if File_pkg_proto_nbcontract_v1_httpproxyconfig_proto != nil {
 		return
 	}
-	file_pkg_proto_nbcontract_v1_featurestate_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_pkg_proto_nbcontract_v1_httpproxyconfig_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HTTPProxyConfig); i {
diff --git a/pkg/proto/nbcontract/v1/httpproxyconfig.proto b/pkg/proto/nbcontract/v1/httpproxyconfig.proto
index 4de311c7839..8988b610b0d 100644
--- a/pkg/proto/nbcontract/v1/httpproxyconfig.proto
+++ b/pkg/proto/nbcontract/v1/httpproxyconfig.proto
@@ -1,6 +1,5 @@
 syntax = "proto3";
 package nbcontract.v1;
-import "pkg/proto/nbcontract/v1/featurestate.proto";
 
 message HTTPProxyConfig {
   // HTTPProxy represents the proxy endpoint/URL using HTTP, that the traffic should go through for making HTTP connections outside the cluster
diff --git a/pkg/proto/nbcontract/v1/kubeletconfig.pb.go b/pkg/proto/nbcontract/v1/kubeletconfig.pb.go
index 5b708102249..fdc9add27ee 100644
--- a/pkg/proto/nbcontract/v1/kubeletconfig.pb.go
+++ b/pkg/proto/nbcontract/v1/kubeletconfig.pb.go
@@ -20,52 +20,52 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-type KubeletDiskType int32
+type KubeletDisk int32
 
 const (
-	KubeletDiskType_KUBELET_DISK_TYPE_UNSPECIFIED KubeletDiskType = 0
-	KubeletDiskType_KUBELET_DISK_TYPE_OS_DISK     KubeletDiskType = 1
-	KubeletDiskType_KUBELET_DISK_TYPE_TEMP_DISK   KubeletDiskType = 2
+	KubeletDisk_KD_UNSPECIFIED KubeletDisk = 0
+	KubeletDisk_OS_DISK        KubeletDisk = 1
+	KubeletDisk_TEMP_DISK      KubeletDisk = 2
 )
 
-// Enum value maps for KubeletDiskType.
+// Enum value maps for KubeletDisk.
 var (
-	KubeletDiskType_name = map[int32]string{
-		0: "KUBELET_DISK_TYPE_UNSPECIFIED",
-		1: "KUBELET_DISK_TYPE_OS_DISK",
-		2: "KUBELET_DISK_TYPE_TEMP_DISK",
+	KubeletDisk_name = map[int32]string{
+		0: "KD_UNSPECIFIED",
+		1: "OS_DISK",
+		2: "TEMP_DISK",
 	}
-	KubeletDiskType_value = map[string]int32{
-		"KUBELET_DISK_TYPE_UNSPECIFIED": 0,
-		"KUBELET_DISK_TYPE_OS_DISK":     1,
-		"KUBELET_DISK_TYPE_TEMP_DISK":   2,
+	KubeletDisk_value = map[string]int32{
+		"KD_UNSPECIFIED": 0,
+		"OS_DISK":        1,
+		"TEMP_DISK":      2,
 	}
 )
 
-func (x KubeletDiskType) Enum() *KubeletDiskType {
-	p := new(KubeletDiskType)
+func (x KubeletDisk) Enum() *KubeletDisk {
+	p := new(KubeletDisk)
 	*p = x
 	return p
 }
 
-func (x KubeletDiskType) String() string {
+func (x KubeletDisk) String() string {
 	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
 }
 
-func (KubeletDiskType) Descriptor() protoreflect.EnumDescriptor {
+func (KubeletDisk) Descriptor() protoreflect.EnumDescriptor {
 	return file_pkg_proto_nbcontract_v1_kubeletconfig_proto_enumTypes[0].Descriptor()
 }
 
-func (KubeletDiskType) Type() protoreflect.EnumType {
+func (KubeletDisk) Type() protoreflect.EnumType {
 	return &file_pkg_proto_nbcontract_v1_kubeletconfig_proto_enumTypes[0]
 }
 
-func (x KubeletDiskType) Number() protoreflect.EnumNumber {
+func (x KubeletDisk) Number() protoreflect.EnumNumber {
 	return protoreflect.EnumNumber(x)
 }
 
-// Deprecated: Use KubeletDiskType.Descriptor instead.
-func (KubeletDiskType) EnumDescriptor() ([]byte, []int) {
+// Deprecated: Use KubeletDisk.Descriptor instead.
+func (KubeletDisk) EnumDescriptor() ([]byte, []int) {
 	return file_pkg_proto_nbcontract_v1_kubeletconfig_proto_rawDescGZIP(), []int{0}
 }
 
@@ -79,7 +79,7 @@ type KubeletConfig struct {
 	KubeletNodeLabels map[string]string `protobuf:"bytes,2,rep,name=kubelet_node_labels,json=kubeletNodeLabels,proto3" json:"kubelet_node_labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	Taints            []*Taint          `protobuf:"bytes,3,rep,name=taints,proto3" json:"taints,omitempty"`
 	StartupTaints     []*Taint          `protobuf:"bytes,4,rep,name=startup_taints,json=startupTaints,proto3" json:"startup_taints,omitempty"`
-	KubeletDiskType   KubeletDiskType   `protobuf:"varint,5,opt,name=kubelet_disk_type,json=kubeletDiskType,proto3,enum=nbcontract.v1.KubeletDiskType" json:"kubelet_disk_type,omitempty"`
+	KubeletDiskType   KubeletDisk       `protobuf:"varint,5,opt,name=kubelet_disk_type,json=kubeletDiskType,proto3,enum=nbcontract.v1.KubeletDisk" json:"kubelet_disk_type,omitempty"`
 	// kubelet_config_file_content is the content of the kubelet config file.
 	KubeletConfigFileContent string `protobuf:"bytes,6,opt,name=kubelet_config_file_content,json=kubeletConfigFileContent,proto3" json:"kubelet_config_file_content,omitempty"`
 	KubeletClientKey         string `protobuf:"bytes,7,opt,name=kubelet_client_key,json=kubeletClientKey,proto3" json:"kubelet_client_key,omitempty"`
@@ -146,11 +146,11 @@ func (x *KubeletConfig) GetStartupTaints() []*Taint {
 	return nil
 }
 
-func (x *KubeletConfig) GetKubeletDiskType() KubeletDiskType {
+func (x *KubeletConfig) GetKubeletDiskType() KubeletDisk {
 	if x != nil {
 		return x.KubeletDiskType
 	}
-	return KubeletDiskType_KUBELET_DISK_TYPE_UNSPECIFIED
+	return KubeletDisk_KD_UNSPECIFIED
 }
 
 func (x *KubeletConfig) GetKubeletConfigFileContent() string {
@@ -235,33 +235,30 @@ var file_pkg_proto_nbcontract_v1_kubeletconfig_proto_rawDesc = []byte{
 	0x0a, 0x2b, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f,
 	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65,
 	0x74, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0d, 0x6e,
-	0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x1a, 0x2a, 0x70, 0x6b,
-	0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61,
-	0x63, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x74, 0x61,
-	0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xb3, 0x05, 0x0a, 0x0d, 0x4b, 0x75, 0x62,
-	0x65, 0x6c, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x53, 0x0a, 0x0d, 0x6b, 0x75,
-	0x62, 0x65, 0x6c, 0x65, 0x74, 0x5f, 0x66, 0x6c, 0x61, 0x67, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x2e, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76,
-	0x31, 0x2e, 0x4b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x4b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x46, 0x6c, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x52, 0x0c, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x46, 0x6c, 0x61, 0x67, 0x73, 0x12,
-	0x63, 0x0a, 0x13, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x5f, 0x6e, 0x6f, 0x64, 0x65, 0x5f,
-	0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x6e,
-	0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4b, 0x75, 0x62,
-	0x65, 0x6c, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x4b, 0x75, 0x62, 0x65, 0x6c,
-	0x65, 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x52, 0x11, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x4c, 0x61,
-	0x62, 0x65, 0x6c, 0x73, 0x12, 0x2c, 0x0a, 0x06, 0x74, 0x61, 0x69, 0x6e, 0x74, 0x73, 0x18, 0x03,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63,
-	0x74, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x61, 0x69, 0x6e, 0x74, 0x52, 0x06, 0x74, 0x61, 0x69, 0x6e,
-	0x74, 0x73, 0x12, 0x3b, 0x0a, 0x0e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x75, 0x70, 0x5f, 0x74, 0x61,
-	0x69, 0x6e, 0x74, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6e, 0x62, 0x63,
-	0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x61, 0x69, 0x6e, 0x74,
-	0x52, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x75, 0x70, 0x54, 0x61, 0x69, 0x6e, 0x74, 0x73, 0x12,
-	0x4a, 0x0a, 0x11, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x5f, 0x64, 0x69, 0x73, 0x6b, 0x5f,
-	0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x6e, 0x62, 0x63,
-	0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4b, 0x75, 0x62, 0x65, 0x6c,
-	0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0f, 0x6b, 0x75, 0x62, 0x65,
+	0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x22, 0xaf, 0x05, 0x0a,
+	0x0d, 0x4b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x53,
+	0x0a, 0x0d, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x5f, 0x66, 0x6c, 0x61, 0x67, 0x73, 0x18,
+	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61,
+	0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x43, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x2e, 0x4b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x46, 0x6c, 0x61, 0x67, 0x73,
+	0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x46, 0x6c,
+	0x61, 0x67, 0x73, 0x12, 0x63, 0x0a, 0x13, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x5f, 0x6e,
+	0x6f, 0x64, 0x65, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x33, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31,
+	0x2e, 0x4b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x4b,
+	0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73,
+	0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x11, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x4e, 0x6f,
+	0x64, 0x65, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x12, 0x2c, 0x0a, 0x06, 0x74, 0x61, 0x69, 0x6e,
+	0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e,
+	0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x61, 0x69, 0x6e, 0x74, 0x52, 0x06,
+	0x74, 0x61, 0x69, 0x6e, 0x74, 0x73, 0x12, 0x3b, 0x0a, 0x0e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x75,
+	0x70, 0x5f, 0x74, 0x61, 0x69, 0x6e, 0x74, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14,
+	0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x54,
+	0x61, 0x69, 0x6e, 0x74, 0x52, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x75, 0x70, 0x54, 0x61, 0x69,
+	0x6e, 0x74, 0x73, 0x12, 0x46, 0x0a, 0x11, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x5f, 0x64,
+	0x69, 0x73, 0x6b, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1a,
+	0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4b,
+	0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x52, 0x0f, 0x6b, 0x75, 0x62, 0x65,
 	0x6c, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x3d, 0x0a, 0x1b, 0x6b,
 	0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x66, 0x69,
 	0x6c, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09,
@@ -285,26 +282,23 @@ var file_pkg_proto_nbcontract_v1_kubeletconfig_proto_rawDesc = []byte{
 	0x0a, 0x05, 0x54, 0x61, 0x69, 0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x66, 0x66,
 	0x65, 0x63, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x66, 0x66, 0x65, 0x63,
-	0x74, 0x2a, 0x74, 0x0a, 0x0f, 0x4b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b,
-	0x54, 0x79, 0x70, 0x65, 0x12, 0x21, 0x0a, 0x1d, 0x4b, 0x55, 0x42, 0x45, 0x4c, 0x45, 0x54, 0x5f,
-	0x44, 0x49, 0x53, 0x4b, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43,
-	0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1d, 0x0a, 0x19, 0x4b, 0x55, 0x42, 0x45, 0x4c,
-	0x45, 0x54, 0x5f, 0x44, 0x49, 0x53, 0x4b, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4f, 0x53, 0x5f,
-	0x44, 0x49, 0x53, 0x4b, 0x10, 0x01, 0x12, 0x1f, 0x0a, 0x1b, 0x4b, 0x55, 0x42, 0x45, 0x4c, 0x45,
-	0x54, 0x5f, 0x44, 0x49, 0x53, 0x4b, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x54, 0x45, 0x4d, 0x50,
-	0x5f, 0x44, 0x49, 0x53, 0x4b, 0x10, 0x02, 0x42, 0xbe, 0x01, 0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x2e,
-	0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x42, 0x12, 0x4b,
-	0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x50, 0x01, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x41, 0x7a, 0x75, 0x72, 0x65, 0x2f, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x42, 0x61, 0x6b, 0x65, 0x72,
-	0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e,
-	0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72,
-	0x61, 0x63, 0x74, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x4e, 0x58, 0x58, 0xaa, 0x02, 0x0d, 0x4e, 0x62,
-	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0d, 0x4e, 0x62,
-	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x19, 0x4e, 0x62,
-	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d,
-	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74,
-	0x72, 0x61, 0x63, 0x74, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x74, 0x2a, 0x3d, 0x0a, 0x0b, 0x4b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b,
+	0x12, 0x12, 0x0a, 0x0e, 0x4b, 0x44, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49,
+	0x45, 0x44, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x4f, 0x53, 0x5f, 0x44, 0x49, 0x53, 0x4b, 0x10,
+	0x01, 0x12, 0x0d, 0x0a, 0x09, 0x54, 0x45, 0x4d, 0x50, 0x5f, 0x44, 0x49, 0x53, 0x4b, 0x10, 0x02,
+	0x42, 0xbe, 0x01, 0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72,
+	0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x42, 0x12, 0x4b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x40, 0x67, 0x69,
+	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x41, 0x7a, 0x75, 0x72, 0x65, 0x2f, 0x41,
+	0x67, 0x65, 0x6e, 0x74, 0x42, 0x61, 0x6b, 0x65, 0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76,
+	0x31, 0x3b, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x76, 0x31, 0xa2, 0x02,
+	0x03, 0x4e, 0x58, 0x58, 0xaa, 0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63,
+	0x74, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63,
+	0x74, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x19, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63,
+	0x74, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
+	0xea, 0x02, 0x0e, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x3a, 0x3a, 0x56,
+	0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -322,7 +316,7 @@ func file_pkg_proto_nbcontract_v1_kubeletconfig_proto_rawDescGZIP() []byte {
 var file_pkg_proto_nbcontract_v1_kubeletconfig_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
 var file_pkg_proto_nbcontract_v1_kubeletconfig_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
 var file_pkg_proto_nbcontract_v1_kubeletconfig_proto_goTypes = []interface{}{
-	(KubeletDiskType)(0),  // 0: nbcontract.v1.KubeletDiskType
+	(KubeletDisk)(0),      // 0: nbcontract.v1.KubeletDisk
 	(*KubeletConfig)(nil), // 1: nbcontract.v1.KubeletConfig
 	(*Taint)(nil),         // 2: nbcontract.v1.Taint
 	nil,                   // 3: nbcontract.v1.KubeletConfig.KubeletFlagsEntry
@@ -333,7 +327,7 @@ var file_pkg_proto_nbcontract_v1_kubeletconfig_proto_depIdxs = []int32{
 	4, // 1: nbcontract.v1.KubeletConfig.kubelet_node_labels:type_name -> nbcontract.v1.KubeletConfig.KubeletNodeLabelsEntry
 	2, // 2: nbcontract.v1.KubeletConfig.taints:type_name -> nbcontract.v1.Taint
 	2, // 3: nbcontract.v1.KubeletConfig.startup_taints:type_name -> nbcontract.v1.Taint
-	0, // 4: nbcontract.v1.KubeletConfig.kubelet_disk_type:type_name -> nbcontract.v1.KubeletDiskType
+	0, // 4: nbcontract.v1.KubeletConfig.kubelet_disk_type:type_name -> nbcontract.v1.KubeletDisk
 	5, // [5:5] is the sub-list for method output_type
 	5, // [5:5] is the sub-list for method input_type
 	5, // [5:5] is the sub-list for extension type_name
@@ -346,7 +340,6 @@ func file_pkg_proto_nbcontract_v1_kubeletconfig_proto_init() {
 	if File_pkg_proto_nbcontract_v1_kubeletconfig_proto != nil {
 		return
 	}
-	file_pkg_proto_nbcontract_v1_featurestate_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_pkg_proto_nbcontract_v1_kubeletconfig_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*KubeletConfig); i {
diff --git a/pkg/proto/nbcontract/v1/kubeletconfig.proto b/pkg/proto/nbcontract/v1/kubeletconfig.proto
index 1a0bdaa4610..d4ab0619922 100644
--- a/pkg/proto/nbcontract/v1/kubeletconfig.proto
+++ b/pkg/proto/nbcontract/v1/kubeletconfig.proto
@@ -1,6 +1,5 @@
 syntax = "proto3";
 package nbcontract.v1;
-import "pkg/proto/nbcontract/v1/featurestate.proto";
 
 message KubeletConfig {
   // TODO(ace): remove these/make api defensible
@@ -8,7 +7,7 @@ message KubeletConfig {
   map<string, string> kubelet_node_labels = 2;
   repeated Taint taints = 3;
   repeated Taint startup_taints = 4;
-  KubeletDiskType kubelet_disk_type = 5;
+  KubeletDisk kubelet_disk_type = 5;
 
   // kubelet_config_file_content is the content of the kubelet config file.
   string kubelet_config_file_content = 6;
@@ -21,8 +20,8 @@ message Taint {
   string effect = 2;
 }
 
-enum KubeletDiskType {
-  KUBELET_DISK_TYPE_UNSPECIFIED = 0;
-  KUBELET_DISK_TYPE_OS_DISK = 1;
-  KUBELET_DISK_TYPE_TEMP_DISK = 2;
+enum KubeletDisk {
+  KD_UNSPECIFIED = 0;
+  OS_DISK = 1;
+  TEMP_DISK = 2;
 }
\ No newline at end of file
diff --git a/pkg/proto/nbcontract/v1/networkconfig.pb.go b/pkg/proto/nbcontract/v1/networkconfig.pb.go
index 3448cdd37ab..a4d898ef217 100644
--- a/pkg/proto/nbcontract/v1/networkconfig.pb.go
+++ b/pkg/proto/nbcontract/v1/networkconfig.pb.go
@@ -20,169 +20,123 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-type NetworkModeType int32
+type NetworkPlugin int32
 
 const (
-	NetworkModeType_NETWORK_MODE_UNSPECIFIED NetworkModeType = 0
-	NetworkModeType_NETWORK_MODE_BRIDGE      NetworkModeType = 1
-	NetworkModeType_NETWORK_MODE_TRANSPARENT NetworkModeType = 2
+	NetworkPlugin_NP_UNSPECIFIED NetworkPlugin = 0
+	NetworkPlugin_NP_NONE        NetworkPlugin = 1
+	NetworkPlugin_NP_AZURE       NetworkPlugin = 2
+	NetworkPlugin_NP_KUBENET     NetworkPlugin = 3
 )
 
-// Enum value maps for NetworkModeType.
+// Enum value maps for NetworkPlugin.
 var (
-	NetworkModeType_name = map[int32]string{
-		0: "NETWORK_MODE_UNSPECIFIED",
-		1: "NETWORK_MODE_BRIDGE",
-		2: "NETWORK_MODE_TRANSPARENT",
+	NetworkPlugin_name = map[int32]string{
+		0: "NP_UNSPECIFIED",
+		1: "NP_NONE",
+		2: "NP_AZURE",
+		3: "NP_KUBENET",
 	}
-	NetworkModeType_value = map[string]int32{
-		"NETWORK_MODE_UNSPECIFIED": 0,
-		"NETWORK_MODE_BRIDGE":      1,
-		"NETWORK_MODE_TRANSPARENT": 2,
+	NetworkPlugin_value = map[string]int32{
+		"NP_UNSPECIFIED": 0,
+		"NP_NONE":        1,
+		"NP_AZURE":       2,
+		"NP_KUBENET":     3,
 	}
 )
 
-func (x NetworkModeType) Enum() *NetworkModeType {
-	p := new(NetworkModeType)
+func (x NetworkPlugin) Enum() *NetworkPlugin {
+	p := new(NetworkPlugin)
 	*p = x
 	return p
 }
 
-func (x NetworkModeType) String() string {
+func (x NetworkPlugin) String() string {
 	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
 }
 
-func (NetworkModeType) Descriptor() protoreflect.EnumDescriptor {
+func (NetworkPlugin) Descriptor() protoreflect.EnumDescriptor {
 	return file_pkg_proto_nbcontract_v1_networkconfig_proto_enumTypes[0].Descriptor()
 }
 
-func (NetworkModeType) Type() protoreflect.EnumType {
+func (NetworkPlugin) Type() protoreflect.EnumType {
 	return &file_pkg_proto_nbcontract_v1_networkconfig_proto_enumTypes[0]
 }
 
-func (x NetworkModeType) Number() protoreflect.EnumNumber {
+func (x NetworkPlugin) Number() protoreflect.EnumNumber {
 	return protoreflect.EnumNumber(x)
 }
 
-// Deprecated: Use NetworkModeType.Descriptor instead.
-func (NetworkModeType) EnumDescriptor() ([]byte, []int) {
+// Deprecated: Use NetworkPlugin.Descriptor instead.
+func (NetworkPlugin) EnumDescriptor() ([]byte, []int) {
 	return file_pkg_proto_nbcontract_v1_networkconfig_proto_rawDescGZIP(), []int{0}
 }
 
-type NetworkPluginType int32
+type NetworkPolicy int32
 
 const (
-	NetworkPluginType_NETWORK_PLUGIN_TYPE_UNSPECIFIED NetworkPluginType = 0
-	NetworkPluginType_NETWORK_PLUGIN_TYPE_NONE        NetworkPluginType = 1
-	NetworkPluginType_NETWORK_PLUGIN_TYPE_AZURE       NetworkPluginType = 2
-	NetworkPluginType_NETWORK_PLUGIN_TYPE_KUBENET     NetworkPluginType = 3
+	NetworkPolicy_NPO_UNSPECIFIED NetworkPolicy = 0
+	NetworkPolicy_NPO_NONE        NetworkPolicy = 1
+	NetworkPolicy_NPO_AZURE       NetworkPolicy = 2
+	NetworkPolicy_NPO_CALICO      NetworkPolicy = 3
 )
 
-// Enum value maps for NetworkPluginType.
+// Enum value maps for NetworkPolicy.
 var (
-	NetworkPluginType_name = map[int32]string{
-		0: "NETWORK_PLUGIN_TYPE_UNSPECIFIED",
-		1: "NETWORK_PLUGIN_TYPE_NONE",
-		2: "NETWORK_PLUGIN_TYPE_AZURE",
-		3: "NETWORK_PLUGIN_TYPE_KUBENET",
+	NetworkPolicy_name = map[int32]string{
+		0: "NPO_UNSPECIFIED",
+		1: "NPO_NONE",
+		2: "NPO_AZURE",
+		3: "NPO_CALICO",
 	}
-	NetworkPluginType_value = map[string]int32{
-		"NETWORK_PLUGIN_TYPE_UNSPECIFIED": 0,
-		"NETWORK_PLUGIN_TYPE_NONE":        1,
-		"NETWORK_PLUGIN_TYPE_AZURE":       2,
-		"NETWORK_PLUGIN_TYPE_KUBENET":     3,
+	NetworkPolicy_value = map[string]int32{
+		"NPO_UNSPECIFIED": 0,
+		"NPO_NONE":        1,
+		"NPO_AZURE":       2,
+		"NPO_CALICO":      3,
 	}
 )
 
-func (x NetworkPluginType) Enum() *NetworkPluginType {
-	p := new(NetworkPluginType)
+func (x NetworkPolicy) Enum() *NetworkPolicy {
+	p := new(NetworkPolicy)
 	*p = x
 	return p
 }
 
-func (x NetworkPluginType) String() string {
+func (x NetworkPolicy) String() string {
 	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
 }
 
-func (NetworkPluginType) Descriptor() protoreflect.EnumDescriptor {
+func (NetworkPolicy) Descriptor() protoreflect.EnumDescriptor {
 	return file_pkg_proto_nbcontract_v1_networkconfig_proto_enumTypes[1].Descriptor()
 }
 
-func (NetworkPluginType) Type() protoreflect.EnumType {
+func (NetworkPolicy) Type() protoreflect.EnumType {
 	return &file_pkg_proto_nbcontract_v1_networkconfig_proto_enumTypes[1]
 }
 
-func (x NetworkPluginType) Number() protoreflect.EnumNumber {
+func (x NetworkPolicy) Number() protoreflect.EnumNumber {
 	return protoreflect.EnumNumber(x)
 }
 
-// Deprecated: Use NetworkPluginType.Descriptor instead.
-func (NetworkPluginType) EnumDescriptor() ([]byte, []int) {
+// Deprecated: Use NetworkPolicy.Descriptor instead.
+func (NetworkPolicy) EnumDescriptor() ([]byte, []int) {
 	return file_pkg_proto_nbcontract_v1_networkconfig_proto_rawDescGZIP(), []int{1}
 }
 
-type NetworkPolicyType int32
-
-const (
-	NetworkPolicyType_NETWORK_POLICY_TYPE_UNSPECIFIED NetworkPolicyType = 0
-	NetworkPolicyType_NETWORK_POLICY_TYPE_NONE        NetworkPolicyType = 1
-	NetworkPolicyType_NETWORK_POLICY_TYPE_AZURE       NetworkPolicyType = 2
-	NetworkPolicyType_NETWORK_POLICY_TYPE_CALICO      NetworkPolicyType = 3
-)
-
-// Enum value maps for NetworkPolicyType.
-var (
-	NetworkPolicyType_name = map[int32]string{
-		0: "NETWORK_POLICY_TYPE_UNSPECIFIED",
-		1: "NETWORK_POLICY_TYPE_NONE",
-		2: "NETWORK_POLICY_TYPE_AZURE",
-		3: "NETWORK_POLICY_TYPE_CALICO",
-	}
-	NetworkPolicyType_value = map[string]int32{
-		"NETWORK_POLICY_TYPE_UNSPECIFIED": 0,
-		"NETWORK_POLICY_TYPE_NONE":        1,
-		"NETWORK_POLICY_TYPE_AZURE":       2,
-		"NETWORK_POLICY_TYPE_CALICO":      3,
-	}
-)
-
-func (x NetworkPolicyType) Enum() *NetworkPolicyType {
-	p := new(NetworkPolicyType)
-	*p = x
-	return p
-}
-
-func (x NetworkPolicyType) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (NetworkPolicyType) Descriptor() protoreflect.EnumDescriptor {
-	return file_pkg_proto_nbcontract_v1_networkconfig_proto_enumTypes[2].Descriptor()
-}
-
-func (NetworkPolicyType) Type() protoreflect.EnumType {
-	return &file_pkg_proto_nbcontract_v1_networkconfig_proto_enumTypes[2]
-}
-
-func (x NetworkPolicyType) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use NetworkPolicyType.Descriptor instead.
-func (NetworkPolicyType) EnumDescriptor() ([]byte, []int) {
-	return file_pkg_proto_nbcontract_v1_networkconfig_proto_rawDescGZIP(), []int{2}
-}
-
 type NetworkConfig struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	NetworkPlugin     NetworkPluginType `protobuf:"varint,1,opt,name=network_plugin,json=networkPlugin,proto3,enum=nbcontract.v1.NetworkPluginType" json:"network_plugin,omitempty"`
-	NetworkPolicy     NetworkPolicyType `protobuf:"varint,2,opt,name=network_policy,json=networkPolicy,proto3,enum=nbcontract.v1.NetworkPolicyType" json:"network_policy,omitempty"`
-	NetworkMode       NetworkModeType   `protobuf:"varint,3,opt,name=network_mode,json=networkMode,proto3,enum=nbcontract.v1.NetworkModeType" json:"network_mode,omitempty"`
-	VnetCniPluginsUrl string            `protobuf:"bytes,4,opt,name=vnet_cni_plugins_url,json=vnetCniPluginsUrl,proto3" json:"vnet_cni_plugins_url,omitempty"`
-	CniPluginsUrl     string            `protobuf:"bytes,5,opt,name=cni_plugins_url,json=cniPluginsUrl,proto3" json:"cni_plugins_url,omitempty"`
+	// NetworkPlugin is the network plugin to be used by the cluster. Options are NONE, AZURE, KUBENET.
+	NetworkPlugin NetworkPlugin `protobuf:"varint,1,opt,name=network_plugin,json=networkPlugin,proto3,enum=nbcontract.v1.NetworkPlugin" json:"network_plugin,omitempty"`
+	// NetworkPolicy is the network policy to be used by the cluster.
+	// This is still needed to compute ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE.
+	// Other than that, it is not used by others. See the discussions here https://github.com/Azure/AgentBaker/pull/4241#discussion_r1554283228
+	NetworkPolicy     NetworkPolicy `protobuf:"varint,2,opt,name=network_policy,json=networkPolicy,proto3,enum=nbcontract.v1.NetworkPolicy" json:"network_policy,omitempty"`
+	VnetCniPluginsUrl string        `protobuf:"bytes,3,opt,name=vnet_cni_plugins_url,json=vnetCniPluginsUrl,proto3" json:"vnet_cni_plugins_url,omitempty"`
+	CniPluginsUrl     string        `protobuf:"bytes,4,opt,name=cni_plugins_url,json=cniPluginsUrl,proto3" json:"cni_plugins_url,omitempty"`
 }
 
 func (x *NetworkConfig) Reset() {
@@ -217,25 +171,18 @@ func (*NetworkConfig) Descriptor() ([]byte, []int) {
 	return file_pkg_proto_nbcontract_v1_networkconfig_proto_rawDescGZIP(), []int{0}
 }
 
-func (x *NetworkConfig) GetNetworkPlugin() NetworkPluginType {
+func (x *NetworkConfig) GetNetworkPlugin() NetworkPlugin {
 	if x != nil {
 		return x.NetworkPlugin
 	}
-	return NetworkPluginType_NETWORK_PLUGIN_TYPE_UNSPECIFIED
+	return NetworkPlugin_NP_UNSPECIFIED
 }
 
-func (x *NetworkConfig) GetNetworkPolicy() NetworkPolicyType {
+func (x *NetworkConfig) GetNetworkPolicy() NetworkPolicy {
 	if x != nil {
 		return x.NetworkPolicy
 	}
-	return NetworkPolicyType_NETWORK_POLICY_TYPE_UNSPECIFIED
-}
-
-func (x *NetworkConfig) GetNetworkMode() NetworkModeType {
-	if x != nil {
-		return x.NetworkMode
-	}
-	return NetworkModeType_NETWORK_MODE_UNSPECIFIED
+	return NetworkPolicy_NPO_UNSPECIFIED
 }
 
 func (x *NetworkConfig) GetVnetCniPluginsUrl() string {
@@ -258,68 +205,45 @@ var file_pkg_proto_nbcontract_v1_networkconfig_proto_rawDesc = []byte{
 	0x0a, 0x2b, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f,
 	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72,
 	0x6b, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0d, 0x6e,
-	0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x1a, 0x2a, 0x70, 0x6b,
-	0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61,
-	0x63, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x74, 0x61,
-	0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xbd, 0x02, 0x0a, 0x0d, 0x4e, 0x65, 0x74,
-	0x77, 0x6f, 0x72, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x47, 0x0a, 0x0e, 0x6e, 0x65,
-	0x74, 0x77, 0x6f, 0x72, 0x6b, 0x5f, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0e, 0x32, 0x20, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e,
-	0x76, 0x31, 0x2e, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e,
-	0x54, 0x79, 0x70, 0x65, 0x52, 0x0d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x50, 0x6c, 0x75,
-	0x67, 0x69, 0x6e, 0x12, 0x47, 0x0a, 0x0e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x5f, 0x70,
-	0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x20, 0x2e, 0x6e, 0x62,
+	0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x22, 0xf2, 0x01, 0x0a,
+	0x0d, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x43,
+	0x0a, 0x0e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x5f, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1c, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72,
+	0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x50, 0x6c,
+	0x75, 0x67, 0x69, 0x6e, 0x52, 0x0d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x50, 0x6c, 0x75,
+	0x67, 0x69, 0x6e, 0x12, 0x43, 0x0a, 0x0e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x5f, 0x70,
+	0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1c, 0x2e, 0x6e, 0x62,
 	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4e, 0x65, 0x74, 0x77,
-	0x6f, 0x72, 0x6b, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0d, 0x6e,
-	0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x41, 0x0a, 0x0c,
-	0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e,
-	0x76, 0x31, 0x2e, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4d, 0x6f, 0x64, 0x65, 0x54, 0x79,
-	0x70, 0x65, 0x52, 0x0b, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4d, 0x6f, 0x64, 0x65, 0x12,
-	0x2f, 0x0a, 0x14, 0x76, 0x6e, 0x65, 0x74, 0x5f, 0x63, 0x6e, 0x69, 0x5f, 0x70, 0x6c, 0x75, 0x67,
-	0x69, 0x6e, 0x73, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x76,
-	0x6e, 0x65, 0x74, 0x43, 0x6e, 0x69, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x73, 0x55, 0x72, 0x6c,
-	0x12, 0x26, 0x0a, 0x0f, 0x63, 0x6e, 0x69, 0x5f, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x73, 0x5f,
-	0x75, 0x72, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x6e, 0x69, 0x50, 0x6c,
-	0x75, 0x67, 0x69, 0x6e, 0x73, 0x55, 0x72, 0x6c, 0x2a, 0x66, 0x0a, 0x0f, 0x4e, 0x65, 0x74, 0x77,
-	0x6f, 0x72, 0x6b, 0x4d, 0x6f, 0x64, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x18, 0x4e,
-	0x45, 0x54, 0x57, 0x4f, 0x52, 0x4b, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50,
-	0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x17, 0x0a, 0x13, 0x4e, 0x45, 0x54,
-	0x57, 0x4f, 0x52, 0x4b, 0x5f, 0x4d, 0x4f, 0x44, 0x45, 0x5f, 0x42, 0x52, 0x49, 0x44, 0x47, 0x45,
-	0x10, 0x01, 0x12, 0x1c, 0x0a, 0x18, 0x4e, 0x45, 0x54, 0x57, 0x4f, 0x52, 0x4b, 0x5f, 0x4d, 0x4f,
-	0x44, 0x45, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x50, 0x41, 0x52, 0x45, 0x4e, 0x54, 0x10, 0x02,
-	0x2a, 0x96, 0x01, 0x0a, 0x11, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x50, 0x6c, 0x75, 0x67,
-	0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x23, 0x0a, 0x1f, 0x4e, 0x45, 0x54, 0x57, 0x4f, 0x52,
-	0x4b, 0x5f, 0x50, 0x4c, 0x55, 0x47, 0x49, 0x4e, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e,
-	0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1c, 0x0a, 0x18, 0x4e,
-	0x45, 0x54, 0x57, 0x4f, 0x52, 0x4b, 0x5f, 0x50, 0x4c, 0x55, 0x47, 0x49, 0x4e, 0x5f, 0x54, 0x59,
-	0x50, 0x45, 0x5f, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x01, 0x12, 0x1d, 0x0a, 0x19, 0x4e, 0x45, 0x54,
-	0x57, 0x4f, 0x52, 0x4b, 0x5f, 0x50, 0x4c, 0x55, 0x47, 0x49, 0x4e, 0x5f, 0x54, 0x59, 0x50, 0x45,
-	0x5f, 0x41, 0x5a, 0x55, 0x52, 0x45, 0x10, 0x02, 0x12, 0x1f, 0x0a, 0x1b, 0x4e, 0x45, 0x54, 0x57,
-	0x4f, 0x52, 0x4b, 0x5f, 0x50, 0x4c, 0x55, 0x47, 0x49, 0x4e, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f,
-	0x4b, 0x55, 0x42, 0x45, 0x4e, 0x45, 0x54, 0x10, 0x03, 0x2a, 0x95, 0x01, 0x0a, 0x11, 0x4e, 0x65,
-	0x74, 0x77, 0x6f, 0x72, 0x6b, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12,
-	0x23, 0x0a, 0x1f, 0x4e, 0x45, 0x54, 0x57, 0x4f, 0x52, 0x4b, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43,
-	0x59, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49,
-	0x45, 0x44, 0x10, 0x00, 0x12, 0x1c, 0x0a, 0x18, 0x4e, 0x45, 0x54, 0x57, 0x4f, 0x52, 0x4b, 0x5f,
-	0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4e, 0x4f, 0x4e, 0x45,
-	0x10, 0x01, 0x12, 0x1d, 0x0a, 0x19, 0x4e, 0x45, 0x54, 0x57, 0x4f, 0x52, 0x4b, 0x5f, 0x50, 0x4f,
-	0x4c, 0x49, 0x43, 0x59, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x41, 0x5a, 0x55, 0x52, 0x45, 0x10,
-	0x02, 0x12, 0x1e, 0x0a, 0x1a, 0x4e, 0x45, 0x54, 0x57, 0x4f, 0x52, 0x4b, 0x5f, 0x50, 0x4f, 0x4c,
-	0x49, 0x43, 0x59, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x43, 0x41, 0x4c, 0x49, 0x43, 0x4f, 0x10,
-	0x03, 0x42, 0xbe, 0x01, 0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74,
-	0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x42, 0x12, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x40, 0x67,
-	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x41, 0x7a, 0x75, 0x72, 0x65, 0x2f,
-	0x41, 0x67, 0x65, 0x6e, 0x74, 0x42, 0x61, 0x6b, 0x65, 0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f,
-	0x76, 0x31, 0x3b, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x76, 0x31, 0xa2,
-	0x02, 0x03, 0x4e, 0x58, 0x58, 0xaa, 0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61,
-	0x63, 0x74, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61,
-	0x63, 0x74, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x19, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61,
-	0x63, 0x74, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74,
-	0x61, 0xea, 0x02, 0x0e, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x3a, 0x3a,
-	0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6f, 0x72, 0x6b, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x0d, 0x6e, 0x65, 0x74, 0x77, 0x6f,
+	0x72, 0x6b, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x2f, 0x0a, 0x14, 0x76, 0x6e, 0x65, 0x74,
+	0x5f, 0x63, 0x6e, 0x69, 0x5f, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x73, 0x5f, 0x75, 0x72, 0x6c,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x76, 0x6e, 0x65, 0x74, 0x43, 0x6e, 0x69, 0x50,
+	0x6c, 0x75, 0x67, 0x69, 0x6e, 0x73, 0x55, 0x72, 0x6c, 0x12, 0x26, 0x0a, 0x0f, 0x63, 0x6e, 0x69,
+	0x5f, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x73, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0d, 0x63, 0x6e, 0x69, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x73, 0x55, 0x72,
+	0x6c, 0x2a, 0x4e, 0x0a, 0x0d, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x50, 0x6c, 0x75, 0x67,
+	0x69, 0x6e, 0x12, 0x12, 0x0a, 0x0e, 0x4e, 0x50, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49,
+	0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x4e, 0x50, 0x5f, 0x4e, 0x4f, 0x4e,
+	0x45, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x4e, 0x50, 0x5f, 0x41, 0x5a, 0x55, 0x52, 0x45, 0x10,
+	0x02, 0x12, 0x0e, 0x0a, 0x0a, 0x4e, 0x50, 0x5f, 0x4b, 0x55, 0x42, 0x45, 0x4e, 0x45, 0x54, 0x10,
+	0x03, 0x2a, 0x51, 0x0a, 0x0d, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x50, 0x6f, 0x6c, 0x69,
+	0x63, 0x79, 0x12, 0x13, 0x0a, 0x0f, 0x4e, 0x50, 0x4f, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43,
+	0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x4e, 0x50, 0x4f, 0x5f, 0x4e,
+	0x4f, 0x4e, 0x45, 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09, 0x4e, 0x50, 0x4f, 0x5f, 0x41, 0x5a, 0x55,
+	0x52, 0x45, 0x10, 0x02, 0x12, 0x0e, 0x0a, 0x0a, 0x4e, 0x50, 0x4f, 0x5f, 0x43, 0x41, 0x4c, 0x49,
+	0x43, 0x4f, 0x10, 0x03, 0x42, 0xbe, 0x01, 0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x2e, 0x6e, 0x62, 0x63,
+	0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x42, 0x12, 0x4e, 0x65, 0x74, 0x77,
+	0x6f, 0x72, 0x6b, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
+	0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x41, 0x7a, 0x75,
+	0x72, 0x65, 0x2f, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x42, 0x61, 0x6b, 0x65, 0x72, 0x2f, 0x70, 0x6b,
+	0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61,
+	0x63, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74,
+	0x76, 0x31, 0xa2, 0x02, 0x03, 0x4e, 0x58, 0x58, 0xaa, 0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e,
+	0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e,
+	0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x19, 0x4e, 0x62, 0x63, 0x6f, 0x6e,
+	0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61,
+	0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63,
+	0x74, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -334,23 +258,21 @@ func file_pkg_proto_nbcontract_v1_networkconfig_proto_rawDescGZIP() []byte {
 	return file_pkg_proto_nbcontract_v1_networkconfig_proto_rawDescData
 }
 
-var file_pkg_proto_nbcontract_v1_networkconfig_proto_enumTypes = make([]protoimpl.EnumInfo, 3)
+var file_pkg_proto_nbcontract_v1_networkconfig_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
 var file_pkg_proto_nbcontract_v1_networkconfig_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_pkg_proto_nbcontract_v1_networkconfig_proto_goTypes = []interface{}{
-	(NetworkModeType)(0),   // 0: nbcontract.v1.NetworkModeType
-	(NetworkPluginType)(0), // 1: nbcontract.v1.NetworkPluginType
-	(NetworkPolicyType)(0), // 2: nbcontract.v1.NetworkPolicyType
-	(*NetworkConfig)(nil),  // 3: nbcontract.v1.NetworkConfig
+	(NetworkPlugin)(0),    // 0: nbcontract.v1.NetworkPlugin
+	(NetworkPolicy)(0),    // 1: nbcontract.v1.NetworkPolicy
+	(*NetworkConfig)(nil), // 2: nbcontract.v1.NetworkConfig
 }
 var file_pkg_proto_nbcontract_v1_networkconfig_proto_depIdxs = []int32{
-	1, // 0: nbcontract.v1.NetworkConfig.network_plugin:type_name -> nbcontract.v1.NetworkPluginType
-	2, // 1: nbcontract.v1.NetworkConfig.network_policy:type_name -> nbcontract.v1.NetworkPolicyType
-	0, // 2: nbcontract.v1.NetworkConfig.network_mode:type_name -> nbcontract.v1.NetworkModeType
-	3, // [3:3] is the sub-list for method output_type
-	3, // [3:3] is the sub-list for method input_type
-	3, // [3:3] is the sub-list for extension type_name
-	3, // [3:3] is the sub-list for extension extendee
-	0, // [0:3] is the sub-list for field type_name
+	0, // 0: nbcontract.v1.NetworkConfig.network_plugin:type_name -> nbcontract.v1.NetworkPlugin
+	1, // 1: nbcontract.v1.NetworkConfig.network_policy:type_name -> nbcontract.v1.NetworkPolicy
+	2, // [2:2] is the sub-list for method output_type
+	2, // [2:2] is the sub-list for method input_type
+	2, // [2:2] is the sub-list for extension type_name
+	2, // [2:2] is the sub-list for extension extendee
+	0, // [0:2] is the sub-list for field type_name
 }
 
 func init() { file_pkg_proto_nbcontract_v1_networkconfig_proto_init() }
@@ -358,7 +280,6 @@ func file_pkg_proto_nbcontract_v1_networkconfig_proto_init() {
 	if File_pkg_proto_nbcontract_v1_networkconfig_proto != nil {
 		return
 	}
-	file_pkg_proto_nbcontract_v1_featurestate_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_pkg_proto_nbcontract_v1_networkconfig_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*NetworkConfig); i {
@@ -378,7 +299,7 @@ func file_pkg_proto_nbcontract_v1_networkconfig_proto_init() {
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_pkg_proto_nbcontract_v1_networkconfig_proto_rawDesc,
-			NumEnums:      3,
+			NumEnums:      2,
 			NumMessages:   1,
 			NumExtensions: 0,
 			NumServices:   0,
diff --git a/pkg/proto/nbcontract/v1/networkconfig.proto b/pkg/proto/nbcontract/v1/networkconfig.proto
index aeae38213f5..5b0a5cac5b3 100644
--- a/pkg/proto/nbcontract/v1/networkconfig.proto
+++ b/pkg/proto/nbcontract/v1/networkconfig.proto
@@ -1,31 +1,30 @@
 syntax = "proto3";
 package nbcontract.v1;
-import "pkg/proto/nbcontract/v1/featurestate.proto";
 
 message NetworkConfig {
-  NetworkPluginType network_plugin = 1;
-  NetworkPolicyType network_policy = 2;
-  NetworkModeType network_mode = 3;
-  string vnet_cni_plugins_url = 4;
-  string cni_plugins_url = 5;
-}
 
-enum NetworkModeType {
-  NETWORK_MODE_UNSPECIFIED = 0;
-  NETWORK_MODE_BRIDGE = 1;
-  NETWORK_MODE_TRANSPARENT = 2;
+  // NetworkPlugin is the network plugin to be used by the cluster. Options are NONE, AZURE, KUBENET.
+  NetworkPlugin network_plugin = 1;
+
+  // NetworkPolicy is the network policy to be used by the cluster.
+  // This is still needed to compute ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE. 
+  // Other than that, it is not used by others. See the discussions here https://github.com/Azure/AgentBaker/pull/4241#discussion_r1554283228
+  NetworkPolicy network_policy = 2;
+
+  string vnet_cni_plugins_url = 3;
+  string cni_plugins_url = 4;
 }
 
-enum NetworkPluginType {
-  NETWORK_PLUGIN_TYPE_UNSPECIFIED = 0;
-  NETWORK_PLUGIN_TYPE_NONE = 1;
-  NETWORK_PLUGIN_TYPE_AZURE = 2;
-  NETWORK_PLUGIN_TYPE_KUBENET = 3;
+enum NetworkPlugin {
+  NP_UNSPECIFIED = 0;
+  NP_NONE = 1;
+  NP_AZURE = 2;
+  NP_KUBENET = 3;
 }
 
-enum NetworkPolicyType {
-  NETWORK_POLICY_TYPE_UNSPECIFIED = 0;
-  NETWORK_POLICY_TYPE_NONE = 1;
-  NETWORK_POLICY_TYPE_AZURE = 2;
-  NETWORK_POLICY_TYPE_CALICO = 3;
+enum NetworkPolicy {
+  NPO_UNSPECIFIED = 0;
+  NPO_NONE = 1;
+  NPO_AZURE = 2;
+  NPO_CALICO = 3;
 }
\ No newline at end of file
diff --git a/pkg/proto/nbcontract/v1/teleportconfig.pb.go b/pkg/proto/nbcontract/v1/teleportconfig.pb.go
index 2c6d7b658e9..8d4a6a2c332 100644
--- a/pkg/proto/nbcontract/v1/teleportconfig.pb.go
+++ b/pkg/proto/nbcontract/v1/teleportconfig.pb.go
@@ -81,29 +81,27 @@ var file_pkg_proto_nbcontract_v1_teleportconfig_proto_rawDesc = []byte{
 	0x0a, 0x2c, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f,
 	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x65, 0x6c, 0x65, 0x70, 0x6f,
 	0x72, 0x74, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0d,
-	0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x1a, 0x2a, 0x70,
-	0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72,
-	0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x74,
-	0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x6b, 0x0a, 0x0e, 0x54, 0x65, 0x6c,
-	0x65, 0x70, 0x6f, 0x72, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x16, 0x0a, 0x06, 0x73,
-	0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x73, 0x74, 0x61,
-	0x74, 0x75, 0x73, 0x12, 0x41, 0x0a, 0x1d, 0x74, 0x65, 0x6c, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x64,
-	0x5f, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64,
-	0x5f, 0x75, 0x72, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x1a, 0x74, 0x65, 0x6c, 0x65,
-	0x70, 0x6f, 0x72, 0x74, 0x64, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x44, 0x6f, 0x77, 0x6e, 0x6c,
-	0x6f, 0x61, 0x64, 0x55, 0x72, 0x6c, 0x42, 0xbf, 0x01, 0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x2e, 0x6e,
-	0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x42, 0x13, 0x54, 0x65,
-	0x6c, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x50, 0x01, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x41, 0x7a, 0x75, 0x72, 0x65, 0x2f, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x42, 0x61, 0x6b, 0x65, 0x72,
-	0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e,
-	0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72,
-	0x61, 0x63, 0x74, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x4e, 0x58, 0x58, 0xaa, 0x02, 0x0d, 0x4e, 0x62,
-	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0d, 0x4e, 0x62,
-	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x19, 0x4e, 0x62,
-	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d,
-	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74,
-	0x72, 0x61, 0x63, 0x74, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x22, 0x6b, 0x0a,
+	0x0e, 0x54, 0x65, 0x6c, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12,
+	0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x41, 0x0a, 0x1d, 0x74, 0x65, 0x6c, 0x65, 0x70,
+	0x6f, 0x72, 0x74, 0x64, 0x5f, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x5f, 0x64, 0x6f, 0x77, 0x6e,
+	0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x1a,
+	0x74, 0x65, 0x6c, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x64, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x44,
+	0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x55, 0x72, 0x6c, 0x42, 0xbf, 0x01, 0x0a, 0x11, 0x63,
+	0x6f, 0x6d, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31,
+	0x42, 0x13, 0x54, 0x65, 0x6c, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
+	0x63, 0x6f, 0x6d, 0x2f, 0x41, 0x7a, 0x75, 0x72, 0x65, 0x2f, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x42,
+	0x61, 0x6b, 0x65, 0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e,
+	0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x6e, 0x62, 0x63,
+	0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x4e, 0x58, 0x58, 0xaa,
+	0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x56, 0x31, 0xca,
+	0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0xe2,
+	0x02, 0x19, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0x5c,
+	0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, 0x4e, 0x62,
+	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -135,7 +133,6 @@ func file_pkg_proto_nbcontract_v1_teleportconfig_proto_init() {
 	if File_pkg_proto_nbcontract_v1_teleportconfig_proto != nil {
 		return
 	}
-	file_pkg_proto_nbcontract_v1_featurestate_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_pkg_proto_nbcontract_v1_teleportconfig_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*TeleportConfig); i {
diff --git a/pkg/proto/nbcontract/v1/teleportconfig.proto b/pkg/proto/nbcontract/v1/teleportconfig.proto
index 1c33cd68975..45bbdca673a 100644
--- a/pkg/proto/nbcontract/v1/teleportconfig.proto
+++ b/pkg/proto/nbcontract/v1/teleportconfig.proto
@@ -1,6 +1,5 @@
 syntax = "proto3";
 package nbcontract.v1;
-import "pkg/proto/nbcontract/v1/featurestate.proto";
 
 message TeleportConfig {
   bool status = 1;
diff --git a/pkg/proto/nbcontract/v1/tlsbootstrappingconfig.pb.go b/pkg/proto/nbcontract/v1/tlsbootstrappingconfig.pb.go
index d7833890fa5..256394f7611 100644
--- a/pkg/proto/nbcontract/v1/tlsbootstrappingconfig.pb.go
+++ b/pkg/proto/nbcontract/v1/tlsbootstrappingconfig.pb.go
@@ -90,40 +90,37 @@ var file_pkg_proto_nbcontract_v1_tlsbootstrappingconfig_proto_rawDesc = []byte{
 	0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x6c, 0x73, 0x62, 0x6f, 0x6f,
 	0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0d, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61,
-	0x63, 0x74, 0x2e, 0x76, 0x31, 0x1a, 0x2a, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x66,
-	0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x22, 0x95, 0x02, 0x0a, 0x16, 0x54, 0x4c, 0x53, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72,
-	0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x4a, 0x0a, 0x1f,
-	0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x73, 0x65, 0x63, 0x75, 0x72, 0x65, 0x5f, 0x74, 0x6c,
-	0x73, 0x5f, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x1c, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x53,
-	0x65, 0x63, 0x75, 0x72, 0x65, 0x54, 0x6c, 0x73, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61,
-	0x70, 0x70, 0x69, 0x6e, 0x67, 0x88, 0x01, 0x01, 0x12, 0x2e, 0x0a, 0x13, 0x74, 0x6c, 0x73, 0x5f,
-	0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x74, 0x6c, 0x73, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74,
-	0x72, 0x61, 0x70, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x5b, 0x0a, 0x2b, 0x63, 0x75, 0x73, 0x74,
-	0x6f, 0x6d, 0x5f, 0x73, 0x65, 0x63, 0x75, 0x72, 0x65, 0x5f, 0x74, 0x6c, 0x73, 0x5f, 0x62, 0x6f,
-	0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x5f, 0x61, 0x70, 0x70, 0x73, 0x65, 0x72, 0x76, 0x65,
-	0x72, 0x5f, 0x61, 0x70, 0x70, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x26, 0x63,
-	0x75, 0x73, 0x74, 0x6f, 0x6d, 0x53, 0x65, 0x63, 0x75, 0x72, 0x65, 0x54, 0x6c, 0x73, 0x42, 0x6f,
-	0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x41, 0x70, 0x70, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72,
-	0x41, 0x70, 0x70, 0x69, 0x64, 0x42, 0x22, 0x0a, 0x20, 0x5f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65,
-	0x5f, 0x73, 0x65, 0x63, 0x75, 0x72, 0x65, 0x5f, 0x74, 0x6c, 0x73, 0x5f, 0x62, 0x6f, 0x6f, 0x74,
-	0x73, 0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x42, 0xc7, 0x01, 0x0a, 0x11, 0x63, 0x6f,
-	0x6d, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x42,
-	0x1b, 0x54, 0x6c, 0x73, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e,
-	0x67, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x40,
-	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x41, 0x7a, 0x75, 0x72, 0x65,
-	0x2f, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x42, 0x61, 0x6b, 0x65, 0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74,
-	0x2f, 0x76, 0x31, 0x3b, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x76, 0x31,
-	0xa2, 0x02, 0x03, 0x4e, 0x58, 0x58, 0xaa, 0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72,
-	0x61, 0x63, 0x74, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72,
-	0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x19, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72,
-	0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61,
-	0x74, 0x61, 0xea, 0x02, 0x0e, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x3a,
-	0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x63, 0x74, 0x2e, 0x76, 0x31, 0x22, 0x95, 0x02, 0x0a, 0x16, 0x54, 0x4c, 0x53, 0x42, 0x6f, 0x6f,
+	0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x12, 0x4a, 0x0a, 0x1f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x73, 0x65, 0x63, 0x75, 0x72,
+	0x65, 0x5f, 0x74, 0x6c, 0x73, 0x5f, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x70,
+	0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x1c, 0x65, 0x6e, 0x61,
+	0x62, 0x6c, 0x65, 0x53, 0x65, 0x63, 0x75, 0x72, 0x65, 0x54, 0x6c, 0x73, 0x42, 0x6f, 0x6f, 0x74,
+	0x73, 0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x88, 0x01, 0x01, 0x12, 0x2e, 0x0a, 0x13,
+	0x74, 0x6c, 0x73, 0x5f, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x5f, 0x74, 0x6f,
+	0x6b, 0x65, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x74, 0x6c, 0x73, 0x42, 0x6f,
+	0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x5b, 0x0a, 0x2b,
+	0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x73, 0x65, 0x63, 0x75, 0x72, 0x65, 0x5f, 0x74, 0x6c,
+	0x73, 0x5f, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x5f, 0x61, 0x70, 0x70, 0x73,
+	0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x61, 0x70, 0x70, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x26, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x53, 0x65, 0x63, 0x75, 0x72, 0x65, 0x54,
+	0x6c, 0x73, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x41, 0x70, 0x70, 0x73, 0x65,
+	0x72, 0x76, 0x65, 0x72, 0x41, 0x70, 0x70, 0x69, 0x64, 0x42, 0x22, 0x0a, 0x20, 0x5f, 0x65, 0x6e,
+	0x61, 0x62, 0x6c, 0x65, 0x5f, 0x73, 0x65, 0x63, 0x75, 0x72, 0x65, 0x5f, 0x74, 0x6c, 0x73, 0x5f,
+	0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x42, 0xc7, 0x01,
+	0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74,
+	0x2e, 0x76, 0x31, 0x42, 0x1b, 0x54, 0x6c, 0x73, 0x62, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61,
+	0x70, 0x70, 0x69, 0x6e, 0x67, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f,
+	0x50, 0x01, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x41,
+	0x7a, 0x75, 0x72, 0x65, 0x2f, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x42, 0x61, 0x6b, 0x65, 0x72, 0x2f,
+	0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74,
+	0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61,
+	0x63, 0x74, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x4e, 0x58, 0x58, 0xaa, 0x02, 0x0d, 0x4e, 0x62, 0x63,
+	0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0d, 0x4e, 0x62, 0x63,
+	0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x19, 0x4e, 0x62, 0x63,
+	0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65,
+	0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72,
+	0x61, 0x63, 0x74, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -155,7 +152,6 @@ func file_pkg_proto_nbcontract_v1_tlsbootstrappingconfig_proto_init() {
 	if File_pkg_proto_nbcontract_v1_tlsbootstrappingconfig_proto != nil {
 		return
 	}
-	file_pkg_proto_nbcontract_v1_featurestate_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_pkg_proto_nbcontract_v1_tlsbootstrappingconfig_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*TLSBootstrappingConfig); i {
diff --git a/pkg/proto/nbcontract/v1/tlsbootstrappingconfig.proto b/pkg/proto/nbcontract/v1/tlsbootstrappingconfig.proto
index 38e1510c98e..60007eb8204 100644
--- a/pkg/proto/nbcontract/v1/tlsbootstrappingconfig.proto
+++ b/pkg/proto/nbcontract/v1/tlsbootstrappingconfig.proto
@@ -1,6 +1,5 @@
 syntax = "proto3";
 package nbcontract.v1;
-import "pkg/proto/nbcontract/v1/featurestate.proto";
  
 message TLSBootstrappingConfig {
     optional bool enable_secure_tls_bootstrapping = 1;
diff --git a/pkg/templates/templates_generated.go b/pkg/templates/templates_generated.go
index 1e4181ea561..4215ab52247 100644
--- a/pkg/templates/templates_generated.go
+++ b/pkg/templates/templates_generated.go
@@ -86,6 +86,7 @@
 // linux/cloud-init/artifacts/sshd_config
 // linux/cloud-init/artifacts/sshd_config_1604
 // linux/cloud-init/artifacts/sshd_config_1804_fips
+// linux/cloud-init/artifacts/sshd_config_2204_fips
 // linux/cloud-init/artifacts/sync-container-logs.service
 // linux/cloud-init/artifacts/sync-container-logs.sh
 // linux/cloud-init/artifacts/sysctl-d-60-CIS.conf
@@ -5357,7 +5358,7 @@ var _linuxCloudInitArtifactsManifestJson = []byte(`{
         "pinned": {
             "1804": "1.7.1-1"
         },
-        "edge": "1.7.14-1"
+        "edge": "1.7.15-1"
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
@@ -6860,6 +6861,115 @@ func linuxCloudInitArtifactsSshd_config_1804_fips() (*asset, error) {
 	return a, nil
 }
 
+var _linuxCloudInitArtifactsSshd_config_2204_fips = []byte(`# This file is a copy of the default sshd_config file, but relaxes used encryption
+# for sshd to work with 5.15.0-1059-azure-fips
+
+# What ports, IPs and protocols we listen for
+Port 22
+# Use these options to restrict which interfaces/protocols sshd will bind to
+#ListenAddress ::
+#ListenAddress 0.0.0.0
+Protocol 2
+
+# 5.2.11 Ensure only approved MAC algorithms are used
+# Disabled for FIPS
+# MACs hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128@openssh.com
+# KexAlgorithms curve25519-sha256@libssh.org
+# Ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr
+
+# 5.2.12 Ensure SSH Idle Timeout Interval is configured
+ClientAliveInterval 120
+ClientAliveCountMax 3
+
+# HostKeys for protocol version 2
+HostKey /etc/ssh/ssh_host_rsa_key
+HostKey /etc/ssh/ssh_host_dsa_key
+HostKey /etc/ssh/ssh_host_ecdsa_key
+HostKey /etc/ssh/ssh_host_ed25519_key
+
+# Logging
+SyslogFacility AUTH
+LogLevel INFO
+
+# Authentication:
+LoginGraceTime 60
+
+# 5.2.8 Ensure SSH root login is disabled
+PermitRootLogin no
+# 5.2.10 Ensure SSH PermitUserEnvironment is disabled
+PermitUserEnvironment no
+
+StrictModes yes
+PubkeyAuthentication yes
+#AuthorizedKeysFile	%h/.ssh/authorized_keys
+
+# Don't read the user's ~/.rhosts and ~/.shosts files
+IgnoreRhosts yes
+# similar for protocol version 2
+HostbasedAuthentication no
+
+# To enable empty passwords, change to yes (NOT RECOMMENDED)
+PermitEmptyPasswords no
+
+# Change to yes to enable challenge-response passwords (beware issues with
+# some PAM modules and threads)
+ChallengeResponseAuthentication no
+
+# Change to no to disable tunnelled clear text passwords
+PasswordAuthentication no
+
+# 5.2.4 Ensure SSH X11 forwarding is disabled
+X11Forwarding no
+
+# 5.2.5 Ensure SSH MaxAuthTries is set to 4 or less
+MaxAuthTries 4
+
+X11DisplayOffset 10
+PrintMotd no
+PrintLastLog yes
+TCPKeepAlive yes
+#UseLogin no
+
+#MaxStartups 10:30:60
+Banner /etc/issue.net
+
+# Allow client to pass locale environment variables
+AcceptEnv LANG LC_*
+
+Subsystem sftp /usr/lib/openssh/sftp-server
+
+# Set this to 'yes' to enable PAM authentication, account processing,
+# and session processing. If this is enabled, PAM authentication will
+# be allowed through the ChallengeResponseAuthentication and
+# PasswordAuthentication.  Depending on your PAM configuration,
+# PAM authentication via ChallengeResponseAuthentication may bypass
+# the setting of "PermitRootLogin without-password".
+# If you just want the PAM account and session checks to run without
+# PAM authentication, then enable this but set PasswordAuthentication
+# and ChallengeResponseAuthentication to 'no'.
+UsePAM yes
+UseDNS no
+GSSAPIAuthentication no
+
+# Mariner AKS CIS Benchmark: Ensure SSH access is limited
+DenyUsers root omsagent nxautomation
+`)
+
+func linuxCloudInitArtifactsSshd_config_2204_fipsBytes() ([]byte, error) {
+	return _linuxCloudInitArtifactsSshd_config_2204_fips, nil
+}
+
+func linuxCloudInitArtifactsSshd_config_2204_fips() (*asset, error) {
+	bytes, err := linuxCloudInitArtifactsSshd_config_2204_fipsBytes()
+	if err != nil {
+		return nil, err
+	}
+
+	info := bindataFileInfo{name: "linux/cloud-init/artifacts/sshd_config_2204_fips", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)}
+	a := &asset{bytes: bytes, info: info}
+	return a, nil
+}
+
 var _linuxCloudInitArtifactsSyncContainerLogsService = []byte(`[Unit]
 Description=Syncs AKS pod log symlinks so that WALinuxAgent can include kube-system pod logs in the hourly upload.
 After=containerd.service
@@ -7320,7 +7430,7 @@ installStandaloneContainerd() {
     #if there is no containerd_version input from RP, use hardcoded version
     if [[ -z ${CONTAINERD_VERSION} ]]; then
         # pin 18.04 to 1.7.1
-        CONTAINERD_VERSION="1.7.14"
+        CONTAINERD_VERSION="1.7.15"
         if [ "${UBUNTU_RELEASE}" == "18.04" ]; then
             CONTAINERD_VERSION="1.7.1"
         fi
@@ -9415,6 +9525,7 @@ var _bindata = map[string]func() (*asset, error){
 	"linux/cloud-init/artifacts/sshd_config":                               linuxCloudInitArtifactsSshd_config,
 	"linux/cloud-init/artifacts/sshd_config_1604":                          linuxCloudInitArtifactsSshd_config_1604,
 	"linux/cloud-init/artifacts/sshd_config_1804_fips":                     linuxCloudInitArtifactsSshd_config_1804_fips,
+	"linux/cloud-init/artifacts/sshd_config_2204_fips":                     linuxCloudInitArtifactsSshd_config_2204_fips,
 	"linux/cloud-init/artifacts/sync-container-logs.service":               linuxCloudInitArtifactsSyncContainerLogsService,
 	"linux/cloud-init/artifacts/sync-container-logs.sh":                    linuxCloudInitArtifactsSyncContainerLogsSh,
 	"linux/cloud-init/artifacts/sysctl-d-60-CIS.conf":                      linuxCloudInitArtifactsSysctlD60CisConf,
@@ -9566,6 +9677,7 @@ var _bintree = &bintree{nil, map[string]*bintree{
 				"sshd_config":                     &bintree{linuxCloudInitArtifactsSshd_config, map[string]*bintree{}},
 				"sshd_config_1604":                &bintree{linuxCloudInitArtifactsSshd_config_1604, map[string]*bintree{}},
 				"sshd_config_1804_fips":           &bintree{linuxCloudInitArtifactsSshd_config_1804_fips, map[string]*bintree{}},
+				"sshd_config_2204_fips":           &bintree{linuxCloudInitArtifactsSshd_config_2204_fips, map[string]*bintree{}},
 				"sync-container-logs.service":     &bintree{linuxCloudInitArtifactsSyncContainerLogsService, map[string]*bintree{}},
 				"sync-container-logs.sh":          &bintree{linuxCloudInitArtifactsSyncContainerLogsSh, map[string]*bintree{}},
 				"sysctl-d-60-CIS.conf":            &bintree{linuxCloudInitArtifactsSysctlD60CisConf, map[string]*bintree{}},
diff --git a/schemas/manifest.cue b/schemas/manifest.cue
index 4817e3bcc7e..97f716c6698 100644
--- a/schemas/manifest.cue
+++ b/schemas/manifest.cue
@@ -58,7 +58,7 @@
         "pinned": {
             "1804": "1.7.1-1" // default in 1804 vhds.
         }
-        "edge": "1.7.14-1",  // edge is default in vhd.
+        "edge": "1.7.15-1",  // edge is default in vhd.
     },
     "runc": {
         "fileName": "moby-runc_${RUNC_VERSION}+azure-ubuntu${RUNC_PATCH_VERSION}_${CPU_ARCH}.deb",
diff --git a/vhdbuilder/packer/cleanup.sh b/vhdbuilder/packer/cleanup.sh
index 4b7c2545bd9..0f9f7e71bf9 100755
--- a/vhdbuilder/packer/cleanup.sh
+++ b/vhdbuilder/packer/cleanup.sh
@@ -174,16 +174,37 @@ if [[ "${MODE}" == "linuxVhdMode" && -n "${AZURE_RESOURCE_GROUP_NAME}" && "${DRY
   set -x
 fi
 
-# clean up storage accounts created over a week ago
-if [[ -n "${AZURE_RESOURCE_GROUP_NAME}" && "${DRY_RUN}" == "False" ]]; then
-  echo "Looking for storage accounts in ${AZURE_RESOURCE_GROUP_NAME} created over ${EXPIRATION_IN_HOURS} hours ago..."
-  echo "That is, those created before $(date -d@$deadline) As shown below"
-  az storage account list -g ${AZURE_RESOURCE_GROUP_NAME} | jq --arg dl $deadline '.[] | select(.tags.now < $dl).name' | tr -d '\"' || ""
-  for storage_account in $(az storage account list -g ${AZURE_RESOURCE_GROUP_NAME} | jq --arg dl $deadline '.[] | select(.tags.now < $dl).name' | tr -d '\"' || ""); do
-      if [[ $storage_account = aksimages* ]]; then
-          echo "Will delete storage account ${storage_account}# from resource group ${AZURE_RESOURCE_GROUP_NAME}..."
-          az storage account delete --name ${storage_account} -g ${AZURE_RESOURCE_GROUP_NAME} --yes  || echo "unable to delete storage account ${storage_account}, will continue..."
-          echo "Deletion completed"
-      fi
-  done
+if [[ -z "${AZURE_RESOURCE_GROUP_NAME}" ]]; then
+  echo "AZURE_RESOURCE_GROUP_NAME is not set, skipping storage account backfill deletion..."
+  exit 0
+fi
+
+if [[ "${MODE}" != "linuxVhdMode" ]] && [[ "${DRY_RUN}" == "True" ]]; then
+  echo "MODE is $MODE and DRY_RUN is $DRY_RUN, skipping storage account backfill deletion..."
+  exit 0
+fi
+
+
+STORAGE_ACCOUNT_EXPIRATION_IN_HOURS=12
+# convert to seconds so we can compare it against the "tags.now" property in the resource group metadata
+(( storageAccountExpirationSecs = ${STORAGE_ACCOUNT_EXPIRATION_IN_HOURS} * 60 * 60 ))
+# deadline = the "date +%s" representation of the oldest age we're willing to keep
+(( storageAccountDeadline=$(date +%s)-${storageAccountExpirationSecs%.*} ))
+
+# clean up storage accounts created more than 12 hours ago
+old_storage_accounts=""
+echo "Looking for storage accounts in ${AZURE_RESOURCE_GROUP_NAME} created over ${STORAGE_ACCOUNT_EXPIRATION_IN_HOURS} hours ago..."
+echo "That is, those created before $(date -d@$storageAccountDeadline) As shown below"
+az storage account list -g ${AZURE_RESOURCE_GROUP_NAME} | jq --arg dl $storageAccountDeadline '.[] | select(.tags.now < $dl).name' | tr -d '\"' || ""
+for storage_account_id in $(az storage account list -g ${AZURE_RESOURCE_GROUP_NAME} | jq --arg dl $storageAccountDeadline '.[] | select(.tags.now < $dl).id' | tr -d '\"' || ""); do
+    if [[ $storage_account_id = *aksimages* ]]; then
+        echo "Will delete storage account ${storage_account_id}# from resource group ${AZURE_RESOURCE_GROUP_NAME}..."
+        old_storage_accounts="${old_storage_accounts} ${storage_account_id}"
+    fi
+done
+if [ -n "$old_storage_accounts" ]; then
+  echo "attempting to delete old storage accounts..."
+  az storage account delete --yes --ids $old_storage_accounts || echo "old storage account deletion was not successful, continuing..."
+else
+  echo "did not find any old storage accounts eligible for deletion"
 fi
\ No newline at end of file
diff --git a/vhdbuilder/packer/packer_source.sh b/vhdbuilder/packer/packer_source.sh
index 5600b38a742..9e1e0f17aff 100644
--- a/vhdbuilder/packer/packer_source.sh
+++ b/vhdbuilder/packer/packer_source.sh
@@ -247,6 +247,8 @@ copyPackerFiles() {
     SSHD_CONFIG_SRC=/home/packer/sshd_config_1604
   elif [[ ${UBUNTU_RELEASE} == "18.04" && ${ENABLE_FIPS,,} == "true" ]]; then
     SSHD_CONFIG_SRC=/home/packer/sshd_config_1804_fips
+  elif [[ ${UBUNTU_RELEASE} == "22.04" && ${ENABLE_FIPS,,} == "true" ]]; then
+    SSHD_CONFIG_SRC=/home/packer/sshd_config_2204_fips
   fi
 
   # Install AKS log collector
diff --git a/vhdbuilder/packer/pre-install-dependencies.sh b/vhdbuilder/packer/pre-install-dependencies.sh
index df9b0a7dbbb..26f72ab00d8 100644
--- a/vhdbuilder/packer/pre-install-dependencies.sh
+++ b/vhdbuilder/packer/pre-install-dependencies.sh
@@ -120,7 +120,7 @@ if [[ ${OS} == ${MARINER_OS_NAME} ]] && [[ "${ENABLE_CGROUPV2,,}" == "true" ]];
   enableCgroupV2forAzureLinux
 fi
 
-if [[ "${UBUNTU_RELEASE}" == "22.04" ]]; then
+if [[ "${UBUNTU_RELEASE}" == "22.04" && "${ENABLE_FIPS,,}" != "true" ]]; then
   echo "Logging the currently running kernel: $(uname -r)"
   echo "Before purging kernel, here is a list of kernels/headers installed:"; dpkg -l 'linux-*azure*'
 
diff --git a/vhdbuilder/packer/test/linux-vhd-content-test.sh b/vhdbuilder/packer/test/linux-vhd-content-test.sh
index d7b14dd8fc6..7ad5eb2bf79 100644
--- a/vhdbuilder/packer/test/linux-vhd-content-test.sh
+++ b/vhdbuilder/packer/test/linux-vhd-content-test.sh
@@ -271,7 +271,7 @@ testFips() {
   os_version=$1
   enable_fips=$2
 
-  if [[ (${os_version} == "18.04" || ${os_version} == "20.04" || ${os_version} == "V2") && ${enable_fips,,} == "true" ]]; then
+  if [[ (${os_version} == "18.04" || ${os_version} == "20.04" || ${os_version} == "22.04" || ${os_version} == "V2") && ${enable_fips,,} == "true" ]]; then
     kernel=$(uname -r)
     if [[ -f /proc/sys/crypto/fips_enabled ]]; then
       fips_enabled=$(cat /proc/sys/crypto/fips_enabled)
diff --git a/vhdbuilder/packer/vhd-image-builder-arm64-gen2.json b/vhdbuilder/packer/vhd-image-builder-arm64-gen2.json
index f3e0ab680f1..ab7f19cb78f 100644
--- a/vhdbuilder/packer/vhd-image-builder-arm64-gen2.json
+++ b/vhdbuilder/packer/vhd-image-builder-arm64-gen2.json
@@ -313,11 +313,6 @@
       "source": "parts/linux/cloud-init/artifacts/sshd_config_1604",
       "destination": "/home/packer/sshd_config_1604"
     },
-    {
-      "type": "file",
-      "source": "parts/linux/cloud-init/artifacts/sshd_config_1804_fips",
-      "destination": "/home/packer/sshd_config_1804_fips"
-    },
     {
       "type": "file",
       "source": "parts/linux/cloud-init/artifacts/rsyslog-d-60-CIS.conf",
diff --git a/vhdbuilder/packer/vhd-image-builder-base.json b/vhdbuilder/packer/vhd-image-builder-base.json
index 762213911db..74cd5466106 100644
--- a/vhdbuilder/packer/vhd-image-builder-base.json
+++ b/vhdbuilder/packer/vhd-image-builder-base.json
@@ -328,6 +328,11 @@
       "source": "parts/linux/cloud-init/artifacts/sshd_config_1804_fips",
       "destination": "/home/packer/sshd_config_1804_fips"
     },
+    {
+      "type": "file",
+      "source": "parts/linux/cloud-init/artifacts/sshd_config_2204_fips",
+      "destination": "/home/packer/sshd_config_2204_fips"
+    },
     {
       "type": "file",
       "source": "parts/linux/cloud-init/artifacts/rsyslog-d-60-CIS.conf",