diff --git a/var/spack/repos/builtin/packages/libxsmm/package.py b/var/spack/repos/builtin/packages/libxsmm/package.py
index 06f7d0ac474..f66471654ba 100644
--- a/var/spack/repos/builtin/packages/libxsmm/package.py
+++ b/var/spack/repos/builtin/packages/libxsmm/package.py
@@ -64,8 +64,9 @@ class Libxsmm(MakefilePackage):
             description='With header-only installation')
     variant('generator', default=False,
             description='With generator executable(s)')
-    variant('noblas', default=False,
-            description='LIBXSMM without GEMM-related functionality')
+    variant('BLAS', default='default', multi=False,
+            description='Control behavior of BLAS calls',
+            values=('default', '0', '1', '2'))
     variant('CODE_BUF_MAXSIZE', default=0, multi=False,
             description='Max. size of JIT-buffer',
             values=('0', '262144'))
@@ -101,8 +102,9 @@ def build(self, spec, prefix):
             make_args += ['DBG=1']
             make_args += ['TRACE=1']
 
-        if '+noblas' in spec:
-            make_args += ['BLAS=0']
+        blas_val = spec.variants['BLAS'].value
+        if blas_val != 'default':
+            make_args += ['BLAS={0}'.format(blas_val)]
 
         if '+shared' in spec:
             make(*(make_args + ['STATIC=0']))
diff --git a/var/spack/repos/builtin/packages/py-gimmik/package.py b/var/spack/repos/builtin/packages/py-gimmik/package.py
index c78e042de09..30744e54e29 100644
--- a/var/spack/repos/builtin/packages/py-gimmik/package.py
+++ b/var/spack/repos/builtin/packages/py-gimmik/package.py
@@ -15,7 +15,7 @@ class PyGimmik(PythonPackage):
     homepage = "https://github.com/PyFR/GiMMiK"
     pypi = "gimmik/gimmik-2.2.tar.gz"
 
-    maintainers = ["michaellaufer"]
+    maintainers = ["MichaelLaufer"]
 
     version(
         "2.3", sha256="c019c85316bcf0d5e84de9b7d10127355dfe8037c0e37f1880a9819ce92b74e1"
diff --git a/var/spack/repos/builtin/packages/py-pyfr/package.py b/var/spack/repos/builtin/packages/py-pyfr/package.py
index 871decc08f2..b0a04e3e03b 100644
--- a/var/spack/repos/builtin/packages/py-pyfr/package.py
+++ b/var/spack/repos/builtin/packages/py-pyfr/package.py
@@ -15,7 +15,7 @@ class PyPyfr(PythonPackage):
     homepage = "http://www.pyfr.org/"
     pypi = "pyfr/pyfr-1.13.0.tar.gz"
     git = "https://github.com/PyFR/PyFR/"
-    maintainers = ["michaellaufer"]
+    maintainers = ["MichaelLaufer"]
 
     # git branches
     version("develop", branch="develop")
@@ -36,23 +36,23 @@ class PyPyfr(PythonPackage):
     variant("cuda", default=False, description="CUDA backend support")
     variant("hip", default=False, description="HIP backend support")
     variant("libxsmm", default=True, description="LIBXSMM for OpenMP backend")
+    variant("scipy", default=True, description="Scipy acceleration for point sampling")
 
     # Required dependencies
     depends_on("python@3.9:", type=("build", "run"))
     depends_on("py-setuptools", type="build")
     depends_on("py-gimmik@2.2:2", type=('build', 'run'))
-    depends_on("py-gimmik@2.3:", when='@1.14.0:', type=('build', 'run'))
+    depends_on("py-gimmik@2.3:2", when='@1.14.0:', type=('build', 'run'))
     depends_on("py-h5py@2.10:", type=('build', 'run'))
     depends_on("py-mako@1.0.0:", type=('build', 'run'))
     depends_on("py-mpi4py@3.1.0:", type=('build', 'run'))
     depends_on("py-numpy@1.20:+blas", type=('build', 'run'))
     depends_on("py-platformdirs@2.2.0:", type=('build', 'run'))
     depends_on("py-pytools@2016.2.1:", type=('build', 'run'))
-    depends_on("py-scipy", type=('build', 'run'))
 
-    # Optional dependecies
-    depends_on("metis@5.0:", when="+metis", type=('run'))
+    # Optional dependencies
+    depends_on("py-scipy", when="+scipy", type=('build', 'run'))
     depends_on("scotch@6.0:", when="+scotch", type=('run'))
     depends_on("cuda@8.0:", when="+cuda", type=('run'))
     depends_on("rocblas@4.5.0:", when="+hip", type=('run'))
-    depends_on("libxsmm@master+shared +noblas CODE_BUF_MAXSIZE=262144", when="+libxsmm", type=('run'))
+    depends_on("libxsmm@1.18:+shared BLAS=0 CODE_BUF_MAXSIZE=262144", when="+libxsmm", type=('run'))