diff --git a/var/spack/repos/builtin/packages/fenics-dolfinx/package.py b/var/spack/repos/builtin/packages/fenics-dolfinx/package.py
index 57bf98d826..3e1ab12a87 100644
--- a/var/spack/repos/builtin/packages/fenics-dolfinx/package.py
+++ b/var/spack/repos/builtin/packages/fenics-dolfinx/package.py
@@ -59,6 +59,7 @@ class FenicsDolfinx(CMakePackage):
 
     depends_on("slepc", when="+slepc")
     depends_on("adios2+mpi", when="+adios2")
+    depends_on("pugixml", when="@main")
 
     depends_on("fenics-ufcx@main", when="@main")
     depends_on("fenics-ufcx@0.4.2", when="@0.4.1")
@@ -86,6 +87,7 @@ def cmake_args(self):
 
         if self.spec.satisfies('@0.4.0:'):
             args += [
+                self.define('DOLFINX_UFCX_PYTHON', False),
                 self.define('DOLFINX_ENABLE_KAHIP', 'partitioners=kahip' in self.spec),
                 self.define('DOLFINX_ENABLE_PARMETIS',
                             'partitioners=parmetis' in self.spec),
diff --git a/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py b/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py
index 91dc5052ee..c671f3555b 100644
--- a/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py
+++ b/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py
@@ -32,12 +32,12 @@ class PyFenicsDolfinx(PythonPackage):
     depends_on("fenics-dolfinx@0.3.0", when="@0.3.0")
     depends_on("fenics-dolfinx@0.2.0", when="@0.2.0")
     depends_on("fenics-dolfinx@0.1.0", when="@0.1.0")
+
     depends_on("fenics-basix@main", type=("build", "link"), when="@main")
     depends_on("fenics-basix@0.4.2", type=("build", "link"), when="@0.4.1")
     depends_on("fenics-basix@0.3.0", type=("build", "link"), when="@0.3.0")
     depends_on("fenics-basix@0.2.0", type=("build", "link"), when="@0.2.0")
     depends_on("fenics-basix@0.1.0", type=("build", "link"), when="@0.1.0")
-
     depends_on("py-fenics-ffcx@main", type="run", when="@main")
     depends_on("py-fenics-ffcx@0.4.2", type="run", when="@0.4.1")
     depends_on("py-fenics-ffcx@0.3.0", type="run", when="@0.3.0")
@@ -47,13 +47,14 @@ class PyFenicsDolfinx(PythonPackage):
     depends_on("py-fenics-ufl@2022.1.0", type="run", when="@0.4.1")
     depends_on("py-fenics-ufl@2021.1.0", type="run", when="@0.1:0.3.99")
 
-    depends_on("py-numpy@:1.20.3", type=("build", "run"))
+    depends_on("py-numpy@1.21:", type=("build", "run"), when="@main")
+    depends_on("py-numpy", type=("build", "run"))
+
     depends_on("py-mpi4py", type=("build", "run"))
     depends_on("py-petsc4py", type=("build", "run"))
     depends_on("py-pybind11@2.6.2:", type=("build", "run"))
     depends_on("xtensor@0.23.10:", type="build")
 
     depends_on("py-cffi", type="run")
-    depends_on("py-numpy", type="run")
 
     build_directory = 'python'