diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml
index 9fc99b86c..2616e1618 100644
--- a/.github/workflows/run.yml
+++ b/.github/workflows/run.yml
@@ -224,7 +224,7 @@ jobs:
 
       - name: Dry run dynamic gromacs/openmp with dynamic Ruby
         run: |
-          ./bin/benchpark system init --dest=cluster-system llnl-cluster compiler=gcc lapack=intel-oneapi-mkl blas=intel-oneapi-mkl
+          ./bin/benchpark system init --dest=cluster-system llnl-cluster compiler=gcc 
           system_id=$(./bin/benchpark system id ./cluster-system)
           ./bin/benchpark experiment init --dest=gromacs-openmp gromacs +openmp~cuda~rocm gpu-aware-mpi=off
           ./bin/benchpark setup ./gromacs-openmp ./cluster-system workspace/
@@ -376,9 +376,9 @@ jobs:
             --disable-logger \
             workspace setup --dry-run
 
-      - name: Dry run dynamic saxpy/openmp with dynamic llnl-cluster ruby
+      - name: Dry run dynamic saxpy/openmp with dynamic llnl-cluster ruby compiler=intel
         run: |
-          ./bin/benchpark system init --dest=ruby-system llnl-cluster cluster=ruby
+          ./bin/benchpark system init --dest=ruby-system llnl-cluster cluster=ruby compiler=intel
           system_id=$(./bin/benchpark system id ./ruby-system)
           ./bin/benchpark experiment init --dest=saxpy-openmp saxpy+openmp
           ./bin/benchpark setup ./saxpy-openmp ./ruby-system workspace/
@@ -414,14 +414,14 @@ jobs:
             --disable-logger \
             workspace setup --dry-run
 
-      - name: Dry run dynamic saxpy/openmp with dynamic generic x86
+      - name: Dry run dynamic amg2023+openmp with dynamic generic x86
         run: |
           ./bin/benchpark system init --dest=x86-system genericx86
-          ./bin/benchpark experiment init --dest=saxpy-omp-generic saxpy+openmp
-          ./bin/benchpark setup ./saxpy-omp-generic ./x86-system workspace/
+          ./bin/benchpark experiment init --dest=amg2023-openmp-generic amg2023+openmp
+          ./bin/benchpark setup ./amg2023-openmp-generic ./x86-system workspace/
           . workspace/setup.sh
           ramble \
-            --workspace-dir "workspace/saxpy-omp-generic/x86-system/workspace" \
+            --workspace-dir "workspace/amg2023-openmp-generic/x86-system/workspace" \
             --disable-progress-bar \
             --disable-logger \
             workspace setup --dry-run
@@ -429,17 +429,18 @@ jobs:
       - name: Dry run dynamic saxpy/openmp with dynamic aws
         run: |
           ./bin/benchpark system init --dest=aws1 aws-pcluster instance_type=hpc6a.48xlarge
-          ./bin/benchpark setup ./saxpy-omp-generic ./aws1 workspace/
+          ./bin/benchpark experiment init --dest=saxpy-openmp-generic saxpy+openmp
+          ./bin/benchpark setup ./saxpy-openmp-generic ./aws1 workspace/
           . workspace/setup.sh
           ramble \
-            --workspace-dir "workspace/saxpy-omp-generic/aws1/workspace" \
+            --workspace-dir "workspace/saxpy-openmp-generic/aws1/workspace" \
             --disable-progress-bar \
             --disable-logger \
             workspace setup --dry-run
 
       - name: Dry run dynamic remhos/mpi with dynamic Ruby
         run: |
-          ./bin/benchpark system init --dest=cluster-system1 llnl-cluster compiler=gcc lapack=intel-oneapi-mkl blas=intel-oneapi-mkl
+          ./bin/benchpark system init --dest=cluster-system1 llnl-cluster compiler=gcc 
           system_id=$(./bin/benchpark system id ./cluster-system1)
           ./bin/benchpark experiment init --dest=remhos-mpi-ruby remhos ~cuda~rocm caliper=mpi,time
           ./bin/benchpark setup ./remhos-mpi-ruby ./cluster-system1 workspace/
@@ -517,11 +518,11 @@ jobs:
       - name: Dry run dynamic saxpy/openmp with dynamic fugaku
         run: |
           ./bin/benchpark system init --dest=fugaku-system fugaku
-          ./bin/benchpark experiment init --dest=saxpy-omp-fugaku saxpy+openmp
-          ./bin/benchpark setup ./saxpy-omp-fugaku ./fugaku-system workspace/
+          ./bin/benchpark experiment init --dest=saxpy-openmp-fugaku saxpy+openmp
+          ./bin/benchpark setup ./saxpy-openmp-fugaku ./fugaku-system workspace/
           . workspace/setup.sh
           ramble \
-            --workspace-dir workspace/saxpy-omp-fugaku/Fugaku-cf3cb1d/workspace \
+            --workspace-dir workspace/saxpy-openmp-fugaku/Fugaku-cf3cb1d/workspace \
             --disable-progress-bar \
             --disable-logger \
             workspace setup --dry-run
diff --git a/experiments/amg2023/experiment.py b/experiments/amg2023/experiment.py
index 5866eea6e..d884c6b3e 100644
--- a/experiments/amg2023/experiment.py
+++ b/experiments/amg2023/experiment.py
@@ -140,8 +140,8 @@ def compute_spack_section(self):
         system_specs = {}
         system_specs["compiler"] = "default-compiler"
         system_specs["mpi"] = "default-mpi"
-        system_specs["lapack"] = "default-lapack"
-        system_specs["blas"] = "default-blas"
+        system_specs["lapack"] = "lapack"
+        system_specs["blas"] = "blas"
 
         # set package spack specs
         # empty package_specs value implies external package
diff --git a/experiments/gromacs/experiment.py b/experiments/gromacs/experiment.py
index 9e77077c7..2eaa8e23b 100644
--- a/experiments/gromacs/experiment.py
+++ b/experiments/gromacs/experiment.py
@@ -93,8 +93,8 @@ def compute_spack_section(self):
         system_specs = {}
         system_specs["compiler"] = "default-compiler"
         system_specs["mpi"] = "default-mpi"
-        system_specs["blas"] = "default-blas"
-        system_specs["lapack"] = "default-lapack"
+        system_specs["blas"] = "blas"
+        system_specs["lapack"] = "lapack"
 
         # set package spack specs
         # empty package_specs value implies external package
diff --git a/experiments/laghos/experiment.py b/experiments/laghos/experiment.py
index 3691b1d5e..1e4575244 100644
--- a/experiments/laghos/experiment.py
+++ b/experiments/laghos/experiment.py
@@ -66,8 +66,8 @@ def compute_spack_section(self):
         system_specs = {}
         system_specs["compiler"] = "default-compiler"
         system_specs["mpi"] = "default-mpi"
-        system_specs["lapack"] = "default-lapack"
-        system_specs["blas"] = "default-blas"
+        system_specs["lapack"] = "lapack"
+        system_specs["blas"] = "blas"
 
         # set package spack specs
         # empty package_specs value implies external package
diff --git a/experiments/remhos/experiment.py b/experiments/remhos/experiment.py
index bb3c7bab4..13dc921e9 100644
--- a/experiments/remhos/experiment.py
+++ b/experiments/remhos/experiment.py
@@ -92,8 +92,8 @@ def compute_spack_section(self):
         system_specs = {}
         system_specs["compiler"] = "default-compiler"
         system_specs["mpi"] = "default-mpi"
-        system_specs["lapack"] = "default-lapack"
-        system_specs["blas"] = "default-blas"
+        system_specs["blas"] = "blas"
+        system_specs["lapack"] = "lapack"
 
         # set package spack specs
         # empty package_specs value implies external package
diff --git a/systems/genericx86/system.py b/systems/genericx86/system.py
index ef64dc6d5..3a6e12d0d 100644
--- a/systems/genericx86/system.py
+++ b/systems/genericx86/system.py
@@ -40,4 +40,8 @@ def sw_description(self):
       pkg_spec: gcc
     default-mpi:
       pkg_spec: openmpi
+    blas:
+      pkg_spec: openblas
+    lapack:
+      pkg_spec: openblas
 """
diff --git a/systems/llnl-cluster/system.py b/systems/llnl-cluster/system.py
index c42f470c3..68a79a633 100644
--- a/systems/llnl-cluster/system.py
+++ b/systems/llnl-cluster/system.py
@@ -37,18 +37,6 @@ class LlnlCluster(System):
         description="Which compiler to use",
     )
 
-    variant(
-        "lapack",
-        default="intel-oneapi-mkl",
-        description="Which lapack to use",
-    )
-
-    variant(
-        "blas",
-        default="intel-oneapi-mkl",
-        description="Which blas to use",
-    )
-
     def initialize(self):
         super().initialize()
 
@@ -97,13 +85,9 @@ def sw_description(self):
 software:
   packages:
     default-compiler:
-      pkg_spec: gcc
+      pkg_spec: {self.spec.variants["compiler"][0]}
     default-mpi:
       pkg_spec: mvapich2
-    default-lapack:
-      pkg_spec: {self.spec.variants["lapack"][0]}
-    default-blas:
-      pkg_spec: {self.spec.variants["blas"][0]}
     compiler-gcc:
       pkg_spec: gcc
     compiler-intel:
diff --git a/systems/llnl-elcapitan/system.py b/systems/llnl-elcapitan/system.py
index dbb1142c0..d221ac9cc 100644
--- a/systems/llnl-elcapitan/system.py
+++ b/systems/llnl-elcapitan/system.py
@@ -41,7 +41,7 @@ class LlnlElcapitan(System):
     variant(
         "compiler",
         default="cce",
-        values=("gcc", "cce"),
+        values=("cce", "gcc"),
         description="Which compiler to use",
     )
 
@@ -373,13 +373,9 @@ def sw_description(self):
 software:
   packages:
     default-compiler:
-      pkg_spec: cce
+      pkg_spec: {self.spec.variants["compiler"][0]}
     default-mpi:
       pkg_spec: cray-mpich
-    default-lapack:
-      pkg_spec: {self.spec.variants["lapack"][0]}
-    default-blas:
-      pkg_spec: {self.spec.variants["blas"][0]}
     compiler-rocm:
       pkg_spec: cce
     compiler-amdclang:
@@ -393,11 +389,13 @@ def sw_description(self):
     mpi-gcc:
       pkg_spec: cray-mpich~gtl
     blas:
-      pkg_spec: rocblas
+      pkg_spec: {self.spec.variants["blas"][0]}
     blas-rocm:
       pkg_spec: rocblas
-    lapack-rocm:
-      pkg_spec: rocsolver
     lapack:
+      pkg_spec: {self.spec.variants["lapack"][0]}
+    lapack-oneapi:
       pkg_spec: intel-oneapi-mkl
+    lapack-rocm:
+      pkg_spec: rocsolver
 """
diff --git a/systems/llnl-sierra/system.py b/systems/llnl-sierra/system.py
index c09dfc180..74e17488c 100644
--- a/systems/llnl-sierra/system.py
+++ b/systems/llnl-sierra/system.py
@@ -298,17 +298,13 @@ def sw_description(self):
         will fail if these variables are not defined though, so for now
         they are still generated (but with more-generic values).
         """
-        return f"""\
+        return """\
 software:
   packages:
     default-compiler:
       pkg_spec: clang
     default-mpi:
       pkg_spec: spectrum-mpi
-    default-lapack:
-      pkg_spec: {self.spec.variants["lapack"][0]}
-    default-blas:
-      pkg_spec: {self.spec.variants["blas"][0]}
     compiler-xl:
       pkg_spec: xl
     mpi-xl:
@@ -325,6 +321,10 @@ def sw_description(self):
       pkg_spec: spectrum-mpi
     blas:
       pkg_spec: cublas
-    cublas-cuda:
+    blas-cuda:
       pkg_spec: cublas
+    lapack:
+      pkg_spec: cusolver
+    lapack-cuda:
+      pkg_spec: cusolver
 """