diff --git a/ci/setup_spack.sh b/ci/setup_spack.sh
index 236d562bdfb563f37f88901c6db43cc037e31c35..4c50de38ba0d0d8aa79347faa3382a08716dbd29 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,16 @@ do
   done
 done
 
+if [ -d "${STACK_CONFIG_PATH}/templates" ]
+then
+   cp -r "${STACK_CONFIG_PATH}/templates" ${STACK_LOCATION}/spack/share/spack
+fi
+
+if [ -d "${STACK_CONFIG_PATH}/licenses" ]
+then
+  cp -r "${STACK_CONFIG_PATH}/licenses" ${STACK_LOCATION}/spack/etc/spack
+fi
 
-cat <<EOF > ${SPACK_SYSTEM_CONFIG_PATH}/config_stack.yaml
-config:
-  template_dirs:
-    - ${SPACK_SYSTEM_CONFIG_PATH}/templates
-EOF
 
 cat <<EOF > ${SPACK_SYSTEM_CONFIG_PATH}/modules_stack.yaml
 modules:
diff --git a/stacks/pinot-noir/definitions_stack.yaml b/stacks/pinot-noir/definitions_stack.yaml
index b35956ee76c9c55c68c63159176b3b2920ce11aa..39e1d5002ba993e336905d71414a2f82b1a48450 100644
--- a/stacks/pinot-noir/definitions_stack.yaml
+++ b/stacks/pinot-noir/definitions_stack.yaml
@@ -12,6 +12,7 @@ definitions:
       - git-lfs
       - gmp
       - gnuplot
+      - gurobi
       - gzip
       - intel-oneapi-advisor
       - intel-oneapi-inspector
@@ -281,7 +282,6 @@ definitions:
       - cfdplusplus
       - comsol
       - fdtd
-      - gurobi
       - gaussian
       - matlab
       - maple
diff --git a/stacks/pinot-noir/licenses/.to_keep b/stacks/pinot-noir/licenses/.to_keep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/stacks/pinot-noir/licenses/gurobi/gurobi.lic b/stacks/pinot-noir/licenses/gurobi/gurobi.lic
new file mode 100644
index 0000000000000000000000000000000000000000..72cb2fc45396ba1614d8b1ec80a7da0cbb262d05
--- /dev/null
+++ b/stacks/pinot-noir/licenses/gurobi/gurobi.lic
@@ -0,0 +1 @@
+TOKENSERVER=scitas-lic-srv.epfl.ch
diff --git a/stacks/pinot-noir/packages_stack.yaml b/stacks/pinot-noir/packages_stack.yaml
index 91466a4c3491b70f4fd5c6736db1e49483e06cd1..cec497f9f2ad177799f6f0e4e30ee0a214846531 100644
--- a/stacks/pinot-noir/packages_stack.yaml
+++ b/stacks/pinot-noir/packages_stack.yaml
@@ -112,6 +112,9 @@ packages:
   gnuplot:
     require: ['@5.4.10', '+cairo']
 
+  gurobi:
+    require: ['@11.0.3']
+
   hdf5:
     prefer:
     - spec: '@1.14.3'
@@ -479,12 +482,6 @@ packages:
     externals:
     - {spec: gaussian@g16-A.03, prefix: /ssoft/spack/external/gaussian/g16-A.03/avx2}
     - {spec: gaussian@g16-C.01, prefix: /ssoft/spack/external/gaussian/g16-C.01/avx2}
-  gurobi:
-    buildable: false
-    externals:
-    - {spec: gurobi@8.1.1, prefix: /ssoft/spack/external/gurobi/8.1.1}
-    - {spec: gurobi@9.5.2, prefix: /ssoft/spack/external/gurobi/9.5.2}
-    - {spec: gurobi@10.0.1, prefix: /ssoft/spack/external/gurobi/10.0.1}
   maple:
     buildable: false
     externals:
diff --git a/stacks/pinot-noir/spack.yaml b/stacks/pinot-noir/spack.yaml
index f0711511126851b53297af12a93016c0cd59e096..61e31e103ab02377872aa3636a89fb54e81a77b2 100644
--- a/stacks/pinot-noir/spack.yaml
+++ b/stacks/pinot-noir/spack.yaml
@@ -14,8 +14,6 @@ spack:
       - definitions_accel.yaml
       - definitions_env.yaml
 
-      - config_stack.yaml
-
   modules:
     default:
       lmod:
diff --git a/stacks/pinot-noir/spack_aocc.yaml b/stacks/pinot-noir/spack_aocc.yaml
index 6c06780bf1836d29d048ffb55ef7b84e78341720..b6e7276c6afff30eae898e3e7019f55dd6525050 100644
--- a/stacks/pinot-noir/spack_aocc.yaml
+++ b/stacks/pinot-noir/spack_aocc.yaml
@@ -14,8 +14,6 @@ spack:
       - definitions_env.yaml
       - definitions_stack.yaml
 
-      - config_stack.yaml
-
   modules:
     default:
       lmod:
diff --git a/stacks/pinot-noir/spack_nvhpc.yaml b/stacks/pinot-noir/spack_nvhpc.yaml
index f3b87b8446888a8bcdd13051b407112b510a72b8..8f5e962e2e962ac4afec6bd1ca18c282c8994936 100644
--- a/stacks/pinot-noir/spack_nvhpc.yaml
+++ b/stacks/pinot-noir/spack_nvhpc.yaml
@@ -14,8 +14,6 @@ spack:
       - definitions_env.yaml
       - definitions_stack.yaml
 
-      - config_stack.yaml
-
   modules:
     default:
       lmod:
diff --git a/stacks/pinot-noir/spack_oneapi.yaml b/stacks/pinot-noir/spack_oneapi.yaml
index 757d1df840a3ca5469ac3522fe999509a1283093..67f92a44c1545928e22ff099f7e20561f34a1842 100644
--- a/stacks/pinot-noir/spack_oneapi.yaml
+++ b/stacks/pinot-noir/spack_oneapi.yaml
@@ -14,8 +14,6 @@ spack:
       - definitions_env.yaml
       - definitions_stack.yaml
 
-      - config_stack.yaml
-
   modules:
     default:
       lmod: