diff --git a/images/linux/scripts/installers/dotnetcore-sdk.sh b/images/linux/scripts/installers/dotnetcore-sdk.sh
index e3762e1c5..06323d0ef 100644
--- a/images/linux/scripts/installers/dotnetcore-sdk.sh
+++ b/images/linux/scripts/installers/dotnetcore-sdk.sh
@@ -12,7 +12,9 @@ source $HELPER_SCRIPTS/os.sh
 if isUbuntu20 ; then
     LATEST_DOTNET_PACKAGES=("dotnet-sdk-3.1")
     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")
-else
+fi
+
+if isUbuntu16 || isUbuntu18 ; then
     LATEST_DOTNET_PACKAGES=("dotnet-sdk-3.0" "dotnet-sdk-3.1")
     release_urls=("https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.1/releases.json" "https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/2.2/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")
 fi
diff --git a/images/linux/toolcache-2004.json b/images/linux/toolcache-2004.json
deleted file mode 100644
index 26ad4d98e..000000000
--- a/images/linux/toolcache-2004.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "@actions/toolcache-python-ubuntu-1804-x64": [
-        "2.7", "3.5", "3.6", "3.7", "3.8"
-    ],
-    "@actions/toolcache-ruby-ubuntu-1804-x64": [
-        "2.4", "2.5", "2.6", "2.7"
-    ],
-    "@actions/toolcache-pypy-ubuntu-1804-x64": [
-        "2", "3"
-    ],
-    "@actions/toolcache-boost-ubuntu-1804-x64": [
-        "1.69", "1.72"
-    ]
-}
\ No newline at end of file