diff --git a/templates/gitlab-ci.yml b/templates/gitlab-ci.yml
index 85415d506592af2d9aa4e4bbca8c49c8fdf752b6..1bfbb4f4a6e16375c30bd965bcb41e4a747d5f0c 100644
--- a/templates/gitlab-ci.yml
+++ b/templates/gitlab-ci.yml
@@ -38,13 +38,13 @@ stages:
   tags:
     - docker
   image: continuumio/conda_builder_linux
+  variables: &linux_variables
+    CONDA_FOLDER: "/opt/miniconda"
   cache:
     key: "$CI_JOB_NAME"
     paths:
       - ${CONDA_ENVS_PATH}/.pkgs/*.tar.bz2
       - ${CONDA_ENVS_PATH}/.pkgs/urls.txt
-  variables: &linux_variables
-    CONDA_FOLDER: "/opt/miniconda"
 
 .build_macosx_template: &macosx_build_job
   <<: *build_job
@@ -55,31 +55,31 @@ stages:
       - ${CONDA_ENVS_PATH}/osx-64/*.tar.bz2
   tags:
     - conda-macosx
+  variables: &macosx_variables
+    CONDA_FOLDER: "${CI_PROJECT_DIR}/${CONDA_ENVS_PATH}"
   cache:
     key: "$CI_JOB_NAME"
     paths:
       - miniconda.sh
       - ${CONDA_ENVS_PATH}/pkgs/
-  variables: &macosx_variables
-    CONDA_FOLDER: "${CI_PROJECT_DIR}/${CONDA_ENVS_PATH}"
 
 
 build_linux_27:
   <<: *linux_build_job
   variables:
-    <<: * linux_variables
+    <<: *linux_variables
     PYTHON_VERSION: "2.7"
 
 build_linux_35:
   <<: *linux_build_job
   variables:
-    <<: * linux_variables
+    <<: *linux_variables
     PYTHON_VERSION: "3.5"
 
 build_linux_36:
   <<: *linux_build_job
   variables:
-    <<: * linux_variables
+    <<: *linux_variables
     PYTHON_VERSION: "3.6"
     BUILD_EGG: "true"
   artifacts:
@@ -92,19 +92,19 @@ build_linux_36:
 build_macosx_27:
   <<: *macosx_build_job
   variables:
-    <<: * macosx_variables
+    <<: *macosx_variables
     PYTHON_VERSION: "2.7"
 
 build_macosx_35:
   <<: *macosx_build_job
   variables:
-    <<: * macosx_variables
+    <<: *macosx_variables
     PYTHON_VERSION: "3.5"
 
 build_macosx_36:
   <<: *macosx_build_job
   variables:
-    <<: * macosx_variables
+    <<: *macosx_variables
     PYTHON_VERSION: "3.6"