diff --git a/.github/workflows/monodevelop.yml b/.github/workflows/monodevelop.yml
index fa4db4eedd3..bb357306dd0 100644
--- a/.github/workflows/monodevelop.yml
+++ b/.github/workflows/monodevelop.yml
@@ -11,16 +11,124 @@ on:
       - '*'
 
 jobs:
-  linux:
-
-    runs-on: ubuntu-20.04
+  ubuntu2004:  
+    runs-on: ubuntu-latest
+    container:
+      image: "ubuntu:20.04"
+    steps:
+    - name: Dependencies
+      run: |
+        apt-get update
+        apt-get install -y sudo        
+        sudo apt-get update
+        sudo apt-get install -y wget
+        wget https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
+        sudo dpkg -i packages-microsoft-prod.deb
+        sudo apt-get install -y apt-transport-https
+        sudo apt-get update
+        sudo apt-get install -y dotnet-sdk-3.1
+        sudo apt-get install -y gnupg ca-certificates
+        sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
+        echo "deb https://download.mono-project.com/repo/ubuntu stable-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list
+        sudo apt-get update
+        sudo apt-get install -y sed build-essential intltool fsharp gtk-sharp2
+        sudo apt-get install -y software-properties-common
+        sudo add-apt-repository ppa:git-core/ppa -y
+        sudo apt-get update
+        sudo apt-get install -y git
+      shell: bash
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Verify toolchain versions
+      run: |
+        git --version
+        make --version
+        msbuild -version
+      shell: bash
+    - name: Configure and build
+      run: |
+        ./configure --profile=gnome
+        make
+      shell: bash
 
+  ubuntu1804:  
+    runs-on: ubuntu-latest
+    container:
+      image: ubuntu:18.04
     steps:
+    - name: Dependencies
+      run: |
+        apt-get update
+        apt-get install -y sudo        
+        sudo apt-get update
+        sudo apt-get install -y wget
+        wget https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
+        sudo dpkg -i packages-microsoft-prod.deb
+        sudo apt-get install -y apt-transport-https
+        sudo apt-get update
+        sudo apt-get install -y dotnet-sdk-3.1
+        sudo apt-get install -y gnupg ca-certificates
+        sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
+        echo "deb https://download.mono-project.com/repo/ubuntu stable-bionic main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list
+        sudo apt-get update
+        sudo apt-get install -y sed build-essential intltool fsharp gtk-sharp2
+        sudo apt-get install -y software-properties-common
+        sudo add-apt-repository ppa:git-core/ppa -y
+        sudo apt-get update
+        sudo apt-get install -y git
+      shell: bash
     - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Verify toolchain versions
+      run: |
+        git --version
+        make --version
+        msbuild -version
+      shell: bash
+    - name: Configure and build
+      run: |
+        ./configure --profile=gnome
+        make
+      shell: bash
+
+  ubuntu1604:  
+    runs-on: ubuntu-latest
+    container:
+      image: ubuntu:16.04
+    steps:
     - name: Dependencies
       run: |
-        sudo apt install intltool fsharp gtk-sharp2
+        apt-get update
+        apt-get install -y sudo        
+        sudo apt-get update
+        sudo apt-get install -y wget
+        wget https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
+        sudo dpkg -i packages-microsoft-prod.deb
+        sudo apt-get install -y apt-transport-https
+        sudo apt-get update
+        sudo apt-get install -y dotnet-sdk-3.1
+        sudo apt-get install -y gnupg ca-certificates
+        sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
+        echo "deb https://download.mono-project.com/repo/ubuntu stable-xenial main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list
+        sudo apt-get update
+        sudo apt-get install -y sed build-essential intltool fsharp gtk-sharp2
+        sudo apt-get install -y software-properties-common
+        sudo add-apt-repository ppa:git-core/ppa -y
+        sudo apt-get update
+        sudo apt-get install -y git
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Verify toolchain versions
+      run: |
+        git --version
+        make --version
+        msbuild -version
+      shell: bash
     - name: Configure and build
       run: |
         ./configure --profile=gnome
         make
+      shell: bash 
diff --git a/Makefile b/Makefile
index e763f2e2c88..63edac128b0 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ MSBUILD_LIBRARIES=Microsoft.Build.dll Microsoft.Build.Framework.dll Microsoft.Bu
 MSBUILD_DLLS=$(patsubst %, $(MSBUILD_PATH)/%, $(MSBUILD_LIBRARIES))
 
 # Set $PATH to point to provisioned .NET Core and avoid the ones provisioned by VSTS itself
-all: export PATH:="/usr/local/share/dotnet:$(PATH)"
+all: export PATH:=/usr/local/share/dotnet:$(PATH)
 all: print_config update_submodules all-recursive
 
 GIT_FOUND = $$(echo $$(which git))