diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0774ed4a770..750cd0b5db0 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -21,18 +21,21 @@ variables:
     value: Products/$(System.TeamProject)/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildNumber)
 
 jobs:
-- template: /eng/common/templates/jobs/jobs.yml
-  parameters:
-    enableMicrobuild: true
-    enablePublishBuildArtifacts: true
-    enablePublishTestResults: false
-    enablePublishBuildAssets: true
-    enablePublishUsingPipelines: $(_PublishUsingPipelines)
-    enableTelemetry: true
-    helixRepo: microsoft/visualfsharp
-    jobs:
-    # Full-signed internal build
-    - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+
+#---------------------------------------------------------------------------------------------------------------------#
+#                                                   Signed build                                                      #
+#---------------------------------------------------------------------------------------------------------------------#
+- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+  - template: /eng/common/templates/jobs/jobs.yml
+    parameters:
+      enableMicrobuild: true
+      enablePublishBuildArtifacts: true
+      enablePublishTestResults: false
+      enablePublishBuildAssets: true
+      enablePublishUsingPipelines: $(_PublishUsingPipelines)
+      enableTelemetry: true
+      helixRepo: dotnet/fsharp
+      jobs:
       - job: Full_Signed
         pool:
           name: NetCoreInternal-Pool
@@ -68,12 +71,22 @@ jobs:
                   /p:PublishToSymbolServer=true
                   /p:VisualStudioDropName=$(VisualStudioDropName)
 
-    #-----------------------------------------------------------------------------------------------------------------#
-    #                                                   PR builds                                                     #
-    #-----------------------------------------------------------------------------------------------------------------#
+#---------------------------------------------------------------------------------------------------------------------#
+#                                                     PR builds                                                       #
+#---------------------------------------------------------------------------------------------------------------------#
+- ${{ if eq(variables['System.TeamProject'], 'public') }}:
+  - template: /eng/common/templates/jobs/jobs.yml
+    parameters:
+      enableMicrobuild: true
+      enablePublishBuildArtifacts: true
+      enablePublishTestResults: false
+      enablePublishBuildAssets: true
+      enablePublishUsingPipelines: $(_PublishUsingPipelines)
+      enableTelemetry: true
+      helixRepo: dotnet/fsharp
+      jobs:
 
-    # Windows
-    - ${{ if eq(variables['System.TeamProject'], 'public') }}:
+      # Windows
       - job: Windows
         pool:
           vmImage: windows-2019
@@ -99,25 +112,23 @@ jobs:
         - script: eng\CIBuild.cmd -configuration $(_configuration) -$(_testKind)
           displayName: Build / Test
 
-    # Windows FCS
-    - ${{ if eq(variables['System.TeamProject'], 'public') }}:
-      - job: Windows_FCS
+      # Linux
+      - job: Linux
         pool:
-          vmImage: windows-2019
+          vmImage: ubuntu-16.04
         variables:
         - name: _SignType
           value: Test
         steps:
         - checkout: self
           clean: true
-        - script: fcs\build.cmd TestAndNuget
+        - script: ./eng/cibuild.sh --configuration $(_BuildConfig) --testcoreclr
           displayName: Build / Test
 
-    # Linux
-    - ${{ if eq(variables['System.TeamProject'], 'public') }}:
-      - job: Linux
+      # MacOS
+      - job: MacOS
         pool:
-          vmImage: ubuntu-16.04
+          vmImage: macOS-10.13
         variables:
         - name: _SignType
           value: Test
@@ -127,66 +138,73 @@ jobs:
         - script: ./eng/cibuild.sh --configuration $(_BuildConfig) --testcoreclr
           displayName: Build / Test
 
-    # Linux FCS
-    - ${{ if eq(variables['System.TeamProject'], 'public') }}:
-      - job: Linux_FCS
+      # Source Build Linux
+      - job: SourceBuild_Linux
         pool:
           vmImage: ubuntu-16.04
-        variables:
-        - name: _SignType
-          value: Test
         steps:
         - checkout: self
           clean: true
-        - script: ./fcs/build.sh Build
+        - script: ./eng/cibuild.sh --configuration Release /p:DotNetBuildFromSource=true /p:FSharpSourceBuild=true
           displayName: Build
 
-    # MacOS
-    - ${{ if eq(variables['System.TeamProject'], 'public') }}:
-      - job: MacOS
+      # Source Build Windows
+      - job: SourceBuild_Windows
         pool:
-          vmImage: macOS-10.13
-        variables:
-        - name: _SignType
-          value: Test
+          vmImage: windows-2019
         steps:
         - checkout: self
           clean: true
-        - script: ./eng/cibuild.sh --configuration $(_BuildConfig) --testcoreclr
-          displayName: Build / Test
+        - script: eng\CIBuild.cmd -configuration Release -noSign /p:DotNetBuildFromSource=true /p:FSharpSourceBuild=true
+          displayName: Build
 
-    # MacOS FCS
-    - ${{ if eq(variables['System.TeamProject'], 'public') }}:
-      - job: MacOS_FCS
+#---------------------------------------------------------------------------------------------------------------------#
+#                                                    FCS builds                                                       #
+#---------------------------------------------------------------------------------------------------------------------#
+
+- ${{ if eq(variables['System.TeamProject'], 'public') }}:
+  - template: /eng/common/templates/jobs/jobs.yml
+    parameters:
+      enableMicrobuild: true
+      enablePublishTestResults: false
+      enablePublishBuildAssets: true
+      enablePublishUsingPipelines: false
+      enableTelemetry: true
+      helixRepo: dotnet/fsharp
+      jobs:
+
+      - job: Windows_FCS
         pool:
-          vmImage: macOS-10.13
+          vmImage: windows-2019
         variables:
         - name: _SignType
           value: Test
         steps:
         - checkout: self
           clean: true
-        - script: ./fcs/build.sh Build
-          displayName: Build
+        - script: fcs\build.cmd TestAndNuget
+          displayName: Build / Test
 
-    # Source Build Linux
-    - ${{ if eq(variables['System.TeamProject'], 'public') }}:
-      - job: SourceBuild_Linux
+      - job: Linux_FCS
         pool:
           vmImage: ubuntu-16.04
+        variables:
+        - name: _SignType
+          value: Test
         steps:
         - checkout: self
           clean: true
-        - script: ./eng/cibuild.sh --configuration Release /p:DotNetBuildFromSource=true /p:FSharpSourceBuild=true
+        - script: ./fcs/build.sh Build
           displayName: Build
 
-    # Source Build Windows
-    - ${{ if eq(variables['System.TeamProject'], 'public') }}:
-      - job: SourceBuild_Windows
+      - job: MacOS_FCS
         pool:
-          vmImage: windows-2019
+          vmImage: macOS-10.13
+        variables:
+        - name: _SignType
+          value: Test
         steps:
         - checkout: self
           clean: true
-        - script: eng\CIBuild.cmd -configuration Release -noSign /p:DotNetBuildFromSource=true /p:FSharpSourceBuild=true
+        - script: ./fcs/build.sh Build
           displayName: Build