diff --git a/images/linux/scripts/installers/docker-moby.sh b/images/linux/scripts/installers/docker-moby.sh
index 1f371a8cb..8fe8d1343 100644
--- a/images/linux/scripts/installers/docker-moby.sh
+++ b/images/linux/scripts/installers/docker-moby.sh
@@ -16,16 +16,22 @@ if ! IsInstalled $docker_package; then
     apt-get remove -y moby-engine moby-cli
     apt-get update
     apt-get install -y moby-engine moby-cli
+    apt-get install --no-install-recommends -y moby-buildx
 else
     echo "Docker ($docker_package) is already installed"
 fi
 
 # Run tests to determine that the software installed as expected
 echo "Testing to make sure that script performed as expected, and basic scenarios work"
+echo "Checking the docker-moby and moby-buildx"
 if ! command -v docker; then
     echo "docker was not installed"
     exit 1
+elif ! [[ $(docker buildx) ]]; then
+    echo "Docker-Buildx was not installed"
+    exit 1
 else
+    echo "Docker-moby and Docker-buildx checking the successfull"
     # Docker daemon takes time to come up after installing
     sleep 10
     set -e
@@ -50,3 +56,7 @@ docker pull ubuntu:14.04
 echo "Documenting Docker version"
 docker_version=$(docker -v)
 DocumentInstalledItem "Docker-Moby ($docker_version)"
+
+echo "Documenting Docker-buildx version"
+DOCKER_BUILDX_VERSION=$(docker buildx version | cut -d ' ' -f2)
+DocumentInstalledItem "Docker-Buildx ($DOCKER_BUILDX_VERSION)"