diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 32fd8737..401c927d 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -23,10 +23,6 @@ phases:
     buildMatrix:
       Py36:
         _configuration: RlsMacPy3.6
-      Py35:
-        _configuration: RlsMacPy3.5
-      Py27:
-        _configuration: RlsMacPy2.7
     buildQueue:
       name: Hosted macOS
 
@@ -38,27 +34,8 @@ phases:
     buildScript: ./build.sh
     testDistro: ubuntu16
     buildMatrix:
-      Py36:
-        _configuration: RlsLinPy3.6
       Py35:
         _configuration: RlsLinPy3.5
-      Py27:
-        _configuration: RlsLinPy2.7
-    buildQueue:
-      name: Hosted Ubuntu 1604
-  # Run tests on Ubuntu14
-- template: /build/ci/phase-template.yml
-  parameters:
-    name: Linux_Ubuntu14
-    buildScript: ./build.sh
-    testDistro: ubuntu14
-    buildMatrix:
-      Py36:
-        _configuration: RlsLinPy3.6
-      Py35:
-        _configuration: RlsLinPy3.5
-      Py27:
-        _configuration: RlsLinPy2.7
     buildQueue:
       name: Hosted Ubuntu 1604
   # Run tests on CentOS7
@@ -68,10 +45,6 @@ phases:
     buildScript: ./build.sh
     testDistro: centos7
     buildMatrix:
-      Py36:
-        _configuration: RlsLinPy3.6
-      Py35:
-        _configuration: RlsLinPy3.5
       Py27:
         _configuration: RlsLinPy2.7
     buildQueue:
diff --git a/build/vsts-ci-nightly.yml b/build/vsts-ci-nightly.yml
new file mode 100644
index 00000000..32fd8737
--- /dev/null
+++ b/build/vsts-ci-nightly.yml
@@ -0,0 +1,78 @@
+phases:
+
+# Build all configurations for Windows
+- template: /build/ci/phase-template.yml
+  parameters:
+    name: Windows
+    buildScript: build.cmd
+    buildMatrix:
+      Py36:
+        _configuration: RlsWinPy3.6
+      Py35:
+        _configuration: RlsWinPy3.5
+      Py27:
+        _configuration: RlsWinPy2.7
+    buildQueue:
+      name: Hosted VS2017
+
+# Build all configurations for Mac
+- template: /build/ci/phase-template.yml
+  parameters:
+    name: Mac
+    buildScript: ./build.sh
+    buildMatrix:
+      Py36:
+        _configuration: RlsMacPy3.6
+      Py35:
+        _configuration: RlsMacPy3.5
+      Py27:
+        _configuration: RlsMacPy2.7
+    buildQueue:
+      name: Hosted macOS
+
+# Build all configurations for Linux
+  # Run tests on Ubuntu16
+- template: /build/ci/phase-template.yml
+  parameters:
+    name: Linux_Ubuntu16
+    buildScript: ./build.sh
+    testDistro: ubuntu16
+    buildMatrix:
+      Py36:
+        _configuration: RlsLinPy3.6
+      Py35:
+        _configuration: RlsLinPy3.5
+      Py27:
+        _configuration: RlsLinPy2.7
+    buildQueue:
+      name: Hosted Ubuntu 1604
+  # Run tests on Ubuntu14
+- template: /build/ci/phase-template.yml
+  parameters:
+    name: Linux_Ubuntu14
+    buildScript: ./build.sh
+    testDistro: ubuntu14
+    buildMatrix:
+      Py36:
+        _configuration: RlsLinPy3.6
+      Py35:
+        _configuration: RlsLinPy3.5
+      Py27:
+        _configuration: RlsLinPy2.7
+    buildQueue:
+      name: Hosted Ubuntu 1604
+  # Run tests on CentOS7
+- template: /build/ci/phase-template.yml
+  parameters:
+    name: Linux_CentOS7
+    buildScript: ./build.sh
+    testDistro: centos7
+    buildMatrix:
+      Py36:
+        _configuration: RlsLinPy3.6
+      Py35:
+        _configuration: RlsLinPy3.5
+      Py27:
+        _configuration: RlsLinPy2.7
+    buildQueue:
+      name: Hosted Ubuntu 1604
\ No newline at end of file