diff --git a/catch2.sh b/catch2.sh
index 61c45f196e..67c807a08e 100644
--- a/catch2.sh
+++ b/catch2.sh
@@ -1,6 +1,6 @@
 package: Catch2
 version: "%(tag_basename)s"
-tag: v3.7.0
+tag: v3.7.1
 source: https://github.com/catchorg/Catch2
 requires:
   - "GCC-Toolchain:(?!osx)"
@@ -17,7 +17,7 @@ cmake "$SOURCEDIR"                                  \
       -DBUILD_SHARED_LIBS=ON                        \
       -GNinja -DCMAKE_INSTALL_PREFIX="$INSTALLROOT"
 
-cmake --build . --target install
+cmake --build . --target install ${JOBS:+-- -j$JOBS}
 
 # Modulefile
 MODULEDIR="$INSTALLROOT/etc/modulefiles"
diff --git a/faircmakemodules.sh b/faircmakemodules.sh
index 70d81546dc..490b512c16 100644
--- a/faircmakemodules.sh
+++ b/faircmakemodules.sh
@@ -5,29 +5,16 @@ source: https://github.com/FairRootGroup/FairCMakeModules
 build_requires:
   - CMake
   - "GCC-Toolchain:(?!osx)"
+  - alibuild-recipe-tools
 ---
 #!/bin/sh
 
-cmake -S $SOURCEDIR -B .                                        \
-      -DCMAKE_INSTALL_PREFIX=$INSTALLROOT                       \
-      ${CMAKE_GENERATOR:+-G "$CMAKE_GENERATOR"}                 \
+cmake -S "$SOURCEDIR" -B .                                        \
+      -DCMAKE_INSTALL_PREFIX="$INSTALLROOT"                       \
+      ${CMAKE_GENERATOR:+-G "$CMAKE_GENERATOR"}                   \
       ${CMAKE_BUILD_TYPE:+-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE}
 
-cmake --build . --target install
+cmake --build . --target install ${JOBS:+-- -j$JOBS}
 
-# Modulefile
-mkdir -p etc/modulefiles
-cat > etc/modulefiles/$PKGNAME <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0
-# Our environment
-set FAIRCMAKEMODULES_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-EoF
-mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
+mkdir -p "$INSTALLROOT/etc/modulefiles"
+alibuild-generate-module --cmake > "$INSTALLROOT/etc/modulefiles/$PKGNAME"
diff --git a/fmt.sh b/fmt.sh
index 370da2e944..1ea157d6d7 100644
--- a/fmt.sh
+++ b/fmt.sh
@@ -12,16 +12,16 @@ prepend_path:
   ROOT_INCLUDE_PATH: "$FMT_ROOT/include"
 ---
 #!/bin/bash -e
-cmake $SOURCEDIR -GNinja -DCMAKE_INSTALL_PREFIX=$INSTALLROOT -DFMT_TEST=OFF -DCMAKE_INSTALL_LIBDIR=lib -DBUILD_SHARED_LIBS=ON
+cmake "$SOURCEDIR" -GNinja -DCMAKE_INSTALL_PREFIX="$INSTALLROOT" -DFMT_TEST=OFF -DCMAKE_INSTALL_LIBDIR=lib -DBUILD_SHARED_LIBS=ON
 
-cmake --build . --target install
+cmake --build . --target install ${JOBS:+-- -j$JOBS}
 
 # Modulefile
 MODULEDIR="$INSTALLROOT/etc/modulefiles"
 MODULEFILE="$MODULEDIR/$PKGNAME"
 mkdir -p "$MODULEDIR"
 
-alibuild-generate-module --lib --cmake > $MODULEFILE
-cat << EOF >> $MODULEFILE
+alibuild-generate-module --lib --cmake > "$MODULEFILE"
+cat << EOF >> "$MODULEFILE"
 prepend-path ROOT_INCLUDE_PATH \$PKG_ROOT/include
 EOF
diff --git a/ninja.sh b/ninja.sh
index 87f35c9c22..b872587175 100644
--- a/ninja.sh
+++ b/ninja.sh
@@ -8,10 +8,10 @@ build_requires:
   - alibuild-recipe-tools
 ---
 #!/bin/bash
-cmake -Bbuild-cmake $SOURCEDIR
-cmake --build build-cmake
+cmake -Bbuild-cmake "$SOURCEDIR"
+cmake --build build-cmake ${JOBS:+-j$JOBS}
 
-mkdir -p $INSTALLROOT/bin
+mkdir -p "$INSTALLROOT"/bin
 cp build-cmake/ninja "$INSTALLROOT/bin"
 
 mkdir -p "$INSTALLROOT/etc/modulefiles"