diff --git a/images/linux/scripts/installers/Install-Toolset.ps1 b/images/linux/scripts/installers/Install-Toolset.ps1
index 618669dd6..fb5d18255 100644
--- a/images/linux/scripts/installers/Install-Toolset.ps1
+++ b/images/linux/scripts/installers/Install-Toolset.ps1
@@ -28,7 +28,7 @@ $ErrorActionPreference = "Stop"
 
 # Get toolset content
 $toolsetJson = Get-Content -Path "$env:INSTALLER_SCRIPT_FOLDER/toolset.json" -Raw
-$toolsToInstall = @("Python", "Node")
+$toolsToInstall = @("Python", "Node", "Boost")
 $tools = ConvertFrom-Json -InputObject $toolsetJson | Select-Object -ExpandProperty toolcache | Where {$ToolsToInstall -contains $_.Name}
 
 foreach ($tool in $tools) {
diff --git a/images/linux/scripts/installers/Validate-Toolset.ps1 b/images/linux/scripts/installers/Validate-Toolset.ps1
index ddb23e929..dfb1811c7 100644
--- a/images/linux/scripts/installers/Validate-Toolset.ps1
+++ b/images/linux/scripts/installers/Validate-Toolset.ps1
@@ -45,8 +45,8 @@ foreach($tool in $tools) {
 
     foreach ($version in $tool.versions) {
         # Add wildcard if missing
-        if (-not $version.Contains('*')) {
-            $version += '.*'
+        if ($version.Split(".").Length -lt 3) {
+            $version += ".*"
         }
 
         # Check if version folder exists
@@ -62,9 +62,10 @@ foreach($tool in $tools) {
                         | Select-Object -First 1
         $foundVersionPath = Join-Path $foundVersion $tool.arch
 
-        Write-Host "Run validation test for $($tool.name)($($tool.arch)) $($foundVersion.name) executables..."
-        Run-ExecutableTests -Executables $toolExecs -ToolPath $foundVersionPath
-
+        if ($toolExecs) {
+            Write-Host "Run validation test for $($tool.name)($($tool.arch)) $($foundVersion.name) executables..."
+            Run-ExecutableTests -Executables $toolExecs -ToolPath $foundVersionPath
+        }
         $foundVersionName = $foundVersion.name
         if ($tool.name -eq 'PyPy')
         {
diff --git a/images/linux/scripts/installers/boost.sh b/images/linux/scripts/installers/boost.sh
index 5cdae6a0c..8f05054dd 100644
--- a/images/linux/scripts/installers/boost.sh
+++ b/images/linux/scripts/installers/boost.sh
@@ -4,12 +4,10 @@
 ##  Desc:  Installs Boost C++ Libraries
 ################################################################################
 
-# Source the helpers for use with the script
-source $HELPER_SCRIPTS/document.sh
-
-TOOLSET_PATH="$INSTALLER_SCRIPT_FOLDER/toolcache.json"
-BOOST_LIB=/usr/local/share/boost
-BOOST_VERSIONS=$(cat $TOOLSET_PATH | jq -r 'to_entries[] | select(.key | match("boost")) | .value[] +".0"')
+TOOLSET_PATH="$INSTALLER_SCRIPT_FOLDER/toolset.json"
+BOOST_LIB="$AGENT_TOOLSDIRECTORY/boost"
+BOOST_VERSIONS=$(cat $TOOLSET_PATH | jq -r '.toolcache[] | select(.name | contains("boost")) | .versions[]')
+BOOST_ARCH=$(cat $TOOLSET_PATH | jq -r '.toolcache[] | select(.name | contains("boost")) | .arch')
 
 # Install Boost
 for BOOST_VERSION in ${BOOST_VERSIONS}
@@ -17,6 +15,5 @@ do
     BOOST_SYMLINK_VER=$(echo "${BOOST_VERSION//[.]/_}")
     BOOST_ROOT_VERSION="BOOST_ROOT_$BOOST_SYMLINK_VER"
 
-    echo "$BOOST_ROOT_VERSION=$BOOST_LIB/$BOOST_VERSION" | tee -a /etc/environment
-    DocumentInstalledItem "Boost C++ Libraries $BOOST_VERSION"
+    echo "$BOOST_ROOT_VERSION=$BOOST_LIB/$BOOST_VERSION/$BOOST_ARCH" | tee -a /etc/environment
 done
diff --git a/images/linux/toolcache-1604.json b/images/linux/toolcache-1604.json
index e3c9f93ea..5c1d3c9a0 100644
--- a/images/linux/toolcache-1604.json
+++ b/images/linux/toolcache-1604.json
@@ -1,8 +1,5 @@
 {
     "@actions/toolcache-ruby-ubuntu-1604-x64": [
         "2.4", "2.5", "2.6", "2.7"
-    ],
-    "@actions/toolcache-boost-ubuntu-1604-x64": [
-        "1.69", "1.72"
     ]
 }
\ No newline at end of file
diff --git a/images/linux/toolcache-1804.json b/images/linux/toolcache-1804.json
index f7d9957e9..2f4deeba4 100644
--- a/images/linux/toolcache-1804.json
+++ b/images/linux/toolcache-1804.json
@@ -1,8 +1,5 @@
 {
     "@actions/toolcache-ruby-ubuntu-1804-x64": [
         "2.4", "2.5", "2.6", "2.7"
-    ],
-    "@actions/toolcache-boost-ubuntu-1804-x64": [
-        "1.69", "1.72"
     ]
 }
\ No newline at end of file
diff --git a/images/linux/toolset-1604.json b/images/linux/toolset-1604.json
index 577e69ffa..281e625fd 100644
--- a/images/linux/toolset-1604.json
+++ b/images/linux/toolset-1604.json
@@ -34,6 +34,17 @@
                 "12.*",
                 "14.*"
             ]
+        },
+        {
+            "name": "boost",
+            "url" : "https://raw.githubusercontent.com/actions/boost-versions/master/versions-manifest.json",
+            "platform" : "linux",
+            "platform_version": "16.04",
+            "arch": "x64",
+            "versions": [
+                "1.69.0",
+                "1.72.0"
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/images/linux/toolset-1804.json b/images/linux/toolset-1804.json
index ecb72b2be..e48b1ad1f 100644
--- a/images/linux/toolset-1804.json
+++ b/images/linux/toolset-1804.json
@@ -34,6 +34,17 @@
                 "12.*",
                 "14.*"
             ]
+        },
+        {
+            "name": "boost",
+            "url" : "https://raw.githubusercontent.com/actions/boost-versions/master/versions-manifest.json",
+            "platform" : "linux",
+            "platform_version": "18.04",
+            "arch": "x64",
+            "versions": [
+                "1.69.0",
+                "1.72.0"
+            ]
         }
     ]
 }
\ No newline at end of file