diff --git a/images/linux/scripts/installers/dotnetcore-sdk.sh b/images/linux/scripts/installers/dotnetcore-sdk.sh
index 1af226e72..31210b6ef 100644
--- a/images/linux/scripts/installers/dotnetcore-sdk.sh
+++ b/images/linux/scripts/installers/dotnetcore-sdk.sh
@@ -10,8 +10,8 @@ source $HELPER_SCRIPTS/os.sh
 
 # Ubuntu 20 doesn't support EOL versions
 toolset="$INSTALLER_SCRIPT_FOLDER/toolset.json"
-LATEST_DOTNET_PACKAGES=$(jq -r '.dotnetCoreSdk.latest_dotnet_packages[]' $toolset)
-release_urls=$(jq -r '.dotnetCoreSdk.release_urls[]' $toolset)
+LATEST_DOTNET_PACKAGES=$(jq -r '.dotnet.aptPackages[]' $toolset)
+versions=$(jq -r '.dotnet.versions[]' $toolset)
 
 mksamples()
 {
@@ -44,7 +44,8 @@ done
 
 # Get list of all released SDKs from channels which are not end-of-life or preview
 sdks=()
-for release_url in ${release_urls[@]}; do
+for version in ${versions[@]}; do
+    release_url="https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/${version}/releases.json"
     echo "${release_url}"
     releases=$(curl "${release_url}")
     sdks=("${sdks[@]}" $(echo "${releases}" | jq '.releases[]' | jq '.sdk.version'))
diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json
index 6972fe94d..4ba7b456b 100644
--- a/images/linux/toolsets/toolset-1604.json
+++ b/images/linux/toolsets/toolset-1604.json
@@ -189,18 +189,17 @@
             "ubuntu:14.04"
         ]
     },
-    "dotnetCoreSdk": {
-        "latest_dotnet_packages": [
+    "dotnet": {
+        "aptPackages": [
             "dotnet-sdk-3.0",
             "dotnet-sdk-3.1",
             "dotnet-sdk-5.0"
         ],
-        "release_urls": [
-            "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.1/releases.json",
-            "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.0/releases.json",
-            "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.1/releases.json",
-            "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/5.0/releases.json"
-
+        "versions": [
+            "2.1",
+            "3.0",
+            "3.1",
+            "5.0"
         ]
     }
 }
diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json
index 74fa3d059..7a9b2788a 100644
--- a/images/linux/toolsets/toolset-1804.json
+++ b/images/linux/toolsets/toolset-1804.json
@@ -193,17 +193,17 @@
             "cmd": "sam"
         }
     ],
-    "dotnetCoreSdk": {
-        "latest_dotnet_packages": [
+    "dotnet": {
+        "aptPackages": [
             "dotnet-sdk-3.0",
             "dotnet-sdk-3.1",
             "dotnet-sdk-5.0"
         ],
-        "release_urls": [
-            "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.1/releases.json",
-            "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.0/releases.json",
-            "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.1/releases.json",
-            "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/5.0/releases.json"
+        "versions": [
+            "2.1",
+            "3.0",
+            "3.1",
+            "5.0"
         ]
     }
 }
diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json
index 9531e3fb5..37e7ade9f 100644
--- a/images/linux/toolsets/toolset-2004.json
+++ b/images/linux/toolsets/toolset-2004.json
@@ -167,15 +167,15 @@
             "cmd": "sam"
         }
     ],
-    "dotnetCoreSdk": {
-        "latest_dotnet_packages": [
+    "dotnet": {
+        "aptPackages": [
             "dotnet-sdk-3.1",
             "dotnet-sdk-5.0"
         ],
-        "release_urls": [
-            "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.1/releases.json",
-            "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/3.1/releases.json",
-            "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/5.0/releases.json"
+        "versions": [
+            "2.1",
+            "3.1",
+            "5.0"
         ]
     }
 }