diff --git a/build/templates/dotnet-install-linux.yml b/build/templates/dotnet-install-linux.yml
index 6dc587464..9edfc3147 100644
--- a/build/templates/dotnet-install-linux.yml
+++ b/build/templates/dotnet-install-linux.yml
@@ -11,10 +11,19 @@ steps:
       version: ${{ parameters.DotNetVersion }}
       includePreviewVersions: true
 
-  - template: jdk-setup.yml
+  - bash: |
+      ubuntu_release=`lsb_release -rs`
+      wget https://packages.microsoft.com/config/ubuntu/${ubuntu_release}/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
+      sudo dpkg -i packages-microsoft-prod.deb
+      sudo apt-get install apt-transport-https
+      sudo apt-get update
+      sudo apt-get install -y msopenjdk-11
+      sudo update-java-alternatives --set msopenjdk-11-amd64
+    displayName: Install OpenJDK 11
+    retryCountOnTaskFailure: 3
 
   - bash: |
       dotnet tool update --global uno.check --version ${{ parameters.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
-      uno-check --ci --non-interactive --fix --skip androidsdk --skip gtk3 --skip xcode --skip vswin --skip vsmac --pre-major
+      uno-check --verbose --ci --non-interactive --fix --skip gtk3 --skip androidsdk --pre-major
     displayName: Install .NET Workloads
-    condition: eq(variables['Agent.OS'], 'Darwin')
+    condition: eq(variables['Agent.OS'], 'Linux')
diff --git a/build/templates/dotnet-install-windows.yml b/build/templates/dotnet-install-windows.yml
index 782364fa0..0db86d4d5 100644
--- a/build/templates/dotnet-install-windows.yml
+++ b/build/templates/dotnet-install-windows.yml
@@ -22,20 +22,9 @@ steps:
       version: ${{ parameters.DotNetVersion }}
       includePreviewVersions: true
 
-  - bash: |
-      ubuntu_release=`lsb_release -rs`
-      wget https://packages.microsoft.com/config/ubuntu/${ubuntu_release}/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
-      sudo dpkg -i packages-microsoft-prod.deb
-      sudo apt-get install apt-transport-https
-      sudo apt-get update
-      sudo apt-get install -y msopenjdk-11
-      sudo update-java-alternatives --set msopenjdk-11-amd64
-    displayName: Install OpenJDK 11
-    retryCountOnTaskFailure: 3
-
   - powershell: |
       & dotnet tool update --global uno.check --version ${{ parameters.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
-      & uno-check --verbose --ci --non-interactive --fix --skip gtk3 --skip androidsdk --pre-major
+      & uno-check -v --ci --non-interactive --fix --skip xcode --skip gtk3 --skip vswin --skip androidemulator --skip androidsdk --skip vsmac --pre-major
     displayName: Install .NET Workloads
     errorActionPreference: continue
     ignoreLASTEXITCODE: true