diff --git a/gitlab/build.sh b/gitlab/build.sh
index dea1366af66242f73799f621bb248a790472d433..d3f4b020b781aeb115a57c68efde8400d07c1edb 100755
--- a/gitlab/build.sh
+++ b/gitlab/build.sh
@@ -30,4 +30,10 @@ else
 fi
 
 # Copy the .tar.bz2 and urls.txt
+if [ "${OSNAME}" == "linux" ]; then
+    mkdir -p ${CONDA_ENVS_PATH}/.pkgs
+    touch ${CONDA_ENVS_PATH}/.pkgs/urls
+    touch ${CONDA_ENVS_PATH}/.pkgs/urls.txt
+fi
+
 merge_conda_cache ${CONDA_ENVS_PATH}/.pkgs ${CONDA_FOLDER}/pkgs
diff --git a/gitlab/functions.sh b/gitlab/functions.sh
index 1cdd2a25dad8ddc3a578d7fddc008bc97a7c990b..eb30c9cefecab8cac18df6625b40979bcf93569c 100644
--- a/gitlab/functions.sh
+++ b/gitlab/functions.sh
@@ -269,12 +269,15 @@ fi
 # $2: Path to the extra cache to be merged into main cache
 merge_conda_cache() {
   if [ -e ${1} ]; then
-    _cached_urls="${2}/urls.txt"
-    _urls="${1}/urls.txt"
+    _cached_urls="${2}/urls"
+    _urls="${1}/urls"
+    _cached_urlstxt="${2}/urls.txt"
+    _urlstxt="${1}/urls.txt"
     if [ -e ${2} ]; then
       log_info "Merging urls.txt and packages with cached files..."
       mv ${2}/*.tar.bz2 ${1}/
       cat ${_urls} ${_cached_urls} | sort | uniq > ${_urls}
+      cat ${_urlstxt} ${_cached_urlstxt} | sort | uniq > ${_urlstxt}
     fi
   fi
 }