diff --git a/obs/config b/obs/config
index 4b83ff2..3548294 100644
--- a/obs/config
+++ b/obs/config
@@ -47,22 +47,23 @@ skip_x86  = ["-arm1","gnu15-impi"]
 compiler_families=["gnu15", "intel"]
 mpi_families=["openmpi5","mpich","mvapich2","impi"]
 compiler_dependent = ["openmpi", "mpich", "mvapich2", "openblas", "R", "likwid",
-                      "!pdtoolkit", "gsl", "metis", "superlu", "scotch",
+                      "pdtoolkit", "gsl", "metis", "superlu", "scotch",
                       "numpy", "plasma", "hdf5", "gotcha", "cubew", "cubelib", "opari2"]
 
 standalone = ["docs", "test-suite", "warewulf", "gnu-compilers", "ohpc-filesystem",
               "cmake", "pdsh", "intel-compilers-devel","autoconf","automake", "pmix",
               "impi-devel", "meta-packages", "easybuild", "spack", "hwloc", "ucx",
+              "conman", "examples", "charliecloud", "magpie",
               "python-Cython", "openpbs", "libtool", "prun", "papi", "nhc", "losf",
               "lmod", "genders", "hpc-workspace", "valgrind", "slurm", "cuda-devel"]
 
 mpi_dependent = ["otf2", "sionlib", "fftw", "scalapack",
-		 "scorep", "scalasca", "!scipy", "phdf5", "netcdf", "netcdf-fortran",
-		 "netcdf-cxx", "lmod-defaults", "!geopm", "!mumps", "omb",
+		 "scorep", "scalasca", "phdf5", "netcdf", "netcdf-fortran",
+		 "netcdf-cxx", "lmod-defaults", "!geopm", "mumps", "omb",
 		 "ptscotch", "boost", "pnetcdf", "tau", "extrae", "imb",
-		 "opencoarrays", "hypre", "mpi4py", "dimemas", "adios2",
-		 "!trilinos", "petsc", "slepc", "superlu_dist", "!mfem"]
-skip_on_distro_openEuler_22.03 = ["-arm1","-intel","-impi","impi-devel","intel-compilers-devel",
+		 "!opencoarrays", "hypre", "mpi4py", "dimemas", "adios2",
+		 "trilinos", "petsc", "slepc", "superlu_dist", "mfem"]
+skip_on_distro_openEuler_24.03 = ["-arm1","-intel","-impi","impi-devel","intel-compilers-devel",
 				  "arm-compilers-devel","warewulf","cuda-devel"]
 openblas_compiler=["gnu15"]
 R_compiler=["gnu15"]
@@ -87,15 +88,15 @@ compiler_dependent = ["!openmpi", "!mpich", "!mvapich2", "!openblas", "!R", "!li
                       "!numpy", "!plasma", "!hdf5", "!gotcha", "!cubew", "!cubelib", "!opari2"]
 
 standalone = ["docs", "test-suite", "warewulf", "!gnu-compilers", "ohpc-filesystem",
-	      "!cmake", "!pdsh", "intel-compilers-devel", "examples",
-	      "impi-devel", "!meta-packages", "easybuild", "!spack", "!hwloc", "!ucx",
+	      "cmake", "!pdsh", "intel-compilers-devel", "examples",
+	      "impi-devel", "!meta-packages", "easybuild", "spack", "!hwloc", "!ucx",
 	      "lmod", "!genders", "hpc-workspace", "valgrind", "!slurm", "!cuda-devel"]
 mpi_dependent = ["!otf2", "!sionlib", "!fftw", "!scalapack",
 		 "scorep", "!scalasca", "!scipy", "!phdf5", "!netcdf", "!netcdf-fortran",
 		 "!netcdf-cxx", "!lmod-defaults", "!geopm", "!mumps", "!omb",
 		 "!ptscotch", "!boost", "!pnetcdf", "!tau", "!extrae", "!imb",
 		 "!opencoarrays", "!hypre", "!mpi4py", "!dimemas", "!adios2",
-		 "!trilinos", "!petsc", "!slepc", "!superlu_dist", "!mfem"]
+		 "trilinos", "!petsc", "!slepc", "!superlu_dist", "!mfem"]
 skip_on_distro_openEuler_22.03 = ["-arm1","-intel","-impi","impi-devel","intel-compilers-devel",
 				  "arm-compilers-devel","warewulf","cuda-devel"]
 openblas_compiler=["gnu14", "gnu15"]
diff --git a/obs/constraints/trilinos-intel-impi b/obs/constraints/trilinos-intel-impi
deleted file mode 100644
index 651b831..0000000
--- a/obs/constraints/trilinos-intel-impi
+++ /dev/null
@@ -1,7 +0,0 @@
-<constraints>
-  <hardware>
-    <memory>
-      <size unit="M">6000</size>
-    </memory>
-  </hardware>
-</constraints>
diff --git a/obs/constraints/trilinos-intel-mpich b/obs/constraints/trilinos-intel-mpich
deleted file mode 100644
index 651b831..0000000
--- a/obs/constraints/trilinos-intel-mpich
+++ /dev/null
@@ -1,7 +0,0 @@
-<constraints>
-  <hardware>
-    <memory>
-      <size unit="M">6000</size>
-    </memory>
-  </hardware>
-</constraints>
diff --git a/obs/constraints/trilinos-intel-mvapich2 b/obs/constraints/trilinos-intel-mvapich2
deleted file mode 100644
index 651b831..0000000
--- a/obs/constraints/trilinos-intel-mvapich2
+++ /dev/null
@@ -1,7 +0,0 @@
-<constraints>
-  <hardware>
-    <memory>
-      <size unit="M">6000</size>
-    </memory>
-  </hardware>
-</constraints>
diff --git a/obs/constraints/trilinos-intel-openmpi3 b/obs/constraints/trilinos-intel-openmpi3
deleted file mode 100644
index 651b831..0000000
--- a/obs/constraints/trilinos-intel-openmpi3
+++ /dev/null
@@ -1,7 +0,0 @@
-<constraints>
-  <hardware>
-    <memory>
-      <size unit="M">6000</size>
-    </memory>
-  </hardware>
-</constraints>