diff --git a/parts/linux/cloud-init/artifacts/mariner/cse_install_mariner.sh b/parts/linux/cloud-init/artifacts/mariner/cse_install_mariner.sh
index 3624a51abde..3974604b803 100755
--- a/parts/linux/cloud-init/artifacts/mariner/cse_install_mariner.sh
+++ b/parts/linux/cloud-init/artifacts/mariner/cse_install_mariner.sh
@@ -74,12 +74,7 @@ installNvidiaFabricManager() {
 }
 
 installNvidiaContainerToolkit() {
-    MARINER_NVIDIA_CONTAINER_RUNTIME_VERSION="3.13.0"
-    MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.15.0"
-
-    if [[ $OS_VERSION == "2.0" ]]; then
-      MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.13.5"
-    fi
+    MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.16.2"
     
     for nvidia_package in nvidia-container-toolkit-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} nvidia-container-toolkit-base-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} libnvidia-container-tools-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} libnvidia-container1-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION}; do
       if ! dnf_install 30 1 600 $nvidia_package; then
@@ -87,11 +82,6 @@ installNvidiaContainerToolkit() {
       fi
     done
 
-    if [[ $OS_VERSION == "2.0" ]]; then
-      if ! dnf_install 30 1 600 nvidia-container-runtime-${MARINER_NVIDIA_CONTAINER_RUNTIME_VERSION}; then
-        exit $ERR_APT_INSTALL_TIMEOUT
-      fi
-    fi
 }
 
 enableNvidiaPersistenceMode() {
diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData
index 125150a75e3..116a3deec3e 100644
--- a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData
+++ b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData
@@ -58,7 +58,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 - path: /opt/azure/containers/provision_configs.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line61.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line61.sh
index 92369c47c45..d39a61b7a57 100644
--- a/pkg/agent/testdata/AzureLinuxV2+Kata/line61.sh
+++ b/pkg/agent/testdata/AzureLinuxV2+Kata/line61.sh
@@ -67,12 +67,7 @@ installNvidiaFabricManager() {
 }
 
 installNvidiaContainerToolkit() {
-    MARINER_NVIDIA_CONTAINER_RUNTIME_VERSION="3.13.0"
-    MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.15.0"
-
-    if [[ $OS_VERSION == "2.0" ]]; then
-      MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.13.5"
-    fi
+    MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.16.2"
     
     for nvidia_package in nvidia-container-toolkit-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} nvidia-container-toolkit-base-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} libnvidia-container-tools-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} libnvidia-container1-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION}; do
       if ! dnf_install 30 1 600 $nvidia_package; then
@@ -80,11 +75,6 @@ installNvidiaContainerToolkit() {
       fi
     done
 
-    if [[ $OS_VERSION == "2.0" ]]; then
-      if ! dnf_install 30 1 600 nvidia-container-runtime-${MARINER_NVIDIA_CONTAINER_RUNTIME_VERSION}; then
-        exit $ERR_APT_INSTALL_TIMEOUT
-      fi
-    fi
 }
 
 enableNvidiaPersistenceMode() {
diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData
index 125150a75e3..116a3deec3e 100644
--- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData
+++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData
@@ -58,7 +58,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 - path: /opt/azure/containers/provision_configs.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line61.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line61.sh
index 92369c47c45..d39a61b7a57 100644
--- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line61.sh
+++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line61.sh
@@ -67,12 +67,7 @@ installNvidiaFabricManager() {
 }
 
 installNvidiaContainerToolkit() {
-    MARINER_NVIDIA_CONTAINER_RUNTIME_VERSION="3.13.0"
-    MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.15.0"
-
-    if [[ $OS_VERSION == "2.0" ]]; then
-      MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.13.5"
-    fi
+    MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.16.2"
     
     for nvidia_package in nvidia-container-toolkit-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} nvidia-container-toolkit-base-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} libnvidia-container-tools-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} libnvidia-container1-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION}; do
       if ! dnf_install 30 1 600 $nvidia_package; then
@@ -80,11 +75,6 @@ installNvidiaContainerToolkit() {
       fi
     done
 
-    if [[ $OS_VERSION == "2.0" ]]; then
-      if ! dnf_install 30 1 600 nvidia-container-runtime-${MARINER_NVIDIA_CONTAINER_RUNTIME_VERSION}; then
-        exit $ERR_APT_INSTALL_TIMEOUT
-      fi
-    fi
 }
 
 enableNvidiaPersistenceMode() {
diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData
index 125150a75e3..116a3deec3e 100644
--- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData
+++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData
@@ -58,7 +58,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 - path: /opt/azure/containers/provision_configs.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line61.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line61.sh
index 92369c47c45..d39a61b7a57 100644
--- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line61.sh
+++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line61.sh
@@ -67,12 +67,7 @@ installNvidiaFabricManager() {
 }
 
 installNvidiaContainerToolkit() {
-    MARINER_NVIDIA_CONTAINER_RUNTIME_VERSION="3.13.0"
-    MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.15.0"
-
-    if [[ $OS_VERSION == "2.0" ]]; then
-      MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.13.5"
-    fi
+    MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.16.2"
     
     for nvidia_package in nvidia-container-toolkit-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} nvidia-container-toolkit-base-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} libnvidia-container-tools-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} libnvidia-container1-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION}; do
       if ! dnf_install 30 1 600 $nvidia_package; then
@@ -80,11 +75,6 @@ installNvidiaContainerToolkit() {
       fi
     done
 
-    if [[ $OS_VERSION == "2.0" ]]; then
-      if ! dnf_install 30 1 600 nvidia-container-runtime-${MARINER_NVIDIA_CONTAINER_RUNTIME_VERSION}; then
-        exit $ERR_APT_INSTALL_TIMEOUT
-      fi
-    fi
 }
 
 enableNvidiaPersistenceMode() {
diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData
index 125150a75e3..116a3deec3e 100644
--- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData
+++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData
@@ -58,7 +58,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 - path: /opt/azure/containers/provision_configs.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line61.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line61.sh
index 92369c47c45..d39a61b7a57 100644
--- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line61.sh
+++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line61.sh
@@ -67,12 +67,7 @@ installNvidiaFabricManager() {
 }
 
 installNvidiaContainerToolkit() {
-    MARINER_NVIDIA_CONTAINER_RUNTIME_VERSION="3.13.0"
-    MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.15.0"
-
-    if [[ $OS_VERSION == "2.0" ]]; then
-      MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.13.5"
-    fi
+    MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.16.2"
     
     for nvidia_package in nvidia-container-toolkit-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} nvidia-container-toolkit-base-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} libnvidia-container-tools-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} libnvidia-container1-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION}; do
       if ! dnf_install 30 1 600 $nvidia_package; then
@@ -80,11 +75,6 @@ installNvidiaContainerToolkit() {
       fi
     done
 
-    if [[ $OS_VERSION == "2.0" ]]; then
-      if ! dnf_install 30 1 600 nvidia-container-runtime-${MARINER_NVIDIA_CONTAINER_RUNTIME_VERSION}; then
-        exit $ERR_APT_INSTALL_TIMEOUT
-      fi
-    fi
 }
 
 enableNvidiaPersistenceMode() {
diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData
index 125150a75e3..116a3deec3e 100644
--- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData
+++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData
@@ -58,7 +58,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 - path: /opt/azure/containers/provision_configs.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line61.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line61.sh
index 92369c47c45..d39a61b7a57 100644
--- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line61.sh
+++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line61.sh
@@ -67,12 +67,7 @@ installNvidiaFabricManager() {
 }
 
 installNvidiaContainerToolkit() {
-    MARINER_NVIDIA_CONTAINER_RUNTIME_VERSION="3.13.0"
-    MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.15.0"
-
-    if [[ $OS_VERSION == "2.0" ]]; then
-      MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.13.5"
-    fi
+    MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.16.2"
     
     for nvidia_package in nvidia-container-toolkit-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} nvidia-container-toolkit-base-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} libnvidia-container-tools-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} libnvidia-container1-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION}; do
       if ! dnf_install 30 1 600 $nvidia_package; then
@@ -80,11 +75,6 @@ installNvidiaContainerToolkit() {
       fi
     done
 
-    if [[ $OS_VERSION == "2.0" ]]; then
-      if ! dnf_install 30 1 600 nvidia-container-runtime-${MARINER_NVIDIA_CONTAINER_RUNTIME_VERSION}; then
-        exit $ERR_APT_INSTALL_TIMEOUT
-      fi
-    fi
 }
 
 enableNvidiaPersistenceMode() {
diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData
index ab45d4b7251..5e583a399db 100644
--- a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData
+++ b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData
@@ -58,7 +58,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 - path: /opt/azure/containers/provision_configs.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line61.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line61.sh
index 92369c47c45..d39a61b7a57 100644
--- a/pkg/agent/testdata/MarinerV2+CustomCloud/line61.sh
+++ b/pkg/agent/testdata/MarinerV2+CustomCloud/line61.sh
@@ -67,12 +67,7 @@ installNvidiaFabricManager() {
 }
 
 installNvidiaContainerToolkit() {
-    MARINER_NVIDIA_CONTAINER_RUNTIME_VERSION="3.13.0"
-    MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.15.0"
-
-    if [[ $OS_VERSION == "2.0" ]]; then
-      MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.13.5"
-    fi
+    MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.16.2"
     
     for nvidia_package in nvidia-container-toolkit-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} nvidia-container-toolkit-base-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} libnvidia-container-tools-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} libnvidia-container1-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION}; do
       if ! dnf_install 30 1 600 $nvidia_package; then
@@ -80,11 +75,6 @@ installNvidiaContainerToolkit() {
       fi
     done
 
-    if [[ $OS_VERSION == "2.0" ]]; then
-      if ! dnf_install 30 1 600 nvidia-container-runtime-${MARINER_NVIDIA_CONTAINER_RUNTIME_VERSION}; then
-        exit $ERR_APT_INSTALL_TIMEOUT
-      fi
-    fi
 }
 
 enableNvidiaPersistenceMode() {
diff --git a/pkg/agent/testdata/MarinerV2+Kata/CustomData b/pkg/agent/testdata/MarinerV2+Kata/CustomData
index 6f6200531b5..e31dcd03036 100644
--- a/pkg/agent/testdata/MarinerV2+Kata/CustomData
+++ b/pkg/agent/testdata/MarinerV2+Kata/CustomData
@@ -58,7 +58,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 - path: /opt/azure/containers/provision_configs.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/MarinerV2+Kata/line61.sh b/pkg/agent/testdata/MarinerV2+Kata/line61.sh
index 92369c47c45..d39a61b7a57 100644
--- a/pkg/agent/testdata/MarinerV2+Kata/line61.sh
+++ b/pkg/agent/testdata/MarinerV2+Kata/line61.sh
@@ -67,12 +67,7 @@ installNvidiaFabricManager() {
 }
 
 installNvidiaContainerToolkit() {
-    MARINER_NVIDIA_CONTAINER_RUNTIME_VERSION="3.13.0"
-    MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.15.0"
-
-    if [[ $OS_VERSION == "2.0" ]]; then
-      MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.13.5"
-    fi
+    MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.16.2"
     
     for nvidia_package in nvidia-container-toolkit-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} nvidia-container-toolkit-base-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} libnvidia-container-tools-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} libnvidia-container1-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION}; do
       if ! dnf_install 30 1 600 $nvidia_package; then
@@ -80,11 +75,6 @@ installNvidiaContainerToolkit() {
       fi
     done
 
-    if [[ $OS_VERSION == "2.0" ]]; then
-      if ! dnf_install 30 1 600 nvidia-container-runtime-${MARINER_NVIDIA_CONTAINER_RUNTIME_VERSION}; then
-        exit $ERR_APT_INSTALL_TIMEOUT
-      fi
-    fi
 }
 
 enableNvidiaPersistenceMode() {
diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData
index 6f6200531b5..e31dcd03036 100644
--- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData
+++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData
@@ -58,7 +58,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 - path: /opt/azure/containers/provision_configs.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line61.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line61.sh
index 92369c47c45..d39a61b7a57 100644
--- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line61.sh
+++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line61.sh
@@ -67,12 +67,7 @@ installNvidiaFabricManager() {
 }
 
 installNvidiaContainerToolkit() {
-    MARINER_NVIDIA_CONTAINER_RUNTIME_VERSION="3.13.0"
-    MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.15.0"
-
-    if [[ $OS_VERSION == "2.0" ]]; then
-      MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.13.5"
-    fi
+    MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.16.2"
     
     for nvidia_package in nvidia-container-toolkit-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} nvidia-container-toolkit-base-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} libnvidia-container-tools-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} libnvidia-container1-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION}; do
       if ! dnf_install 30 1 600 $nvidia_package; then
@@ -80,11 +75,6 @@ installNvidiaContainerToolkit() {
       fi
     done
 
-    if [[ $OS_VERSION == "2.0" ]]; then
-      if ! dnf_install 30 1 600 nvidia-container-runtime-${MARINER_NVIDIA_CONTAINER_RUNTIME_VERSION}; then
-        exit $ERR_APT_INSTALL_TIMEOUT
-      fi
-    fi
 }
 
 enableNvidiaPersistenceMode() {
diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData
index 6f6200531b5..e31dcd03036 100644
--- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData
+++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData
@@ -58,7 +58,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 - path: /opt/azure/containers/provision_configs.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line61.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line61.sh
index 92369c47c45..d39a61b7a57 100644
--- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line61.sh
+++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line61.sh
@@ -67,12 +67,7 @@ installNvidiaFabricManager() {
 }
 
 installNvidiaContainerToolkit() {
-    MARINER_NVIDIA_CONTAINER_RUNTIME_VERSION="3.13.0"
-    MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.15.0"
-
-    if [[ $OS_VERSION == "2.0" ]]; then
-      MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.13.5"
-    fi
+    MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.16.2"
     
     for nvidia_package in nvidia-container-toolkit-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} nvidia-container-toolkit-base-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} libnvidia-container-tools-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} libnvidia-container1-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION}; do
       if ! dnf_install 30 1 600 $nvidia_package; then
@@ -80,11 +75,6 @@ installNvidiaContainerToolkit() {
       fi
     done
 
-    if [[ $OS_VERSION == "2.0" ]]; then
-      if ! dnf_install 30 1 600 nvidia-container-runtime-${MARINER_NVIDIA_CONTAINER_RUNTIME_VERSION}; then
-        exit $ERR_APT_INSTALL_TIMEOUT
-      fi
-    fi
 }
 
 enableNvidiaPersistenceMode() {
diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData
index 6f6200531b5..e31dcd03036 100644
--- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData
+++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData
@@ -58,7 +58,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    H4sIAAAAAAAC/8RYWW/buBZ+1684VQ20mSmlOIPpBWbiC/jGSsdo4gRech+CwKCpI5vXFKmSlFs38X+/oCTLS5yl04d5iR3yLN9ZeBa/fRNOuAwn1Mw8D9lMgT9QuWZcToEZHHNpLBViHHNjtQrMDBKl4ZJqLlH7nqcxVQs8U9JSdxK/P4J7DwCA1UfXlM3pFHs0xZa/OfYLMp7A7S00rgbjm6g/6F71oNUC/yQ49uHu7k+wM5QF3TMiUzVZkn25CS8+NFq9ZGk85sk4oVzkGqF5DL/Dx2OIZQIlfCBLaByU7q08r3JBBzNTWxfLZJzSOTLKZggPD4DfuIVG1O+P29fD8ei60x5G42H3MroaDWuOPIupPUDe6Q4cz6d+u7PL5HztGLMSEXAJjBKG2vKEM2rRAJshmxONxlJtgfHEkNxyYYAJlceES24J/Z5rJPNF5lworaZsTqxSjsh9F3zitBCaW5VSyxngxNKJQANoZ44QktwgTLkFLpXlybJi58qqDHimVW4ReGbQAs8q3v99gTlqiYLEuEABQk21ss4BwqgEZEozIhm1IGvMGU0h49PvkJmUGwbaLI1QUzDK0ZmlMZZacAZgqdKxEcFl/g2+fYfvPIOJUBOH9gRkUgHhhhleeIJTq3Sp60+IVZVZPIE3hZurSMNvx9CEj8fH0Nhy/l4y7kaw2xsM2xcXO8GrkzBWEr0fzPYDkadZRnWqNMmoNqhB8Mn6qLZ6y6q/adfrLKttq6yrTjav5TO1dOfFPDb9TQv85gHTn4Y9p5aSCrYhM2Xs3w9KiTZWX6VQNP50PepovkC9Afx26+/nqN+LLtbIW433uaQpAtHwAAZjeGdCEgbh9N1RQX426rRrYv+XceN+V8DqF7/OhydMZXlMSeN+W9Jqx9iXTS0tZBqpxd6Cx5wOlqngcj5UbVfOFpxhT8W4Mbl30+102+NOdDM++6vdb/mh4JMwj3ER6lygCeLwX00iC1nuURM2ozoorsqqa1XOZuA37vckrcpr94hPTyG6Ood/H6Zqnw2dz1o+jWP/A3Sim+v28K9Wyw8nuQkzxsO4DFNYovA/QH/U+7Xlh7nRRSer0DE7d/XCYgqlB2q8xJReMEBIdUWF8L3o6rwMys+K2noFpdvP6URzdkklnaJ+5Ox+9ybqb6UWyy2QGAiQBE7g9PQU/MZ7naVAvtAiLY78o7o5lBC3q0QFOil0krRUSja+3lG3eoK8KNhPMr2udO5C+8nque/SeuAYKiXm3NZevWz3u72oP66Qn131hu3iYHh1dfG5O9w8y2bQ/BiclIn5sj/r6aDofHNuSeP+tbpWTwuZUIM/JEnwyUFh5melNH9EwD+QAS4FULqGXmbANWrDjUXJ8FLFWCfAtYM4GEa9s6gzHkT9m+5ZND7vXkTjopL4IVoWls85rj7XDz3biIwDg9oVyO261rh/XvjqcZF7kQW825Hk9s7roGGaZ5Yr2Sr9D1smQodiqqT3XyqtaZVTUWCpnqL1vNtBifXOGy4zbCVKz7mcetE3ZAM3Fbb2K9q2oUDIAvVEGawYVHatjG0V9DoFohMIF1SHOj/I7/XL0bNFxVe6NJ532y0T4a4Ai/F/lq00F5aT3KBeY66LbRkBZgWUwYVnYlEPzs091vX0+zreTS0ZWCpjKpQ8tMAIxaiAGA3XGN84kUq2/MZ98w9StbO3GEyDD3sk8JULN+uqOQg+R7AzbqAZfAxOPpLfA5aeVBNCvx/1httlv0YALiCFqAeomoEPvmsHv9XjxsPi4eHd1v2vxX3zaFPNeAIG0wXqM5VmVCO4YWJH6R/EPw6Og2N/BY37XSNW+4+1WAxZrjVKK5ZQ+Q/jrZ0M1qgfKVoBNzAt+qMGO6MS3isN+CWnAqw6gjInwNXCLSF7iAIwc55lbi99JnpBGRkUBvfAV0zFXnsI8546v2bf33BfWkc3x+QZqT+y975+931OY8K912wGBxUdALSp33Wb6Ly0LKwhlMaTBIpivNHoviZ8GliVikBnqaELfOyOdPEqvmdoajBFTzG5xn4uWfXyy3SpfuEAd+HSl0sm8hhjNxLYGa5/ASmTlqduWFB6O7Mqz1JX0AMYrHN3vXC471TWZO5fp8ovRnaBVI6yAzuJq8f9BBqfrkfjTjQYQqgyG06zfHuX2aTquVZplQi1iNK8Z2lBKgs8zQSm6Cp4MRml6598ntQ06l+8Ssuof/GihreuQfw/AAD//+EnpF6cEgAA
 
 - path: /opt/azure/containers/provision_configs.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line61.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line61.sh
index 92369c47c45..d39a61b7a57 100644
--- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line61.sh
+++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line61.sh
@@ -67,12 +67,7 @@ installNvidiaFabricManager() {
 }
 
 installNvidiaContainerToolkit() {
-    MARINER_NVIDIA_CONTAINER_RUNTIME_VERSION="3.13.0"
-    MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.15.0"
-
-    if [[ $OS_VERSION == "2.0" ]]; then
-      MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.13.5"
-    fi
+    MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.16.2"
     
     for nvidia_package in nvidia-container-toolkit-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} nvidia-container-toolkit-base-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} libnvidia-container-tools-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} libnvidia-container1-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION}; do
       if ! dnf_install 30 1 600 $nvidia_package; then
@@ -80,11 +75,6 @@ installNvidiaContainerToolkit() {
       fi
     done
 
-    if [[ $OS_VERSION == "2.0" ]]; then
-      if ! dnf_install 30 1 600 nvidia-container-runtime-${MARINER_NVIDIA_CONTAINER_RUNTIME_VERSION}; then
-        exit $ERR_APT_INSTALL_TIMEOUT
-      fi
-    fi
 }
 
 enableNvidiaPersistenceMode() {
diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData
index 6f6200531b5..e31dcd03036 100644
--- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData
+++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData
@@ -58,7 +58,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 - path: /opt/azure/containers/provision_configs.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line61.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line61.sh
index 92369c47c45..d39a61b7a57 100644
--- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line61.sh
+++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line61.sh
@@ -67,12 +67,7 @@ installNvidiaFabricManager() {
 }
 
 installNvidiaContainerToolkit() {
-    MARINER_NVIDIA_CONTAINER_RUNTIME_VERSION="3.13.0"
-    MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.15.0"
-
-    if [[ $OS_VERSION == "2.0" ]]; then
-      MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.13.5"
-    fi
+    MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION="1.16.2"
     
     for nvidia_package in nvidia-container-toolkit-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} nvidia-container-toolkit-base-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} libnvidia-container-tools-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION} libnvidia-container1-${MARINER_NVIDIA_CONTAINER_TOOLKIT_VERSION}; do
       if ! dnf_install 30 1 600 $nvidia_package; then
@@ -80,11 +75,6 @@ installNvidiaContainerToolkit() {
       fi
     done
 
-    if [[ $OS_VERSION == "2.0" ]]; then
-      if ! dnf_install 30 1 600 nvidia-container-runtime-${MARINER_NVIDIA_CONTAINER_RUNTIME_VERSION}; then
-        exit $ERR_APT_INSTALL_TIMEOUT
-      fi
-    fi
 }
 
 enableNvidiaPersistenceMode() {