diff --git a/netci.groovy b/netci.groovy
index ae1e2f4a38638e8c684d867479e5b670180f44eb..8821f1d6920ebc386abc0c60f3dcf5ef89b56392 100644
--- a/netci.groovy
+++ b/netci.groovy
@@ -71,18 +71,18 @@ set TMP=%TEMP%
 
       def triggerPhraseOnly = false
       def triggerPhraseExtra = ""
-      Utilities.setMachineAffinity(myJob, 'Windows_NT', 'latest-or-auto-dev15')
+      Utilities.setMachineAffinity(myJob, 'Windows_NT', 'latest-or-auto-dev15-0')
       Utilities.addXUnitDotNETResults(myJob, '**/xUnitResults/*.xml')
       addRoslynJob(myJob, jobName, branchName, isPr, triggerPhraseExtra, triggerPhraseOnly)
     }
   }
 }
 
-// Linux
+// Ubuntu 14.04
 commitPullList.each { isPr -> 
-  def jobName = Utilities.getFullJobName(projectName, "linux_debug", isPr)
+  def jobName = Utilities.getFullJobName(projectName, "ubuntu_14_debug", isPr)
   def myJob = job(jobName) {
-    description("Linux tests")
+    description("Ubuntu 14.04 tests")
                   steps {
                     shell("./cibuild.sh --nocache --debug")
                   }
@@ -95,6 +95,23 @@ commitPullList.each { isPr ->
   addRoslynJob(myJob, jobName, branchName, isPr, triggerPhraseExtra, triggerPhraseOnly)
 }
 
+// Ubuntu 16.04
+commitPullList.each { isPr -> 
+  def jobName = Utilities.getFullJobName(projectName, "ubuntu_16_debug", isPr)
+  def myJob = job(jobName) {
+    description("Ubuntu 16.04 tests")
+                  steps {
+                    shell("./cibuild.sh --nocache --debug")
+                  }
+                }
+
+  def triggerPhraseOnly = false
+  def triggerPhraseExtra = "linux"
+  Utilities.setMachineAffinity(myJob, 'Ubuntu16.04', 'latest-or-auto')
+  Utilities.addXUnitDotNETResults(myJob, '**/xUnitResults/*.xml')
+  addRoslynJob(myJob, jobName, branchName, isPr, triggerPhraseExtra, triggerPhraseOnly)
+}
+
 // Mac
 commitPullList.each { isPr -> 
   def jobName = Utilities.getFullJobName(projectName, "mac_debug", isPr)
@@ -127,7 +144,7 @@ set TMP=%TEMP%
 
   def triggerPhraseOnly = false
   def triggerPhraseExtra = "determinism"
-  Utilities.setMachineAffinity(myJob, 'Windows_NT', 'latest-or-auto-dev15')
+  Utilities.setMachineAffinity(myJob, 'Windows_NT', 'latest-or-auto-dev15-0')
   addRoslynJob(myJob, jobName, branchName, isPr, triggerPhraseExtra, triggerPhraseOnly)
 }
 
@@ -146,7 +163,7 @@ set TMP=%TEMP%
 
   def triggerPhraseOnly = false
   def triggerPhraseExtra = ""
-  Utilities.setMachineAffinity(myJob, 'Windows_NT', 'latest-or-auto-dev15')
+  Utilities.setMachineAffinity(myJob, 'Windows_NT', 'latest-or-auto-dev15-0')
   addRoslynJob(myJob, jobName, branchName, isPr, triggerPhraseExtra, triggerPhraseOnly)
 }
 
@@ -162,7 +179,7 @@ commitPullList.each { isPr ->
 
   def triggerPhraseOnly = false
   def triggerPhraseExtra = "perf-correctness"
-  Utilities.setMachineAffinity(myJob, 'Windows_NT', 'latest-or-auto-dev15')
+  Utilities.setMachineAffinity(myJob, 'Windows_NT', 'latest-or-auto-dev15-0')
   addRoslynJob(myJob, jobName, branchName, isPr, triggerPhraseExtra, triggerPhraseOnly)
 }
 
@@ -197,9 +214,9 @@ set TMP=%TEMP%
         }
       }
 
-      def triggerPhraseOnly = true
+      def triggerPhraseOnly = false
       def triggerPhraseExtra = ""
-      Utilities.setMachineAffinity(myJob, 'Windows_NT', 'latest-or-auto-dev15-rc')
+      Utilities.setMachineAffinity(myJob, 'Windows_NT', 'latest-or-auto-dev15-0')
       Utilities.addXUnitDotNETResults(myJob, '**/xUnitResults/*.xml')
       addRoslynJob(myJob, jobName, branchName, isPr, triggerPhraseExtra, triggerPhraseOnly)
     }