diff --git a/gitlab/after_build.sh b/gitlab/after_build.sh
index 45a69db147b4f8ff809df9f59b09337a50057c6e..ad30ed8ac054c4f85a1d60ad341c033298380534 100755
--- a/gitlab/after_build.sh
+++ b/gitlab/after_build.sh
@@ -1,2 +1,6 @@
 #!/usr/bin/env bash
-# Sat 24 Sep 08:12:24 2016 CEST
+# Tue 13 Jun 2017 17:32:07 CEST
+
+source $(dirname ${0})/functions.sh
+
+run_cmd rm -rf ${PREFIX}
diff --git a/gitlab/after_deploy.sh b/gitlab/after_deploy.sh
index 8a57965e9d0af0397c64d571849c3511fda5d615..445b812c564edded72c2d153a262ed03853fe111 100755
--- a/gitlab/after_deploy.sh
+++ b/gitlab/after_deploy.sh
@@ -1,2 +1,6 @@
 #!/usr/bin/env bash
-# Thu 22 Sep 2016 15:11:53 CEST
+# Tue 13 Jun 2017 17:32:29 CEST
+
+source $(dirname ${0})/functions.sh
+
+run_cmd rm -rf ${PREFIX}
diff --git a/gitlab/after_test.sh b/gitlab/after_test.sh
index 9f03f60bf4cfab46998e4079c79e9dd29ede2e23..61999878fd4ced404d8912a06dc05f867bbbc814 100755
--- a/gitlab/after_test.sh
+++ b/gitlab/after_test.sh
@@ -1,2 +1,6 @@
 #!/usr/bin/env bash
-# Thu 22 Sep 2016 13:59:03 CEST
+# Tue 13 Jun 2017 17:32:16 CEST
+
+source $(dirname ${0})/functions.sh
+
+run_cmd rm -rf ${PREFIX}
diff --git a/gitlab/before_build.sh b/gitlab/before_build.sh
index bdfac7043f163014085a13a33f8a9eec00d2abb7..22e8b1e2cc28e3b126b7bd9875b20a2a855cfc76 100755
--- a/gitlab/before_build.sh
+++ b/gitlab/before_build.sh
@@ -10,15 +10,7 @@ if [ -z "${WHEELS_REPOSITORY}" ]; then
 fi
 check_env WHEELS_REPOSITORY
 
-# Readies a conda environment to use for installation
-if [ ! -d ${PREFIX} ]; then
-  log_info "Creating conda installation at ${PREFIX}..."
-  run_cmd ${CONDA_FOLDER}/bin/conda create --clone ${CONDA_ENV} --prefix ${PREFIX} --yes
-else
-  log_info "Prefix directory ${PREFIX} exists, not re-installing..."
-fi
-
-prepare_build_env ${CONDA_FOLDER} ${PREFIX}
+prepare_build_env ${CONDA_FOLDER} ${PREFIX} ${CONDA_ENV}
 
 # Verify where pip is installed
 use_pip=`which pip`
diff --git a/gitlab/before_deploy.sh b/gitlab/before_deploy.sh
index 895ac54fe5362a27ea16a3a0a87d2d1e6532cde3..9c68a4f2b0157fbd6e01c34ac61b45c3b75794fc 100755
--- a/gitlab/before_deploy.sh
+++ b/gitlab/before_deploy.sh
@@ -5,7 +5,7 @@ source $(dirname ${0})/functions.sh
 
 run_cmd $(dirname ${0})/before_test.sh
 
-prepare_build_env ${CONDA_FOLDER} ${PREFIX}
+prepare_build_env ${CONDA_FOLDER} ${PREFIX} ${CONDA_ENV}
 
 # setup database locally and run `bob_dbmanage.py all download`
 # if this is a database package - need auxiliary file for package
diff --git a/gitlab/before_test.sh b/gitlab/before_test.sh
index 165784eb5e829667cff292e01bf29c789303a6c6..b588c13da438799818672c514bc4cf903abf1249 100755
--- a/gitlab/before_test.sh
+++ b/gitlab/before_test.sh
@@ -5,7 +5,7 @@ source $(dirname ${0})/functions.sh
 
 run_cmd $(dirname ${0})/before_build.sh
 
-prepare_build_env ${CONDA_FOLDER} ${PREFIX}
+prepare_build_env ${CONDA_FOLDER} ${PREFIX} ${CONDA_ENV}
 
 # Verify where pip is installed
 use_pip=`which pip`
diff --git a/gitlab/functions.sh b/gitlab/functions.sh
index 04da06052b08c3cb5aa879931b9cbb75f48bac4c..608d3d85a333981cfd998285d88caa7452acc9c3 100644
--- a/gitlab/functions.sh
+++ b/gitlab/functions.sh
@@ -249,10 +249,20 @@ dav_upload_folder() {
 }
 
 
-# Activates environment and sets up compilation
+# Creates (clones), Activates environment and sets up compilation
 # $1: root of the conda installation
 # $2: your current build prefix
+# $3: the name of the conda environment to clone
 prepare_build_env() {
+
+  # Readies a conda environment to use for installation
+  if [ ! -d $2 ]; then
+    log_info "Creating conda installation at $2..."
+    run_cmd $1/bin/conda create --clone $3 --prefix $2 --yes
+  else
+    log_info "Prefix directory $2 exists, not re-installing..."
+  fi
+
   # Activates conda environment for the build
   log_info "$ source $1/bin/activate $2"
   source $1/bin/activate $2