diff --git a/templates/ci.yml b/templates/gitlab-ci.yml
similarity index 95%
rename from templates/ci.yml
rename to templates/gitlab-ci.yml
index f4823ec0845456bcecd16f8003bd257e57e34a73..26662a1bb5b96c1cfb92de1302bedaf565451748 100644
--- a/templates/ci.yml
+++ b/templates/gitlab-ci.yml
@@ -23,11 +23,6 @@ stages:
     - ./_ci/install.sh _ci condapackage
   script:
     - ./_ci/build.sh
-  cache:
-    key: "$CI_JOB_NAME"
-    paths:
-      - conda-env/.pkgs/*.tar.bz2
-      - conda-env/.pkgs/urls.txt
 
 .build_linux_template: &linux_build_job
   <<: *build_job
@@ -35,11 +30,15 @@ stages:
     expire_in: 1 week
     paths:
       - _ci/
-      - dist/
       - conda-env/linux-64/*.tar.bz2
   tags:
     - docker
   image: continuumio/conda_builder_linux
+  cache:
+    key: "$CI_JOB_NAME"
+    paths:
+      - conda-env/.pkgs/*.tar.bz2
+      - conda-env/.pkgs/urls.txt
 
 .build_macosx_template: &macosx_build_job
   <<: *build_job
@@ -47,7 +46,6 @@ stages:
     expire_in: 1 week
     paths:
       - _ci/
-      - dist/
       - conda-env/osx-64/*.tar.bz2
   tags:
     - conda-macosx
@@ -68,6 +66,12 @@ build_linux_36:
   variables:
     PYTHON_VERSION: "3.6"
     BUILD_EGG: "true"
+  artifacts:
+    expire_in: 1 week
+    paths:
+      - _ci/
+      - dist/
+      - conda-env/linux-64/*.tar.bz2
 
 build_macosx_27:
   <<: *macosx_build_job
@@ -130,11 +134,6 @@ pypi:
   script:
     - ./_ci/pypi.sh
   dependencies:
-    - build_linux_27
-    - build_linux_35
     - build_linux_36
-    - build_macosx_27
-    - build_macosx_35
-    - build_macosx_36
   tags:
     - deployer