diff --git a/Compiler/hdf5_serial/files/config.yaml b/Compiler/hdf5_serial/files/config.yaml
index 00cbb15..4026415 100644
--- a/Compiler/hdf5_serial/files/config.yaml
+++ b/Compiler/hdf5_serial/files/config.yaml
@@ -202,3 +202,13 @@ hdf5_serial:
           compiler:
             gcc: [6.5.0, 7.5.0, 8.5.0, 9.5.0, 10.3.0, 11.3.0, 12.1.0]
         relstage: stable
+
+    1.12.3:
+      config:
+        group_deps:
+          compiler:
+            gcc: [7.5.0, 8.5.0, 9.5.0, 10.4.0, 11.3.0, 12.1.0]
+        relstage: unstable
+        urls:
+          - url: https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${V_MAJOR}.${V_MINOR}/hdf5-$V/src/hdf5-$V.tar.bz2
+            strip_dirs: 2
diff --git a/Compiler/openmpi/files/config.yaml b/Compiler/openmpi/files/config.yaml
index a15cd1b..afd076f 100644
--- a/Compiler/openmpi/files/config.yaml
+++ b/Compiler/openmpi/files/config.yaml
@@ -57,8 +57,17 @@ openmpi:
   versions:
     4.1.6:
       variants:
-        - systems: [merlin-*, ra-*]
+        - systems: [merlin-.*]
           suffix: _slurm
+          relstage: unstable
+          overlay: private
+          use_overlays: [private]
+          group_deps:
+            compiler: {gcc: [9.5.0, 10.4.0, 11.4.0, 12.3.0, 13.1.0]}
+          build_requires: [pmix/4.2.4, ucx/1.14.1_slurm, libfabric/1.18.0, hwloc/2.9.1, patchelf/0.14.5]
+          runtime_deps: [cuda/12.1.1]
+        - systems: [ra-.*]
+          suffix: _ra
           group_deps:
             compiler: {gcc: [9.5.0, 10.4.0, 11.4.0, 12.3.0, 13.1.0]}
           build_requires: [pmix/4.2.4, ucx/1.14.1_slurm, hwloc/2.9.1, patchelf/0.14.5]
diff --git a/MPI/parmetis/files/config.yaml b/MPI/parmetis/files/config.yaml
index ed6d400..c351c87 100644
--- a/MPI/parmetis/files/config.yaml
+++ b/MPI/parmetis/files/config.yaml
@@ -1,29 +1,27 @@
-parmetis/3.2.0	deprecated	gcc/{4.7.4,4.8.3,4.8.4,4.9.2} openmpi/{1.6.5,1.8.2,1.8.4}
+---
+# yamllint disable rule:line-length
+format: 1
+parmetis:
+  defaults:
+    group: MPI
+    overlay: base
+    relstage: stable
+    systems: [merlin-*, ra-*]
+    docfiles: [Changelog, Install.txt, LICENSE.txt]
+    urls:
+      - url: http://glaros.dtc.umn.edu/gkhome/fetch/sw/$P/$P-${V_PKG}.tar.gz 
+        name: $P-${V_PKG}.tar.gz
 
-parmetis/3.2.0	deprecated	gcc/{4.8.5,5.3.0,6.1.0,6.2.0} openmpi/1.10.2
+  shasums:
+    - parmetis-4.0.3.tar.gz: f2d9a231b7cf97f1fee6e8c9663113ebf6c240d407d3c118c55b3633d6be6e5f
 
-parmetis/3.2.0	deprecated	gcc/6.2.0 openmpi/{1.10.4,2.0.1}
+  versions:
+    4.0.3_slurm:
+      variants:
+        - group_deps:
+            compiler:
+              gcc: [9.5.0, 10.4.0, 11.4.0, 12.3.0, 13.1.0]
+            mpi:
+              openmpi: [4.1.5_slurm]
+          build_requires: [cmake/3.20.5]
 
-parmetis/3.2.0	deprecated	gcc/7.3.0 openmpi/3.0.1
-
-parmetis/3.2.0	deprecated	intel/15.3 openmpi/1.8.4
-
-parmetis/4.0.3	deprecated	gcc/4.8.2 openmpi/1.6.5  b:cmake/3.4.1
-parmetis/4.0.3	deprecated	gcc/{4.8.5,4.9.4,5.3.0,5.4.0,6.1.0,6.2.0} openmpi/1.10.2 b:cmake/3.4.1
-
-parmetis/4.0.3	deprecated	gcc/{4.8.5,4.9.4,5.4.0,6.2.0} openmpi/1.10.4 b:cmake/3.6.3
-
-parmetis/4.0.3	deprecated	gcc/6.2.0 openmpi/2.0.1  b:cmake/3.6.3
-
-parmetis/4.0.3	deprecated	gcc/7.3.0 openmpi/{1.10.7,2.1.2,3.0.0,3.0.1,3.1.2,3.1.3} b:cmake/3.6.3
-parmetis/4.0.3	deprecated	gcc/7.4.0 openmpi/3.1.4  b:cmake/3.9.6
-
-parmetis/4.0.3	deprecated	intel/17.4 openmpi/{1.10.7,2.1.2,3.0.0} b:cmake/3.6.3
-
-parmetis/4.0.3	stable		gcc/7.3.0 mpich/3.3  b:cmake/3.9.6
-
-parmetis/4.0.3	stable		gcc/{7.5.0,8.4.0,9.3.0,10.1.0} openmpi/3.1.6 b:cmake/3.9.6
-
-parmetis/4.0.3	stable		gcc/{7.5.0,8.4.0,9.3.0,10.3.0} openmpi/4.0.5 b:cmake/3.15.5
-parmetis/4.0.3	stable		gcc/10.4.0 openmpi/4.1.4 b:cmake/3.15.5
-parmetis/4.0.3	unstable		gcc/10.4.0 openmpi/4.1.5 b:cmake/3.15.5
diff --git a/Programming/nvhpc/files/config.yaml b/Programming/nvhpc/files/config.yaml
index 7c58b14..877c2dc 100644
--- a/Programming/nvhpc/files/config.yaml
+++ b/Programming/nvhpc/files/config.yaml
@@ -6,9 +6,9 @@ nvhpc:
     group: Programming
     overlay: base
     relstage: stable
-    systems: [rhel7, rhel8, rhel9]
+    systems: ['*.merlin7.*', 'merlin-*', 'ra-*']
     docfiles: [AUTHORS, LICENSE, NEWS, README]
-    compile_in_sourcetree: true 
+    compile_in_sourcetree: true
   shasums:
     nvhpc-24.3.tar.gz: 4fb8949ba8cef73b28818bd9375c9420ec48fab1c64e71315a7c1984f5329d6b
     nvhpc-23.5.tar.gz: 3196309b38df6f0a27e18b80f6a40e23cab8195cad43fc6bbd569af7d8ca5742
@@ -16,18 +16,15 @@ nvhpc:
   versions:
     24.3:
       variants:
-        - systems: [merlin-*, ra-*]
-          suffix: _cuda_12.3
+        - suffix: _cuda_12.3
           urls:
             - url: https://developer.download.nvidia.com/hpc-sdk/${V_PKG}/nvhpc_2024_243_Linux_x86_64_cuda_12.3.tar.gz
-          suffix: _cuda_12.3
-          relstage: unstable
+          relstage: stable
           build_requires: [gcc/10.4.0]
     23.5:
       variants:
-        - systems: [merlin-*, ra-*]
-          suffix: _cuda_12.1
+        - suffix: _cuda_12.1
           urls:
             - url: https://developer.download.nvidia.com/hpc-sdk/${V_PKG}/nvhpc_2023_235_Linux_x86_64_cuda_12.1.tar.gz
-          relstage: unstable
+          relstage: stable
           build_requires: [gcc/10.4.0]
diff --git a/Tools/git/build b/Tools/git/build
index 16961b7..38fb16c 100755
--- a/Tools/git/build
+++ b/Tools/git/build
@@ -11,7 +11,6 @@ pbuild::pre_configure_Darwin() {
 	export NO_APPLE_COMMON_CRYPTO=1
 }
 
-
 pbuild::pre_configure() {
 	#pbuild::add_configure_args "LIBS=-lintl"
 	pbuild::add_configure_args "--with-tcltk"
diff --git a/Tools/git/files/config.yaml b/Tools/git/files/config.yaml
index 06f4ade..1885092 100644
--- a/Tools/git/files/config.yaml
+++ b/Tools/git/files/config.yaml
@@ -6,7 +6,6 @@ git:
     group: Tools
     overlay: base
     relstage: stable
-    systems: [rhel6, rhel7, rhel8]
     compile_in_sourcetree: true
     urls:
       - url: https://mirrors.edge.kernel.org/pub/software/scm/git/git-${V_PKG}.tar.xz
@@ -21,21 +20,38 @@ git:
     git-2.8.1.tar.xz: e6626b43ba4bc63ad4918df4c275f50bd7f8af2ab54bde60496ad75e91e927fc
     git-2.3.3.tar.gz: c189e4a48d8805482f450db666330c79bcefae37e0d035c7717517126ddf4305
   versions:
+    2.45.2:
+      config:
+        runtime_deps: [TclTk/8.6.9, openssl/1.1.1w]
+        build_requires: [gcc/10.4.0, perl/5.30.0, asciidoc/8.6.9-1, xmlto/0.0.28, gettext/0.19.8]
+        relstage: unstable
+        overlay: devel
+        docfiles: [COPYING, README.md]
+        configure_args:
+          - --with-tcltk
+          - --with-iconv=${GETTEXT_PREFIX}
+          - --with-perl=${PERL_PREFIX}/bin/perl
+        sub_packages:
+          - name: git-lfs
+            version: 3.5.1
+            build_args:
     2.43.1:
       config:
         runtime_deps: [TclTk/8.6.9]
         build_requires: [gcc/10.4.0, perl/5.30.0, asciidoc/8.6.9-1, xmlto/0.0.28, gettext/0.19.8, openssl/1.1.1w]
         relstage: unstable
         overlay: devel
-        systems: [rhel7, rhel8, rhel9]
         docfiles: [COPYING, README.md]
+        configure_args:
+          - --with-tcltk
+          - --with-iconv=${GETTEXT_PREFIX}
+          - --with-perl=${PERL_PREFIX}/bin/perl
     2.42.0:
       config:
         runtime_deps: [TclTk/8.6.9]
         build_requires: [gcc/10.4.0, perl/5.30.0, asciidoc/8.6.9-1, xmlto/0.0.28, gettext/0.19.8]
         relstage: unstable
         overlay: devel
-        systems: [rhel7, rhel8, rhel9]
         docfiles: [COPYING, README.md]
     2.39.1;2.37.2;2.37.0;2.33.1;2.30.0;2.22.0;2.21.0:
       config:
@@ -44,3 +60,17 @@ git:
     2.3.3;2.8.1:
       config:
         runtime_deps: [Tcl/8.6.9, Tk/8.6.9]
+
+git-lfs:
+  type: sub_package
+  defaults:
+    compile_in_sourcetree: true
+  versions:
+    3.5.1:
+      config:
+      variants:
+        -
+          kernels: [Linux]
+          target_cpus: [x86_64]
+          urls:
+            - url: https://github.com/git-lfs/git-lfs/releases/download/v3.5.1/git-lfs-linux-amd64-v3.5.1.tar.gz
diff --git a/Tools/gnuplot/build-yaml b/Tools/gnuplot/build-yaml
index 3a25f73..4d92699 100755
--- a/Tools/gnuplot/build-yaml
+++ b/Tools/gnuplot/build-yaml
@@ -1,9 +1,5 @@
 #!/usr/bin/env modbuild
 
-pbuild::pre_configure() {
-	pbuild::add_configure_args '--with-latex=no'
-	pbuild::add_configure_args '--with-qt=no'
-}
 # Local Variables:
 # mode: sh
 # sh-basic-offset: 8
diff --git a/Tools/gnuplot/files/config.yaml b/Tools/gnuplot/files/config.yaml
index 7bfcef0..9e709c2 100644
--- a/Tools/gnuplot/files/config.yaml
+++ b/Tools/gnuplot/files/config.yaml
@@ -1,13 +1,14 @@
+---
 format: 1
 gnuplot:
   defaults:
     group: Tools
-    overlay: base 
+    overlay: base
     relstage: stable
     systems: [rhel8, rhel7, rhel6]
     docfiles: [Copyright, NEWS, README]
     urls:
-      - url: https://sourceforge.net/projects/gnuplot/files/$P/$V/$P-${V_PKG}.tar.gz 
+      - url: https://sourceforge.net/projects/gnuplot/files/$P/$V/$P-${V_PKG}.tar.gz
   shasums:
     gnuplot-5.4.10.tar.gz: 975d8c1cc2c41c7cedc4e323aff035d977feb9a97f0296dd2a8a66d197a5b27c
     gnuplot-5.4.9.tar.gz: a328a021f53dc05459be6066020e9a71e8eab6255d3381e22696120d465c6a97
@@ -27,7 +28,16 @@ gnuplot:
   versions:
     5.4.{0,1,2,3,4,5,8,9};5.2.{0,4,6,7,8};5.0.0;4.6.3:
     5.4.10:
+      config:
+        relstage: stable
+    6.0.0:
       config:
         relstage: unstable
-
+        systems: [rhel*]
+        configure_args: ['--with-latex=no', '--with-qt=no']
+    6.0.1:
+      config:
+        relstage: unstable
+        systems: [rhel*]
+        configure_args: ['--with-latex=no', '--with-qt=no']