diff --git a/ci/setup_spack.sh b/ci/setup_spack.sh
index 236d562bdfb563f37f88901c6db43cc037e31c35..77ed70da9be49c7f93b14a6ef397c1eac1361d88 100755
--- a/ci/setup_spack.sh
+++ b/ci/setup_spack.sh
@@ -58,10 +58,6 @@ cp ${STACK_CONFIG_PATH}/spack.yaml ${SPACK_SYSTEM_CONFIG_PATH}
 
 replace_placholders ${SPACK_SYSTEM_CONFIG_PATH}/spack.yaml
 
-cp -r "${STACK_CONFIG_PATH}/templates" ${SPACK_SYSTEM_CONFIG_PATH}
-
-
-
 for file in mirrors packages concretizer config definitions modules
 do
   for suffix in ${!file_mapping[@]}
@@ -78,12 +74,22 @@ do
   done
 done
 
-
-cat <<EOF > ${SPACK_SYSTEM_CONFIG_PATH}/config_stack.yaml
-config:
+echo "config:" > ${SPACK_SYSTEM_CONFIG_PATH}/config_stack.yaml
+if [ -d cp -r "${STACK_CONFIG_PATH}/templates" ${SPACK_SYSTEM_CONFIG_PATH} ]
+then
+   cp -r "${STACK_CONFIG_PATH}/templates" ${SPACK_SYSTEM_CONFIG_PATH}
+   cat <<EOF >> ${SPACK_SYSTEM_CONFIG_PATH}/config_stack.yaml
   template_dirs:
     - ${SPACK_SYSTEM_CONFIG_PATH}/templates
 EOF
+fi
+
+if [ -d "${STACK_CONFIG_PATH}/licenses" ]
+then
+  cp -r "${STACK_CONFIG_PATH}/licenses" ${SPACK_SYSTEM_CONFIG_PATH}
+  echo "  license_dir: ${SPACK_SYSTEM_CONFIG_PATH}/licenses" >> ${SPACK_SYSTEM_CONFIG_PATH}/config_stack.yaml
+fi
+
 
 cat <<EOF > ${SPACK_SYSTEM_CONFIG_PATH}/modules_stack.yaml
 modules:
diff --git a/stacks/pinot-noir/licenses/.to_keep b/stacks/pinot-noir/licenses/.to_keep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391