diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f7c61b7c649544a63f9eab8167df321b50857ffd..29a7521a63f886d2d8dbfc30a1a2df6e93b7ed08 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -84,72 +84,72 @@ extra_wheels_linux_27:
     - conda-linux
 
 
-# Python 3.4 on Linux
-core_build_linux_34:
+# Python 3.5 on Linux
+core_build_linux_35:
   <<: *core_build_job
-  variables: &core_build_linux_34_variables
-    PYTHON_VERSION: "3.4"
-  only:
-    - master
+  variables: &core_build_linux_35_variables
+    PYTHON_VERSION: "3.5"
   tags:
     - conda-linux
 
-core_wheels_linux_34:
+core_wheels_linux_35:
   <<: *core_wheels_job
-  variables: *core_build_linux_34_variables
+  variables: *core_build_linux_35_variables
   dependencies:
-    - core_build_linux_34
+    - core_build_linux_35
   tags:
     - conda-linux
 
-extra_build_linux_34:
+extra_build_linux_35:
   <<: *extra_build_job
-  variables: *core_build_linux_34_variables
+  variables: *core_build_linux_35_variables
   dependencies:
-    - core_build_linux_34
-  only:
-    - master
+    - core_build_linux_35
   tags:
     - conda-linux
 
-extra_wheels_linux_34:
+extra_wheels_linux_35:
   <<: *extra_wheels_job
-  variables: *core_build_linux_34_variables
+  variables: *core_build_linux_35_variables
   dependencies:
-    - extra_build_linux_34
+    - extra_build_linux_35
   tags:
     - conda-linux
 
 
-# Python 3.5 on Linux
-core_build_linux_35:
+# Python 3.6 on Linux
+core_build_linux_36:
   <<: *core_build_job
-  variables: &core_build_linux_35_variables
-    PYTHON_VERSION: "3.5"
+  variables: &core_build_linux_36_variables
+    PYTHON_VERSION: "3.4"
+  only:
+    - master
   tags:
     - conda-linux
 
-core_wheels_linux_35:
+core_wheels_linux_36:
   <<: *core_wheels_job
-  variables: *core_build_linux_35_variables
+  variables: *core_build_linux_36_variables
   dependencies:
-    - core_build_linux_35
+    - core_build_linux_36
   tags:
     - conda-linux
 
-extra_build_linux_35:
+extra_build_linux_36:
   <<: *extra_build_job
-  variables: *core_build_linux_35_variables
+  variables: *core_build_linux_36_variables
   dependencies:
-    - core_build_linux_35
+    - core_build_linux_36
+  only:
+    - master
   tags:
     - conda-linux
 
-extra_wheels_linux_35:
+extra_wheels_linux_36:
   <<: *extra_wheels_job
-  variables: *core_build_linux_35_variables
+  variables: *core_build_linux_36_variables
   dependencies:
-    - extra_build_linux_35
+    - extra_build_linux_36
   tags:
     - conda-linux
 
@@ -187,71 +187,70 @@ extra_wheels_macosx_27:
     - conda-macosx
 
 
-# Python 3.4 on MacOSX
-core_build_macosx_34:
+# Python 3.5 on MacOSX
+core_build_macosx_35:
   <<: *core_build_job
-  variables: &core_build_macosx_34_variables
-    PYTHON_VERSION: "3.4"
-  only:
-    - master
+  variables: &core_build_macosx_35_variables
+    PYTHON_VERSION: "3.5"
   tags:
     - conda-macosx
 
-core_wheels_macosx_34:
+core_wheels_macosx_35:
   <<: *core_wheels_job
-  variables: *core_build_macosx_34_variables
+  variables: *core_build_macosx_35_variables
   dependencies:
-    - core_build_macosx_34
+    - core_build_macosx_35
   tags:
     - conda-macosx
 
-extra_build_macosx_34:
+extra_build_macosx_35:
   <<: *extra_build_job
-  variables: *core_build_macosx_34_variables
+  variables: *core_build_macosx_35_variables
   dependencies:
-    - core_build_macosx_34
-  only:
-    - master
+    - core_build_macosx_35
   tags:
     - conda-macosx
 
-extra_wheels_macosx_34:
+extra_wheels_macosx_35:
   <<: *extra_wheels_job
-  variables: *core_build_macosx_34_variables
+  variables: *core_build_macosx_35_variables
   dependencies:
-    - extra_build_macosx_34
+    - extra_build_macosx_35
   tags:
     - conda-macosx
 
-
-# Python 3.5 on MacOSX
-core_build_macosx_35:
+# Python 3.6 on MacOSX
+core_build_macosx_36:
   <<: *core_build_job
-  variables: &core_build_macosx_35_variables
-    PYTHON_VERSION: "3.5"
+  variables: &core_build_macosx_36_variables
+    PYTHON_VERSION: "3.4"
+  only:
+    - master
   tags:
     - conda-macosx
 
-core_wheels_macosx_35:
+core_wheels_macosx_36:
   <<: *core_wheels_job
-  variables: *core_build_macosx_35_variables
+  variables: *core_build_macosx_36_variables
   dependencies:
-    - core_build_macosx_35
+    - core_build_macosx_36
   tags:
     - conda-macosx
 
-extra_build_macosx_35:
+extra_build_macosx_36:
   <<: *extra_build_job
-  variables: *core_build_macosx_35_variables
+  variables: *core_build_macosx_36_variables
   dependencies:
-    - core_build_macosx_35
+    - core_build_macosx_36
+  only:
+    - master
   tags:
     - conda-macosx
 
-extra_wheels_macosx_35:
+extra_wheels_macosx_36:
   <<: *extra_wheels_job
-  variables: *core_build_macosx_35_variables
+  variables: *core_build_macosx_36_variables
   dependencies:
-    - extra_build_macosx_35
+    - extra_build_macosx_36
   tags:
     - conda-macosx