diff --git a/gitlab/deploy.sh b/gitlab/deploy.sh
index a69da38c54f9fb5f44029df24b431147b6071c99..62aae11505f407ebe9c31f4f5dffdaa23a536e9e 100755
--- a/gitlab/deploy.sh
+++ b/gitlab/deploy.sh
@@ -5,7 +5,7 @@ source $(dirname ${0})/functions.sh
 
 # Uploads all the built packages
 for os in "osx-64" "noarch" "linux-64"; do
-  for f in ${CONDA_BLD_PATH}/${os}/*.tar.bz2; do
+  for f in ${CONDA_ENVS_PATH}/${os}/*.tar.bz2; do
     if [[ -f $f ]]; then
       if [ -z "${CI_COMMIT_TAG}" ]; then #beta
         url="private"
diff --git a/gitlab/functions.sh b/gitlab/functions.sh
index cf1fde30cf6200288f5214d4c355c2d9ebf404bc..84b06cb27d6a4f5d18f31b2770c45b1a64b59e10 100644
--- a/gitlab/functions.sh
+++ b/gitlab/functions.sh
@@ -270,10 +270,10 @@ install_miniconda() {
   log_info "Installing miniconda in ${1} ..."
 
   # Download the latest conda installation script
-  if [ "${OSNAME}" == "macosx" ]; then
-    object=https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh
-  else
+  if [ "${OSNAME}" == "linux" ]; then
     object=https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
+  else
+    object=https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh
   fi
 
   # check if miniconda.sh exists
diff --git a/templates/gitlab-ci.yml b/templates/gitlab-ci.yml
index c1c8347c20b6533cfbfd263ee29f88eb172e4434..5e885e32f216140e0b6aa166d97e955465cfc493 100644
--- a/templates/gitlab-ci.yml
+++ b/templates/gitlab-ci.yml
@@ -4,7 +4,6 @@
 # global variables
 variables:
   CONDA_ENVS_PATH: "conda-env"
-  CONDA_BLD_PATH: "conda-env/conda-bld"
 
 
 # Definition of our build pipeline order
@@ -36,7 +35,7 @@ stages:
     expire_in: 1 week
     paths:
       - _ci/
-      - ${CONDA_BLD_PATH}/linux-64/*.tar.bz2
+      - ${CONDA_ENVS_PATH}/linux-64/*.tar.bz2
   tags:
     - docker
   image: continuumio/conda_builder_linux
@@ -62,7 +61,7 @@ stages:
     expire_in: 1 week
     paths:
       - _ci/
-      - ${CONDA_BLD_PATH}/osx-64/*.tar.bz2
+      - ${CONDA_ENVS_PATH}/osx-64/*.tar.bz2
   tags:
     - conda-macosx
   cache:
@@ -92,7 +91,7 @@ build_linux_36:
     paths:
       - _ci/
       - dist/
-      - ${CONDA_BLD_PATH}/linux-64/*.tar.bz2
+      - ${CONDA_ENVS_PATH}/linux-64/*.tar.bz2
 
 build_macosx_27:
   <<: *macosx_build_job