diff --git a/cmake/modules/FindACE.cmake b/cmake/modules/FindACE.cmake
index e21bc01ba6..ce88264277 100644
--- a/cmake/modules/FindACE.cmake
+++ b/cmake/modules/FindACE.cmake
@@ -13,7 +13,12 @@ cp2k_set_default_paths(ACE "ace")
 cp2k_include_dirs(
   ACE "ace/ace_couplings.h;ace-evaluator/ace_types.h;yaml-cpp/yaml.h")
 cp2k_find_libraries(ACE "pace")
-cp2k_find_libraries(ACE_YAML "yaml-cpp-pace")
+find_package(yaml-cpp-pace QUIET)
+if(yaml-cpp-pace_FOUND)
+  cp2k_find_libraries(ACE_YAML "yaml-cpp-pace")
+else()
+  cp2k_find_libraries(ACE_YAML "yaml")
+endif()
 cp2k_find_libraries(ACE_CNPY "cnpy")
 
 find_package_handle_standard_args(
diff --git a/tools/spack/spack_repo/cp2k_dev/packages/pace/package.py b/tools/spack/spack_repo/cp2k_dev/packages/pace/package.py
index 4e99cd1a21..0f082f3e44 100644
--- a/tools/spack/spack_repo/cp2k_dev/packages/pace/package.py
+++ b/tools/spack/spack_repo/cp2k_dev/packages/pace/package.py
@@ -41,8 +41,8 @@ class Pace(CMakePackage):
     depends_on("cxx", type="build")
 
     # Build always with the yaml-cpp and cnpy version included in pace
-    # depends_on("yaml-cpp")
-    # depends_on("cnpy")
+    depends_on("yaml-cpp")
+    depends_on("cnpy")
 
     def cmake_args(self):
         args = [
@@ -60,5 +60,3 @@ class Pace(CMakePackage):
         install_tree(join_path(src, "yaml-cpp/include"), prefix.include)
         mkdirp(prefix.lib)
         install(join_path(self.build_directory, "libpace.a"), prefix.lib)
-        install(join_path(self.build_directory, "libcnpy.a"), prefix.lib)
-        install(join_path(self.build_directory, "build-yaml-cpp/libyaml-cpp-pace.a"), prefix.lib)