diff --git a/.github/workflows/scripts/compare_to_generic.sh b/.github/workflows/scripts/compare_to_generic.sh
index 59a1397ec5..8f046ec9d4 100755
--- a/.github/workflows/scripts/compare_to_generic.sh
+++ b/.github/workflows/scripts/compare_to_generic.sh
@@ -23,4 +23,32 @@ esac
 source_of_truth_modules="$base_dir/$source_of_truth/$modules_subdir"
 arch_modules="$base_dir/$target_arch/$modules_subdir"
 echo "Comparing $arch_modules to $source_of_truth_modules"
-python3 $script_dir/compare_stacks.py $source_of_truth_modules $arch_modules
+
+if ! python3 $script_dir/compare_stacks.py $source_of_truth_modules $arch_modules; then
+    echo "Warning: Comparison failed for CPU stacks" >&2
+    exit 1
+fi
+
+# Also compare NVIDIA GPU software stacks
+if [[ -n "$CUDA_COMPUTE_CAPABILITIES" ]]; then
+    read -ra compute_capabilities <<< "$CUDA_COMPUTE_CAPABILITIES"
+    echo "Also comparing CUDA-enabled software stacks (for compute capabilities: ${compute_capabilities[@]})"
+    # Initialize a variable to track failures
+    any_failure=0
+    # Loop over the array
+    for cc in "${compute_capabilities[@]}"; do
+        source_of_truth_modules="$base_dir/$source_of_truth/accel/nvidia/cc80/$modules_subdir"
+        arch_modules="$base_dir/$target_arch/accel/nvidia/$cc/$modules_subdir"
+        echo "Comparing $arch_modules to $source_of_truth_modules"
+        if ! python3 $script_dir/compare_stacks.py $source_of_truth_modules $arch_modules; then
+            echo "Warning: Comparison failed for compute capability $cc" >&2
+            any_failure=1
+        fi
+    done
+    if [[ $any_failure -ne 0 ]]; then
+        echo "One or more CUDA software stack comparisons failed." >&2
+        exit 1
+    fi
+else
+    echo "CUDA_COMPUTE_CAPABILITIES is not set or is empty, not checking NVIDIA software stacks"
+fi
diff --git a/.github/workflows/test-software.eessi.io.yml b/.github/workflows/test-software.eessi.io.yml
index 9d8cb020ba..f936d68834 100644
--- a/.github/workflows/test-software.eessi.io.yml
+++ b/.github/workflows/test-software.eessi.io.yml
@@ -8,7 +8,6 @@ on:
 permissions:
   contents: read # to fetch code (actions/checkout)
 env:
-  EESSI_VERSION: '2023.06'
   EESSI_ACCELERATOR_TARGETS: |
     x86_64/amd/zen2:
       - nvidia/cc80
@@ -20,33 +19,90 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # Arm CPU targets
+          # Arm CPU targets (EESSI 2023.06)
           - runs_on: ubuntu-24.04-arm
+            EESSI_VERSION: 2023.06
             EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/generic
           - runs_on: ubuntu-24.04-arm
+            EESSI_VERSION: 2023.06
             EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/neoverse_n1
           - runs_on: ubuntu-24.04-arm
+            EESSI_VERSION: 2023.06
             EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/neoverse_v1
           - runs_on: ubuntu-24.04-arm
+            EESSI_VERSION: 2023.06
             EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/nvidia/grace
-          # x86_64 CPU targets
+          # Arm CPU targets (EESSI 2025.06)
+          - runs_on: ubuntu-24.04-arm
+            EESSI_VERSION: 2025.06
+            EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/a64fx
+          - runs_on: ubuntu-24.04-arm
+            EESSI_VERSION: 2025.06
+            EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/generic
+          - runs_on: ubuntu-24.04-arm
+            EESSI_VERSION: 2025.06
+            EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/neoverse_n1
+          - runs_on: ubuntu-24.04-arm
+            EESSI_VERSION: 2025.06
+            EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/neoverse_v1
+          - runs_on: ubuntu-24.04-arm
+            EESSI_VERSION: 2025.06
+            EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/nvidia/grace
+          # x86_64 CPU targets (EESSI 2023.06)
+          - runs_on: ubuntu-24.04
+            EESSI_VERSION: 2023.06
+            EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/amd/zen2
+          - runs_on: ubuntu-24.04
+            EESSI_VERSION: 2023.06
+            EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/amd/zen3
+          - runs_on: ubuntu-24.04
+            EESSI_VERSION: 2023.06
+            EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/amd/zen4
+          - runs_on: ubuntu-24.04
+            EESSI_VERSION: 2023.06
+            EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/haswell
+          - runs_on: ubuntu-24.04
+            EESSI_VERSION: 2023.06
+            EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/sapphirerapids
+          - runs_on: ubuntu-24.04
+            EESSI_VERSION: 2023.06
+            EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/skylake_avx512
+          - runs_on: ubuntu-24.04
+            EESSI_VERSION: 2023.06
+            EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/icelake
+          - runs_on: ubuntu-24.04
+            EESSI_VERSION: 2023.06
+            EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/cascadelake
+          - runs_on: ubuntu-24.04
+            EESSI_VERSION: 2023.06
+            EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/generic
+          # x86_64 CPU targets (EESSI 2025.06)
           - runs_on: ubuntu-24.04
+            EESSI_VERSION: 2025.06
             EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/amd/zen2
           - runs_on: ubuntu-24.04
+            EESSI_VERSION: 2025.06
             EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/amd/zen3
           - runs_on: ubuntu-24.04
+            EESSI_VERSION: 2025.06
             EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/amd/zen4
           - runs_on: ubuntu-24.04
+            EESSI_VERSION: 2025.06
             EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/haswell
           - runs_on: ubuntu-24.04
+            EESSI_VERSION: 2025.06
             EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/sapphirerapids
           - runs_on: ubuntu-24.04
+            EESSI_VERSION: 2025.06
             EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/skylake_avx512
           - runs_on: ubuntu-24.04
+            EESSI_VERSION: 2025.06
             EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/icelake
           - runs_on: ubuntu-24.04
+            EESSI_VERSION: 2025.06
             EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/cascadelake
           - runs_on: ubuntu-24.04
+            EESSI_VERSION: 2025.06
             EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/generic
     runs-on: ${{ matrix.runs_on }}
     steps:
@@ -77,17 +133,17 @@ jobs:
         - name: Check for missing installlations
           run: |
               export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}}
-              source /cvmfs/software.eessi.io/versions/${EESSI_VERSION}/init/bash
+              source /cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}}/init/bash
               # set $EESSI_CPU_FAMILY to the CPU architecture that corresponds to $EESSI_SOFTWARE_SUBDIR_OVERRIDE (part before the first slash),
               # to prevent issues with checks in the Easybuild configuration that use this variable
               export EESSI_CPU_FAMILY=${EESSI_SOFTWARE_SUBDIR_OVERRIDE%%/*}
-              export EESSI_PREFIX=/cvmfs/software.eessi.io/versions/${EESSI_VERSION}
+              export EESSI_PREFIX=/cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}}
               export EESSI_OS_TYPE=linux
               env | grep ^EESSI | sort
 
               # first check the CPU-only builds for this CPU target
               echo "first run check_missing_installations.sh for CPU-only builds"
-              for easystack_file in $(EESSI_VERSION=${EESSI_VERSION} .github/workflows/scripts/only_latest_easystacks.sh); do
+              for easystack_file in $(EESSI_VERSION=${{matrix.EESSI_VERSION}} .github/workflows/scripts/only_latest_easystacks.sh); do
                   eb_version=$(echo ${easystack_file} | sed 's/.*eb-\([0-9.]*\).*.yml/\1/g')
                   echo "check missing installations for ${easystack_file} with EasyBuild ${eb_version}..."
                   module purge
@@ -107,7 +163,7 @@ jobs:
                   for accel in ${accelerators}; do
                       module use ${EESSI_SOFTWARE_PATH}/accel/${accel}/modules/all
                       echo "checking missing installations for accelerator ${accel} using modulepath: ${MODULEPATH}"
-                      for easystack_file in $(EESSI_VERSION=${EESSI_VERSION} ACCEL_EASYSTACKS=1 .github/workflows/scripts/only_latest_easystacks.sh); do
+                      for easystack_file in $(EESSI_VERSION=${{matrix.EESSI_VERSION}} ACCEL_EASYSTACKS=1 .github/workflows/scripts/only_latest_easystacks.sh); do
                           eb_version=$(echo ${easystack_file} | sed 's/.*eb-\([0-9.]*\).*.yml/\1/g')
                           echo "check missing installations for ${easystack_file} with EasyBuild ${eb_version}..."
                           module purge
@@ -128,14 +184,14 @@ jobs:
         - name: Test check_missing_installations.sh with missing package (GCC/8.3.0)
           run: |
               export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}}
-              source /cvmfs/software.eessi.io/versions/${EESSI_VERSION}/init/bash
+              source /cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}}/init/bash
               # set $EESSI_CPU_FAMILY to the CPU architecture that corresponds to $EESSI_SOFTWARE_SUBDIR_OVERRIDE (part before the first slash),
               # to prevent issues with checks in the Easybuild configuration that use this variable
               export EESSI_CPU_FAMILY=${EESSI_SOFTWARE_SUBDIR_OVERRIDE%%/*}
               module load EasyBuild
               which eb
               eb --version
-              export EESSI_PREFIX=/cvmfs/software.eessi.io/versions/${EESSI_VERSION}
+              export EESSI_PREFIX=/cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}}
               export EESSI_OS_TYPE=linux
               env | grep ^EESSI | sort
               # create dummy easystack file with a single entry (something that is not installed in EESSI)
diff --git a/.github/workflows/test_compare_stacks.yml b/.github/workflows/test_compare_stacks.yml
index 8458047cfe..f03929349b 100644
--- a/.github/workflows/test_compare_stacks.yml
+++ b/.github/workflows/test_compare_stacks.yml
@@ -8,11 +8,17 @@ on:
 permissions:
   contents: read # to fetch code (actions/checkout)
 env:
-  EESSI_ACCELERATOR_TARGETS: |
+  CUDA_COMPUTE_CAPABILITIES_YAML: |
+    # Provide a default set of compute capabilities
+    default:
+      - cc70
+      - cc80
+      - cc90
+    # and then allow for special cases for specific architectures
     x86_64/amd/zen2:
-      - nvidia/cc80
-    x86_64/amd/zen3:
-      - nvidia/cc80
+      - cc70
+      - cc80
+      - cc90
 jobs:
   compare_stacks:
     runs-on: ubuntu-24.04
@@ -21,7 +27,9 @@ jobs:
       matrix:
         EESSI_VERSION:
         - 2023.06
+        - 2025.06
         COMPARISON_ARCH:
+        - aarch64/a64fx
         - aarch64/neoverse_n1
         - aarch64/neoverse_v1
         - aarch64/nvidia/grace
@@ -33,6 +41,9 @@ jobs:
         - x86_64/intel/sapphirerapids
         - x86_64/intel/icelake
         - x86_64/intel/cascadelake
+        exclude:
+        - EESSI_VERSION: 2023.06
+          COMPARISON_ARCH: aarch64/a64fx
     steps:
         - name: Check out software-layer repository
           uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -48,4 +59,11 @@ jobs:
 
               # Compare the requested architecture to the generic stack
               # (assumes the general structure /cvmfs/software.eessi.io/versions/2023.06/software/linux/$COMPARISON_ARCH/modules/all)
+              # and include a check for CUDA-enabled software using the environment variable CUDA_COMPUTE_CAPABILITIES
+              # (which assumes the structure /cvmfs/software.eessi.io/versions/2023.06/software/linux/$COMPARISON_ARCH/accel/nvidia/$cc/modules/all)
+              
+              # Parse the yaml that makes the compute capabilities arch-dependent
+              CUDA_COMPUTE_CAPABILITIES=$(echo "${CUDA_COMPUTE_CAPABILITIES_YAML}" | yq ".\"${{matrix.COMPARISON_ARCH}}\" // .default | .[]" | tr '\n' ' ')
+              export CUDA_COMPUTE_CAPABILITIES=${CUDA_COMPUTE_CAPABILITIES%% }  # trim trailing space
+              
               .github/workflows/scripts/compare_to_generic.sh ${EESSI_PREFIX}/software/${EESSI_OS_TYPE} ${{matrix.COMPARISON_ARCH}}
diff --git a/bot/build.sh b/bot/build.sh
index d72ecbdd0c..9c920ff277 100755
--- a/bot/build.sh
+++ b/bot/build.sh
@@ -3,12 +3,12 @@
 # give up as soon as any error occurs
 set -e
 
-git clone https://github.com/EESSI/software-layer-scripts
+git clone --single-branch --branch match_partition_name_to_job_cfg  https://github.com/casparvl/software-layer-scripts
 
 # symlink everything, except for:
 # - common files like LICENSE and README.md
 # - 'bot' subdirectory, there we need to be a bit more careful (see below)
-for file in $(ls software-layer-scripts | egrep -v 'LICENSE|README.md|^bot'); do
+for file in $(ls software-layer-scripts | egrep -v 'easystacks|LICENSE|README.md|^bot'); do
     ln -s software-layer-scripts/${file}
 done
 
diff --git a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.8.2-2022b.yml b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.8.2-2022b.yml
new file mode 100644
index 0000000000..f66ca212f7
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.8.2-2022b.yml
@@ -0,0 +1,26 @@
+easyconfigs:
+  # dependencies of Qt5
+  - re2c-3.0-GCCcore-12.2.0.eb
+  - Python-2.7.18-GCCcore-12.2.0-bare.eb
+  - graphite2-1.3.14-GCCcore-12.2.0.eb
+  - double-conversion-3.2.1-GCCcore-12.2.0.eb
+  - Mako-1.2.4-GCCcore-12.2.0.eb
+  - libjpeg-turbo-2.1.4-GCCcore-12.2.0.eb
+  - snappy-1.1.9-GCCcore-12.2.0.eb
+  - libdrm-2.4.114-GCCcore-12.2.0.eb
+  - NSS-3.85-GCCcore-12.2.0.eb
+  - JasPer-4.0.0-GCCcore-12.2.0.eb
+  - libglvnd-1.6.0-GCCcore-12.2.0.eb
+  - nodejs-18.12.1-GCCcore-12.2.0.eb
+  - libunwind-1.6.2-GCCcore-12.2.0.eb
+  - LLVM-15.0.5-GCCcore-12.2.0.eb
+  # from here on built originally with EB 4.8.2
+  # need to keep building Qt5 with 4.8.2 because more recent versions include an
+  # updated easyblock for python which doesn't work correctly for Python-2.7.18
+  - Qt5-5.15.7-GCCcore-12.2.0.eb
+  # try to also build QE with EB 4.8.2 --> worked but it looks like we may not have
+  # used the FoX library, see https://github.com/easybuilders/easybuild-easyconfigs/pull/20070/files#diff-b5e488fd7d21901d2307ed7994868853061fb5c60080e91cb186e2f937e45522
+  # so we move building QE 7.2 with EB 4.9.4; that failed plus QE was not built
+  # with the FoX library for any other of the supported CPU microarchitectures,
+  # hence we keep building it with EB 4.8.2 (here in this easystack file)
+  - QuantumESPRESSO-7.2-foss-2022b.eb
diff --git a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.0-2023a.yml b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.0-2023a.yml
new file mode 100644
index 0000000000..fa1b9b388e
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.0-2023a.yml
@@ -0,0 +1,4 @@
+easyconfigs:
+#This is an outdated version of the Z3-4.12.2-GCCcore-12.3.0 easyconfig, adding it to keep sync with the other stacks
+#see https://github.com/easybuilders/easybuild-easyconfigs/pull/20050
+  - Z3-4.12.2-GCCcore-12.3.0-Python-3.11.3.eb
diff --git a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.2-2023b.yml b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.2-2023b.yml
index c7411ada0a..9c3ebe2d6f 100644
--- a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.2-2023b.yml
+++ b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.2-2023b.yml
@@ -4,3 +4,35 @@ easyconfigs:
         # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20820
         from-commit: 1fc885b35dacdeb2feef4af207a2daa2502bae08
   - foss-2023b.eb
+  - IPython-8.17.2-GCCcore-13.2.0.eb
+  - dlb-3.4-gompi-2023b.eb
+  - pystencils-1.3.4-gfbf-2023b.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20889
+        from-commit: c66c4788a17f7e4f55aa23f9fdb782aad97c9ce7
+  - Extrae-4.2.0-gompi-2023b.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21017
+        from-commit: 120f4d56efebd2bc61382db4c84a664a339c66cf
+        # see https://github.com/easybuilders/easybuild-easyblocks/pull/3393
+        include-easyblocks-from-commit: c4951c78d62fa5cf8e9f6fe0ead212d2a4d7cb9c
+  - Boost.MPI-1.83.0-gompi-2023b.eb:
+     options:
+       # source URLs for Boost.* have changed, corresponding PR is
+       # https://github.com/easybuilders/easybuild-easyconfigs/pull/22240
+       # Boost.MPI is a dependency of pyMBE
+       from-commit: e610fe1ac5393d1de668a466fdaaea74c580ee03
+  - pyMBE-0.8.0-foss-2023b.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21034
+        from-commit: 76e7fc6657bab64bfbec826540a3a8f0040258f2
+  - STAR-2.7.11b-GCC-13.2.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21200
+        from-commit: 765ba900daf5953e306c4dad896febe52fdd6c00
+  - HPL-2.3-foss-2023b.eb
+  - R-bundle-CRAN-2024.06-foss-2023b.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21366
+        # use an older commit to not run into dependency issues
+        from-commit: 1736a123b1685836452587a5c51793257570bb2d
diff --git a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml
index 261c7dde5e..caef15d911 100644
--- a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml
+++ b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml
@@ -28,10 +28,149 @@ easyconfigs:
 # building Rust (a dependency of HarfBuzz) repeatedly failed. We skip it in this
 # PR.
 #
-## originally built with EB 4.8.2, PR 19339 was included since EB 4.9.0
-##  - HarfBuzz-5.3.1-GCCcore-12.2.0.eb:
-##      options:
-##        from-pr: 19339
-#  - HarfBuzz-5.3.1-GCCcore-12.2.0.eb
+# originally built with EB 4.8.2, PR 19339 was included since EB 4.9.0
+#  - HarfBuzz-5.3.1-GCCcore-12.2.0.eb:
+#      options:
+#        from-pr: 19339
+  - HarfBuzz-5.3.1-GCCcore-12.2.0.eb
 ##  - Qt5-5.15.7-GCCcore-12.2.0.eb
 ##  - QuantumESPRESSO-7.2-foss-2022b.eb
+# Apps originaly added from gracehopper on https://github.com/EESSI/software-layer/pull/1031
+  - MUMPS-5.6.1-foss-2022b-metis.eb
+  # - GL2PS-1.4.2-GCCcore-12.2.0.eb 
+  # - GST-plugins-base-1.22.1-GCC-12.2.0.eb
+  # - wxWidgets-3.2.2.1-GCC-12.2.0.eb
+  - Archive-Zip-1.68-GCCcore-12.2.0.eb
+  - jemalloc-5.3.0-GCCcore-12.2.0.eb
+  - Judy-1.0.5-GCCcore-12.2.0.eb
+  - libaio-0.3.113-GCCcore-12.2.0.eb
+  - Z3-4.12.2-GCCcore-12.2.0.eb
+  - tbb-2021.10.0-GCCcore-12.2.0.eb
+  # - dask-2023.7.1-foss-2022b.eb
+  # - netcdf4-python-1.6.3-foss-2022b.eb
+  - Ruby-3.2.2-GCCcore-12.2.0.eb
+# originally built with EB 4.9.2; PR 21526 and PR 3467 included since EB 5.0.0, thus need to use *from-commit
+  # - ROOT-6.26.10-foss-2022b.eb:
+  #     options:
+  #      # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21526
+  #      from-commit: 6cbfbd7d7a55dc7243f46d0beea510278f4718df
+  #      # see https://github.com/easybuilders/easybuild-easyblocks/pull/3467
+  #      include-easyblocks-from-commit: c3aebe1f133d064a228c5d6c282e898b83d74601
+
+## from here on built originally with EB 4.9.0
+# includes dependencies Boost/1.81.0 and Boost.MPI/1.81.0 for which we have to
+# use updated easyconfigs (via from-commit) because the download URLs have
+# changed
+#
+# originally built with EB 4.9.0, PR 20298 was included since 4.9.2 and no more
+# updates to it since then
+#  - Highway-1.0.3-GCCcore-12.2.0.eb:
+#      options:
+#        from-pr: 20298
+  - Highway-1.0.3-GCCcore-12.2.0.eb
+  - SciPy-bundle-2023.02-gfbf-2022b.eb
+  - Rust-1.65.0-GCCcore-12.2.0.eb
+# Boost-1.81.0-GCC-12.2.0.eb is a dependency for GDAL and the sources URL for Boost
+# has recently changed by PR 22157
+# see https://github.com/easybuilders/easybuild-easyconfigs/pull/22157
+  - Boost-1.81.0-GCC-12.2.0.eb:
+      options:
+        from-commit: 5bebccf792ccf35a8ee3250bc8fed86dff5d5df9
+  - GDAL-3.6.2-foss-2022b.eb
+# originally built with EB 4.9.0, PR 19324 was included since 4.9.1; there were a
+# few additional changes to the easyconfig, hence we use the merge commit for 19324
+#  - waLBerla-6.1-foss-2022b.eb:
+#      options:
+#        from-pr: 19324
+# Boost.MPI-1.81.0-gompi-2022b.eb is a dependency for waLBerla and the sources URL for
+# Boost.MPI has recently changed by PR 22240
+# see https://github.com/easybuilders/easybuild-easyconfigs/pull/22240
+  - Boost.MPI-1.81.0-gompi-2022b.eb:
+      options:
+        from-commit: e610fe1ac5393d1de668a466fdaaea74c580ee03
+  - waLBerla-6.1-foss-2022b.eb:
+      options:
+        from-commit: 11daa230014b22387c28712d2ce93c45618058f6
+  - WRF-4.4.1-foss-2022b-dmpar.eb
+# originally built with EB 4.9.0, PR 20086 was included since 4.9.1; there were a
+# few additional changes to the easyconfig, hence we use the merge commit for 20086
+#  - ImageMagick-7.1.0-53-GCCcore-12.2.0.eb:
+#      options:
+#        from-pr: 20086
+  - ImageMagick-7.1.0-53-GCCcore-12.2.0.eb:
+      options:
+        from-commit: a0eff4515ecad4fe37d7c018c95526ad4a777de7
+# originally built with EB 4.9.0, PR 20238 was included since 4.9.1; there were
+# additional changes, particularly addressing CVE 2024-27322 that was included
+# since EB 4.9.2, hence we simply use the easyconfig available with EB 4.9.4
+#  - R-4.2.2-foss-2022b.eb:
+#      options:
+#        from-pr: 20238
+  - R-4.2.2-foss-2022b.eb
+# from here on built originally with EB 4.9.1
+# originally built with EB 4.9.1, PR 20379 was included since 4.9.2; no more
+# updates to the easyconfig since then
+#  - R-bundle-Bioconductor-3.16-foss-2022b-R-4.2.2.eb:
+#      options:
+#        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20379
+#        from-pr: 20379
+  - R-bundle-Bioconductor-3.16-foss-2022b-R-4.2.2.eb
+  - ParaView-5.11.1-foss-2022b.eb
+  - ASE-3.22.1-gfbf-2022b.eb
+  - SEPP-4.5.1-foss-2022b.eb
+  - Valgrind-3.21.0-gompi-2022b.eb
+# from here on built originally with EB 4.9.2
+  - BLAST+-2.14.0-gompi-2022b.eb
+# originally built with EB 4.9.2; PR 21136 included since EB 4.9.3
+#  - BioPerl-1.7.8-GCCcore-12.2.0.eb:
+#      options:
+#        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21136
+#        from-commit: d8076ebaf8cb915762adebf88d385cc672b350dc
+  - BioPerl-1.7.8-GCCcore-12.2.0.eb
+  - gnuplot-5.4.6-GCCcore-12.2.0.eb
+  - h5py-3.8.0-foss-2022b.eb
+  - MDAnalysis-2.4.2-foss-2022b.eb
+  - ncbi-vdb-3.0.5-gompi-2022b.eb
+  - Bio-DB-HTS-3.01-GCC-12.2.0.eb
+  - MAFFT-7.505-GCC-12.2.0-with-extensions.eb
+  - MetaEuk-6-GCC-12.2.0.eb
+  - BamTools-2.5.2-GCC-12.2.0.eb
+  - Bio-SearchIO-hmmer-1.7.3-GCC-12.2.0.eb
+  - Mash-2.3-GCC-12.2.0.eb
+  - CapnProto-0.10.3-GCCcore-12.2.0.eb
+  - WhatsHap-2.1-foss-2022b.eb
+  - SAMtools-1.17-GCC-12.2.0.eb
+  - Bowtie2-2.5.1-GCC-12.2.0.eb
+  - CD-HIT-4.8.1-GCC-12.2.0.eb
+  - VCFtools-0.1.16-GCC-12.2.0.eb
+  - GenomeTools-1.6.2-GCC-12.2.0.eb
+  - Bio-SearchIO-hmmer-1.7.3-GCC-12.2.0.eb
+  - parallel-20230722-GCCcore-12.2.0.eb
+  - BCFtools-1.17-GCC-12.2.0.eb
+  - lpsolve-5.5.2.11-GCC-12.2.0.eb
+  - fastp-0.23.4-GCC-12.2.0.eb
+  - KronaTools-2.8.1-GCCcore-12.2.0.eb
+  - MultiQC-1.14-foss-2022b.eb
+  - CGAL-5.5.2-GCCcore-12.2.0.eb
+  - KaHIP-3.14-gompi-2022b.eb
+  - MPC-1.3.1-GCCcore-12.2.0.eb
+  - MUMPS-5.6.1-foss-2022b-metis.eb
+  - GL2PS-1.4.2-GCCcore-12.2.0.eb
+  - GST-plugins-base-1.22.1-GCC-12.2.0.eb
+  - wxWidgets-3.2.2.1-GCC-12.2.0.eb
+  - Archive-Zip-1.68-GCCcore-12.2.0.eb
+  - jemalloc-5.3.0-GCCcore-12.2.0.eb
+  - Judy-1.0.5-GCCcore-12.2.0.eb
+  - libaio-0.3.113-GCCcore-12.2.0.eb
+  - Z3-4.12.2-GCCcore-12.2.0.eb
+  - tbb-2021.10.0-GCCcore-12.2.0.eb
+  - dask-2023.7.1-foss-2022b.eb
+  - netcdf4-python-1.6.3-foss-2022b.eb
+  - Ruby-3.2.2-GCCcore-12.2.0.eb
+# originally built with EB 4.9.2; PR 21526 and PR 3467 included since EB 5.0.0, thus need to use *from-commit
+  - ROOT-6.26.10-foss-2022b.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21526
+        from-commit: 6cbfbd7d7a55dc7243f46d0beea510278f4718df
+        # see https://github.com/easybuilders/easybuild-easyblocks/pull/3467
+        include-easyblocks-from-commit: c3aebe1f133d064a228c5d6c282e898b83d74601
diff --git a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023a.yml b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023a.yml
index afc595ce24..37249b2bfe 100644
--- a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023a.yml
+++ b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023a.yml
@@ -297,3 +297,194 @@ easyconfigs:
   - BLAST+-2.14.1-gompi-2023a.eb
   - Valgrind-3.21.0-gompi-2023a.eb
   - OrthoFinder-2.5.5-foss-2023a.eb
+  - BWA-0.7.18-GCCcore-12.3.0.eb
+  - lit-18.1.2-GCCcore-12.3.0.eb
+      # needed due to changed/new dependencies for R-bundle-CRAN-2023.12-foss-2023a.eb
+      # without any from-commit this will use a version from April 6, 2024
+      # https://github.com/easybuilders/easybuild-easyconfigs/blob/88f6f9c7439c535e62461e6e71b1961c7be118b8/easybuild/easyconfigs/l/lit/lit-18.1.2-GCCcore-12.3.0.eb
+      # EB 5.0.0 has a few changes to that
+# from here on apps were originally built with EB 4.9.2
+# PR 20958 is included since EB 4.9.3
+#  - OpenFOAM-10-foss-2023a.eb:
+#      options:
+#        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20958
+#        from-commit: dbadb2074464d816740ee0e95595c2cb31b6338f
+  - OpenFOAM-10-foss-2023a.eb
+# PR 20958 is included since EB 4.9.3
+#  - OpenFOAM-11-foss-2023a.eb:
+#      options:
+#        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20958
+#        from-commit: dbadb2074464d816740ee0e95595c2cb31b6338f
+  - OpenFOAM-11-foss-2023a.eb
+  - BCFtools-1.18-GCC-12.3.0.eb
+  - BWA-0.7.18-GCCcore-12.3.0.eb
+  - CapnProto-1.0.1-GCCcore-12.3.0.eb
+  - DendroPy-4.6.1-GCCcore-12.3.0.eb
+  - DIAMOND-2.1.8-GCC-12.3.0.eb
+  - FastME-2.1.6.3-GCC-12.3.0.eb
+  - fastp-0.23.4-GCC-12.3.0.eb
+  - HMMER-3.4-gompi-2023a.eb
+# PR 20955 is included since EB 4.9.3
+#  - IQ-TREE-2.3.5-gompi-2023a.eb:
+#      options:
+#        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20955
+#        from-commit: 185f88b9a03d65a7fb74edc7acb4221e87e90784
+  - IQ-TREE-2.3.5-gompi-2023a.eb
+  - KronaTools-2.8.1-GCCcore-12.3.0.eb
+  - LSD2-2.4.1-GCCcore-12.3.0.eb
+  - MAFFT-7.520-GCC-12.3.0-with-extensions.eb
+  - ncbi-vdb-3.0.10-gompi-2023a.eb
+  - MetalWalls-21.06.1-foss-2023a.eb
+# PRs 20138 and 3338 were included since EB 4.9.3
+#  - QuantumESPRESSO-7.3.1-foss-2023a.eb:
+#      options:
+#        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20138
+#        from-commit: dbdaacc0739fdee91baa9123864ea4428cf21273
+#        # see https://github.com/easybuilders/easybuild-easyblocks/pull/3338
+#        include-easyblocks-from-commit: 32e45bd1f2d916732ca5852d55d17fa4d99e388b
+  - QuantumESPRESSO-7.3.1-foss-2023a.eb
+# PR 20951 is included since EB 4.9.3
+#  - CP2K-2023.1-foss-2023a.eb:
+#      options:
+#        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20951
+#        from-commit: a92667fe32396bbd4106243658625f7ff2adcd68
+  - CP2K-2023.1-foss-2023a.eb
+  - amdahl-0.3.1-gompi-2023a.eb
+  - LLVM-14.0.6-GCCcore-12.3.0-llvmlite.eb
+  - numba-0.58.1-foss-2023a.eb
+# PR 21434 is included since EB 4.9.4
+#  - librosa-0.10.1-foss-2023a.eb:
+#      options:
+#        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21434
+#        from-commit: 4b6170603150c9c93602b0deb726869d19a390f0
+  - librosa-0.10.1-foss-2023a.eb
+  - xarray-2023.9.0-gfbf-2023a.eb
+  - SciTools-Iris-3.9.0-foss-2023a.eb
+# PRs 20841 and 3338 were included since EB 4.9.3
+#  - OpenFOAM-v2312-foss-2023a.eb:
+#      options:
+#        # https://github.com/easybuilders/easybuild-easyblocks/pull/3388
+#        include-easyblocks-from-commit: c8256a36e7062bc09f5ce30552a9de9827054c9e
+#        # https://github.com/easybuilders/easybuild-easyconfigs/pull/20841
+#        from-commit: f0e91e6e430ebf902f7788ebb47f0203dee60649
+  - OpenFOAM-v2312-foss-2023a.eb
+# PR 21136 is included since EB 4.9.3
+#  - BioPerl-1.7.8-GCCcore-12.3.0.eb:
+#      options:
+#        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21136
+#        from-commit: d8076ebaf8cb915762adebf88d385cc672b350dc
+  - BioPerl-1.7.8-GCCcore-12.3.0.eb
+  - grpcio-1.57.0-GCCcore-12.3.0.eb
+# PR 20880 is included since EB 4.9.3
+#  - orjson-3.9.15-GCCcore-12.3.0.eb:
+#      options:
+#        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20880
+#        from-commit: bc6e08f89759b8b70166de5bfcb5056b9db8ec90
+  - orjson-3.9.15-GCCcore-12.3.0.eb
+# PR 21094 is included since EB 4.9.3
+#  - wradlib-2.0.3-foss-2023a.eb:
+#      options:
+#        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21094
+#        from-commit: 3a2e0b8e6ee45277d01fb7e2eb93027a28c9461a
+  - wradlib-2.0.3-foss-2023a.eb
+# PR 21155 is included since EB 4.9.3
+#  - MBX-1.1.0-foss-2023a.eb:
+#      options:
+#        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21155
+#        from-commit: 6929a67401f2a2ec58f91fb306332a77497d73ff
+  - MBX-1.1.0-foss-2023a.eb
+# PRs 20964 and 3381 are included since EB 4.9.3
+#  - Transrate-1.0.3-GCC-12.3.0.eb:
+#      options:
+#        # https://github.com/easybuilders/easybuild-easyblocks/pull/3381
+#        include-easyblocks-from-commit: bb86f05d4917b29e022023f152efdf0ca5c14ded
+#        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20964
+#        from-commit: 7d539a9e599d8bc5ac2bda6ee9587ef62351ee03
+  - Transrate-1.0.3-GCC-12.3.0.eb
+# PR 20833 is included since EB 4.9.3
+#  - Critic2-1.2-foss-2023a.eb:
+#      options:
+#        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20833
+#        from-commit: 78426c2383fc7e4b9b9e77d7a77f336e1bee3843
+  - Critic2-1.2-foss-2023a.eb
+# PR 21310 is included since EB 4.9.3
+#  - LRBinner-0.1-foss-2023a.eb:
+#      options:
+#        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21310
+#        from-commit: 799d9101df2cf81aabe252f00cc82a7246363f53
+  - LRBinner-0.1-foss-2023a.eb
+# PR 21227 is included since EB 4.9.3
+#  - Redland-1.0.17-GCC-12.3.0.eb:
+#      options:
+#        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21227
+#        from-commit: 4c5e3455dec31e68e8383c7fd86d1f80c434676d
+  - Redland-1.0.17-GCC-12.3.0.eb
+  - ccache-4.9-GCCcore-12.3.0.eb
+  - GDB-13.2-GCCcore-12.3.0.eb
+  - tmux-3.3a-GCCcore-12.3.0.eb
+  - Vim-9.1.0004-GCCcore-12.3.0.eb
+  - gmsh-4.12.2-foss-2023a.eb
+  - basemap-1.3.9-foss-2023a.eb
+  - geopandas-0.14.2-foss-2023a.eb
+  - archspec-0.2.1-GCCcore-12.3.0.eb
+  - ROOT-6.30.06-foss-2023a.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21526
+        from-commit: 6cbfbd7d7a55dc7243f46d0beea510278f4718df
+        # see https://github.com/easybuilders/easybuild-easyblocks/pull/3467
+        include-easyblocks-from-commit: c3aebe1f133d064a228c5d6c282e898b83d74601
+  - waLBerla-6.1-foss-2023a.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21600
+        from-commit: 9b12318bcff1749781d9eb71c23e21bc3a79ed01
+  - mpl-ascii-0.10.0-gfbf-2023a.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21679
+        from-commit: 7106f63160b1418d605882dd02ba151d099300bd
+  - jedi-0.19.0-GCCcore-12.3.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21650
+        from-commit: 109998f6adcda7efb4174b1e5f73b41ee82d1f13
+  - Solids4foam-2.1-foss-2023a.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21606
+        from-commit: 63562c58acf1be64407192b6862c3bd80253d2e0
+  - Cassiopeia-2.0.0-foss-2023a.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21657
+        from-commit: 7f1f0e60487e7e1fcb5c4e6bc4fbc4f89994e3fd
+  - LightGBM-4.5.0-foss-2023a.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21699
+        from-commit: e3407bd127d248c08960f6b09c973da0fdecc2c3
+  - OpenFOAM-v2406-foss-2023a.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyblocks/pull/3519
+        include-easyblocks-from-commit: e4a3ff1932350d575dffc7597435609fad6dd691
+  - Paraver-4.11.4-GCC-12.3.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20230
+        from-commit: 91c8df6b4c0810061e9f325427c9c79e961bc4b0
+  - Tombo-1.5.1-foss-2023a.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21925
+        from-commit: 522ca010ab11949ab9594037f72b975cf1cd0d33
+  - elfx86exts-0.6.2-GCC-12.3.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/22145
+        from-commit: 31478e5c9869de3add74d0a02dd5df01ea65b21e
+  - archspec-0.2.5-GCCcore-12.3.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/22235
+        from-commit: 01dd97ea62fe4d7d0df040ede3af03eb2f1b8641
+  - GDRCopy-2.3.1-GCCcore-12.3.0.eb 
+  - OpenCV-4.8.1-foss-2023a-contrib.eb
+  - FALL3D-9.0.1-gompi-2023a.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/22610
+        from-commit: 10e47e2fdd4f23fd5a52ae167771f8e9c78da411
+  - lit-18.1.2-GCCcore-12.3.0.eb
+      # needed due to changed/new dependencies for R-bundle-CRAN-2023.12-foss-2023a.eb
+      # without any from-commit this will use a version from April 6, 2024
+      # https://github.com/easybuilders/easybuild-easyconfigs/blob/88f6f9c7439c535e62461e6e71b1961c7be118b8/easybuild/easyconfigs/l/lit/lit-18.1.2-GCCcore-12.3.0.eb
+      # EB 5.0.0 has a few changes to that
diff --git a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023b.yml b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023b.yml
index 88cc48fef9..b544795af4 100644
--- a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023b.yml
+++ b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023b.yml
@@ -99,7 +99,8 @@ easyconfigs:
 #      options:
 #        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20522
 #        from-commit: a0a467a88506c765a93a96b20d7a8fcb01d46b24
-# SOME TEST FAILED, so we skip it here
+# SOME TEST FAILED, so we skip it here, do build its dependency networkx
+  - networkx-3.2.1-gfbf-2023b.eb
 #  - GROMACS-2024.1-foss-2023b.eb
   - NLTK-3.8.1-foss-2023b.eb
 # originally built with EB 4.9.1, PR 20792 was included since EB 4.9.2
@@ -107,3 +108,77 @@ easyconfigs:
 #      options:
 #        from-pr: 20792
   - Valgrind-3.23.0-gompi-2023b.eb
+# recipes taken from https://github.com/EESSI/software-layer/pull/996
+  - lit-18.1.7-GCCcore-13.2.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20902
+        from-commit: 79f4cf21490f7f5b187af889be5426c1332a497d
+  - astropy-7.0.0-gfbf-2023b.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/22469
+        from-commit: fc22841fef99cbb2a221c18029b15e692e78c27c
+  - PDT-3.25.2-GCCcore-13.2.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/22523
+        from-commit: 0044f08898e12cfd31177bfce0747ef2172226d1
+# from here on easyconfigs were originally built with EB 4.9.3
+# originally built with EB 4.9.3, PR 21436 was merged into develop before EB
+# 4.9.4 was released, but maybe it wasn't included in EB 4.9.4, to be on the safe
+# side we just use the commit, PR 3569 was targetting Sapphire Rapids, so likely
+# that is not needed here, however we keep it to stay in sync with what was used
+# for Sapphire Rapids
+  - LAMMPS-29Aug2024-foss-2023b-kokkos.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21436
+        from-commit: 9dc24e57880a8adb06ae10557c5315e66671a533
+        # see https://github.com/easybuilders/easybuild-easyblocks/pull/3569
+        include-easyblocks-from-commit: 362b4679193612e04abe336fa041e2a34d183991
+# included for gracehopper on https://github.com/EESSI/software-layer/pull/993
+  - SIONlib-1.7.7-GCCcore-13.2.0-tools.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21752
+        # NOTE, commit is the last one before the merge commit for PR 21752
+        from-commit: 6b8b53493a1188a5baa56a133574daac239730e7
+  - Score-P-8.4-gompi-2023b.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyblocks/pull/3496
+        # NOTE, commit is the last one before the merge commit for PR 3496
+        include-easyblocks-from-commit: 60633b0acfd41a0732992d9e16800dae71a056eb
+  - Cython-3.0.10-GCCcore-13.2.0.eb
+  - Mustache-1.3.3-foss-2023b.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21783
+        # NOTE, commit is the last one before the merge commit for PR 21783
+        from-commit: 5fa3db9eb36f91cba3fbf351549f8ba2849abc33
+  - GDRCopy-2.4-GCCcore-13.2.0.eb
+#  - GROMACS-2024.4-foss-2023b.eb:
+#      options:
+#        # https://github.com/easybuilders/easybuild-easyconfigs/pull/21851
+#        # NOTE, below commit is the merge commit for PR 21851
+#        from-commit: f0fa64b440deaf5fb0a6d26ff1bb3e9f36626c8a
+# Disable Gromacs build, there is an error with a test that require a further analysis
+  - SlurmViewer-1.0.1-GCCcore-13.2.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21899
+        # NOTE, below commit is the merge commit for PR 21899
+        from-commit: 0bdeb23c9ea5a3caefd353ecd936919424c1bba4
+  - wxWidgets-3.2.6-GCC-13.2.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21915
+        # NOTE, below commit is the merge commit for PR 21915
+        from-commit: 58f16c0caf8c5494c68e9eda8cbf19e9145d3cfa
+  - DP3-6.2-foss-2023b.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21765
+        # NOTE, below commit is the merge commit for PR 21765
+        from-commit: c7e4bfe1a57cf9781ce346ba8ae9081644408c23
+  - WSClean-3.5-foss-2023b.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21765
+        # NOTE, below commit is the merge commit for PR 21765
+        from-commit: c7e4bfe1a57cf9781ce346ba8ae9081644408c23
+  - EveryBeam-0.6.1-foss-2023b.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21765
+        # NOTE, below commit is the merge commit for PR 21765
+        from-commit: c7e4bfe1a57cf9781ce346ba8ae9081644408c23
diff --git a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-5.0.0-2023a.yml b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-5.0.0-2023a.yml
index 28afe57e31..3ef583b5ca 100644
--- a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-5.0.0-2023a.yml
+++ b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-5.0.0-2023a.yml
@@ -7,3 +7,13 @@ easyconfigs:
         # but skipping the tests during build and then running them with the
         # installed module works, so skipping the tests only in this case
         skip-test-step: True
+  - MUSCLE-5.1.0-GCCcore-12.3.0.eb:
+      options:
+        # See https://github.com/easybuilders/easybuild-easyconfigs/pull/22780
+        from-commit: ff159780fbaa881fb442b0ee1b37cd9e3d981ca9
+  - bcgTree-1.2.1-foss-2023a.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/22707
+        # and https://github.com/easybuilders/easybuild-easyconfigs/pull/22540
+        # and https://github.com/easybuilders/easybuild-easyconfigs/pull/22781
+        from-commit: 720c5b5b8280bf342d827617ee14738f3d231097
diff --git a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-5.1.0-2023a.yml b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-5.1.0-2023a.yml
new file mode 100644
index 0000000000..41ed9b0d94
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-5.1.0-2023a.yml
@@ -0,0 +1,18 @@
+easyconfigs:
+  - buildenv-default-foss-2023a.eb 
+  - Zoltan-3.901-foss-2023a.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/23068
+        from-commit: 644b17f1b42bbf8eb4ad56d9e8f125b8c52d7258
+        # use the same list of filtered dependencies as was used for other CPU targets (in particular: without ParMETIS)
+        filter-deps: Autoconf,Automake,Autotools,binutils,bzip2,DBus,flex,gettext,gperf,help2man,intltool,libreadline,libtool,M4,makeinfo,ncurses,util-linux,XZ,zlib,Yasm
+  - OpenFOAM-12-foss-2023a.eb
+  - MEGAHIT-1.2.9-GCCcore-12.3.0.eb:
+      options:
+        # fix support for non-x86_64 systems,
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/23073
+        from-commit: 6acf5617670d860cee1d12b120c18699be3c1a68
+  - scCODA-0.1.9-foss-2023a.eb
+  - Bazel-6.1.0-GCCcore-12.3.0.eb
+  - ml_dtypes-0.3.2-gfbf-2023a.eb
+  - tensorboard-2.15.1-gfbf-2023a.eb 
diff --git a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-5.1.0-2023b.yml b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-5.1.0-2023b.yml
new file mode 100644
index 0000000000..91621dc9bf
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-5.1.0-2023b.yml
@@ -0,0 +1,2 @@
+easyconfigs:
+  - HeFFTe-2.4.1-foss-2023b.eb
diff --git a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-5.1.1-2023b.yml b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-5.1.1-2023b.yml
new file mode 100644
index 0000000000..de24e85de0
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-5.1.1-2023b.yml
@@ -0,0 +1,2 @@
+easyconfigs:
+  - MLflow-2.18.0-gfbf-2023b.eb
diff --git a/easystacks/software.eessi.io/2023.06/accel/nvidia/rebuilds/20250828-eb-5.1.1-rebuild-ESPResSo-for-cuda-sanity-check.yml b/easystacks/software.eessi.io/2023.06/accel/nvidia/rebuilds/20250828-eb-5.1.1-rebuild-ESPResSo-for-cuda-sanity-check.yml
new file mode 100644
index 0000000000..9ace4a71c0
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/accel/nvidia/rebuilds/20250828-eb-5.1.1-rebuild-ESPResSo-for-cuda-sanity-check.yml
@@ -0,0 +1,12 @@
+# We'll rebuild all CUDA software, for various reasons
+# 1. We now have a proper CUDA sanity check, and if anything was 'wrong' with our current CUDA installs, we'd like
+# to know about it
+# 2. The PR implementing a CI to check for differences between officially supported CUDA Compute Capabilities shows
+# that there are a lot of missing installations https://github.com/EESSI/software-layer/pull/1087 . A rebuild PR like
+# this will have the convenient side effect of filling all those holes
+easyconfigs:
+  - ESPResSo-4.2.2-foss-2023a-CUDA-12.1.1.eb:
+      options:
+        # need an additional patch to build for the right CUDA architecture,
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/23795
+        from-commit: f3940e57527848706505b846ac4f2fce86fd5def
diff --git a/easystacks/software.eessi.io/2023.06/accel/nvidia/rebuilds/20250828-eb-5.1.1-rebuild-GROMACS-for-cuda-sanity-check.yml b/easystacks/software.eessi.io/2023.06/accel/nvidia/rebuilds/20250828-eb-5.1.1-rebuild-GROMACS-for-cuda-sanity-check.yml
new file mode 100644
index 0000000000..f96f1e8eac
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/accel/nvidia/rebuilds/20250828-eb-5.1.1-rebuild-GROMACS-for-cuda-sanity-check.yml
@@ -0,0 +1,10 @@
+# We'll rebuild all CUDA software, for various reasons
+# 1. We now have a proper CUDA sanity check, and if anything was 'wrong' with our current CUDA installs, we'd like
+# to know about it
+# 2. The PR implementing a CI to check for differences between officially supported CUDA Compute Capabilities shows
+# that there are a lot of missing installations https://github.com/EESSI/software-layer/pull/1087 . A rebuild PR like
+# this will have the convenient side effect of filling all those holes
+easyconfigs:
+  - GROMACS-2024.4-foss-2023b-CUDA-12.4.0.eb:
+      options:
+        cuda-sanity-check-accept-missing-ptx: True
diff --git a/easystacks/software.eessi.io/2023.06/accel/nvidia/rebuilds/20250828-eb-5.1.1-rebuild-LAMMPS-for-cuda-sanity-check.yml b/easystacks/software.eessi.io/2023.06/accel/nvidia/rebuilds/20250828-eb-5.1.1-rebuild-LAMMPS-for-cuda-sanity-check.yml
new file mode 100644
index 0000000000..4bb1c104bf
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/accel/nvidia/rebuilds/20250828-eb-5.1.1-rebuild-LAMMPS-for-cuda-sanity-check.yml
@@ -0,0 +1,12 @@
+# We'll rebuild all CUDA software, for various reasons
+# 1. We now have a proper CUDA sanity check, and if anything was 'wrong' with our current CUDA installs, we'd like
+# to know about it
+# 2. The PR implementing a CI to check for differences between officially supported CUDA Compute Capabilities shows
+# that there are a lot of missing installations https://github.com/EESSI/software-layer/pull/1087 . A rebuild PR like
+# this will have the convenient side effect of filling all those holes
+easyconfigs:
+  - LAMMPS-2Aug2023_update2-foss-2023a-kokkos-CUDA-12.1.1.eb:
+      options:
+        # See https://github.com/easybuilders/easybuild-easyblocks/pull/3943
+        # and https://github.com/easybuilders/easybuild-easyblocks/pull/3945
+        include-easyblocks-from-commit: 6a0f356cda727feaaf79fdb72ae2cfbe48bbdf28
diff --git a/easystacks/software.eessi.io/2023.06/accel/nvidia/rebuilds/20250828-eb-5.1.1-rebuild-UCX-UCC-OSU-for-cuda-sanity-check.yml b/easystacks/software.eessi.io/2023.06/accel/nvidia/rebuilds/20250828-eb-5.1.1-rebuild-UCX-UCC-OSU-for-cuda-sanity-check.yml
new file mode 100644
index 0000000000..4c567cbb62
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/accel/nvidia/rebuilds/20250828-eb-5.1.1-rebuild-UCX-UCC-OSU-for-cuda-sanity-check.yml
@@ -0,0 +1,13 @@
+# We'll rebuild all CUDA software, for various reasons
+# 1. We now have a proper CUDA sanity check, and if anything was 'wrong' with our current CUDA installs, we'd like
+# to know about it
+# 2. The PR implementing a CI to check for differences between officially supported CUDA Compute Capabilities shows
+# that there are a lot of missing installations https://github.com/EESSI/software-layer/pull/1087 . A rebuild PR like
+# this will have the convenient side effect of filling all those holes
+easyconfigs:
+  - UCX-CUDA-1.15.0-GCCcore-13.2.0-CUDA-12.4.0.eb
+  - NCCL-2.20.5-GCCcore-13.2.0-CUDA-12.4.0.eb:
+      options:
+         cuda-sanity-check-accept-missing-ptx: True 
+  - UCC-CUDA-1.2.0-GCCcore-13.2.0-CUDA-12.4.0.eb
+  - OSU-Micro-Benchmarks-7.5-gompi-2023b-CUDA-12.4.0.eb
diff --git a/easystacks/software.eessi.io/2023.06/accel/nvidia/rebuilds/20250912-eb-5.1.1-rebuild-UCX-UCC-OSU-CUDA-12.1.1-for-cuda-sanity-check.yml b/easystacks/software.eessi.io/2023.06/accel/nvidia/rebuilds/20250912-eb-5.1.1-rebuild-UCX-UCC-OSU-CUDA-12.1.1-for-cuda-sanity-check.yml
new file mode 100644
index 0000000000..06441cf587
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/accel/nvidia/rebuilds/20250912-eb-5.1.1-rebuild-UCX-UCC-OSU-CUDA-12.1.1-for-cuda-sanity-check.yml
@@ -0,0 +1,17 @@
+# We'll rebuild all CUDA software, for various reasons
+# 1. We now have a proper CUDA sanity check, and if anything was 'wrong' with our current CUDA installs, we'd like
+# to know about it
+# 2. The PR implementing a CI to check for differences between officially supported CUDA Compute Capabilities shows
+# that there are a lot of missing installations https://github.com/EESSI/software-layer/pull/1087 . A rebuild PR like
+# this will have the convenient side effect of filling all those holes
+easyconfigs:
+  - CUDA-Samples-12.1-GCC-12.3.0-CUDA-12.1.1.eb:
+      # See https://github.com/EESSI/software-layer/issues/1198
+      options:
+        cuda-sanity-check-error-on-failed-checks: False
+  - UCX-CUDA-1.14.1-GCCcore-12.3.0-CUDA-12.1.1.eb
+  - NCCL-2.18.3-GCCcore-12.3.0-CUDA-12.1.1.eb:
+      options:
+        cuda-sanity-check-accept-missing-ptx: True
+  - UCC-CUDA-1.2.0-GCCcore-12.3.0-CUDA-12.1.1.eb
+  - OSU-Micro-Benchmarks-7.2-gompi-2023a-CUDA-12.1.1.eb
diff --git a/easystacks/software.eessi.io/2023.06/accel/nvidia/rebuilds/20250926-eb-5.1.1-rebuild-lightGBM-for-cuda-sanity-check.yml b/easystacks/software.eessi.io/2023.06/accel/nvidia/rebuilds/20250926-eb-5.1.1-rebuild-lightGBM-for-cuda-sanity-check.yml
new file mode 100644
index 0000000000..8d75ed7190
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/accel/nvidia/rebuilds/20250926-eb-5.1.1-rebuild-lightGBM-for-cuda-sanity-check.yml
@@ -0,0 +1,12 @@
+# We'll rebuild all CUDA software, for various reasons
+# 1. We now have a proper CUDA sanity check, and if anything was 'wrong' with our current CUDA installs, we'd like
+# to know about it
+# 2. The PR implementing a CI to check for differences between officially supported CUDA Compute Capabilities shows
+# that there are a lot of missing installations https://github.com/EESSI/software-layer/pull/1087 . A rebuild PR like
+# this will have the convenient side effect of filling all those holes
+easyconfigs:
+  - LightGBM-4.5.0-foss-2023a-CUDA-12.1.1.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24023
+        from-commit: 853cdf7a8a3912aa0e55367b2b4451ebff00e13b
+        cuda-sanity-check-accept-missing-ptx: True
diff --git a/easystacks/software.eessi.io/2023.06/accel/nvidia/zen4_h100/eessi-2023.06-eb-4.9.4-2023a-CUDA.yml b/easystacks/software.eessi.io/2023.06/accel/nvidia/zen4_h100/eessi-2023.06-eb-4.9.4-2023a-CUDA.yml
index 60d82d46ad..a80a49035e 100644
--- a/easystacks/software.eessi.io/2023.06/accel/nvidia/zen4_h100/eessi-2023.06-eb-4.9.4-2023a-CUDA.yml
+++ b/easystacks/software.eessi.io/2023.06/accel/nvidia/zen4_h100/eessi-2023.06-eb-4.9.4-2023a-CUDA.yml
@@ -2,3 +2,4 @@ easyconfigs:
   - CUDA-12.1.1.eb:
       options:
         accept-eula-for: CUDA
+  - pmt-1.2.0-GCCcore-12.3.0-CUDA-12.1.1.eb:
diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-001-system.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-001-system.yml
index ce6689bdb3..d49f39a78a 100644
--- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-001-system.yml
+++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-001-system.yml
@@ -2,3 +2,9 @@ easyconfigs:
   - Java-11.0.27.eb
   - Java-17.0.15.eb
   - Java-21.0.7.eb
+  - Trimmomatic-0.39-Java-11.eb
+  - FastQC-0.12.1-Java-11.eb
+  - EasyBuild-5.1.2.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24024
+        from-commit: d250e047335cff444680790ceb026676cfb65eb8
diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2022b.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2022b.yml
new file mode 100644
index 0000000000..81bb2d23ec
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2022b.yml
@@ -0,0 +1,2 @@
+easyconfigs:
+  - Rust-1.75.0-GCCcore-12.2.0.eb
diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2023a.yml
new file mode 100644
index 0000000000..d545d769b5
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2023a.yml
@@ -0,0 +1,20 @@
+easyconfigs:
+  - libheif-1.17.6-GCCcore-12.3.0.eb
+  - GraphicsMagick-1.3.45-GCCcore-12.3.0.eb:
+      options:
+        # See https://github.com/easybuilders/easybuild-easyconfigs/pull/22930
+        # We add also GraphicsMagick explicitly to make sure the version with the fix for libtiff is used
+        from-commit: ca5dddb65171a50207fd8a85559edb4b4844d69b
+  - Octave-10.1.0-foss-2023a.eb:
+      options:
+        # See https://github.com/easybuilders/easybuild-easyconfigs/pull/22932
+        from-commit: 3211d34eb16ff31b8de3dfef55ecaaf1ec205c6f
+  - MrBayes-3.2.7-gompi-2023a.eb
+  - Flye-2.9.3-GCC-12.3.0.eb
+  - websockify-0.13.0-gfbf-2023a.eb:
+      options:
+        # See https://github.com/easybuilders/easybuild-easyconfigs/pull/23596
+        from-commit: daa610c5b3aaf43b80779805d85f13a1d5a8734e
+  - MLflow-2.10.2-gfbf-2023a.eb
+  - Salmon-1.10.3-GCC-12.3.0.eb
+  - WebKitGTK+-2.41.4-foss-2023a.eb
diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2023b.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2023b.yml
index 29d1dc5f7e..00b2554c7d 100644
--- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2023b.yml
+++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2023b.yml
@@ -1,2 +1,10 @@
 easyconfigs:
   - openCARP-17.0-foss-2023b.eb
+  - libheif-1.19.5-GCCcore-13.2.0.eb
+  - Subread-2.1.1-GCC-13.2.0.eb
+  - Flye-2.9.4-GCC-13.2.0.eb
+  - MLflow-2.18.0-gfbf-2023b.eb
+  - snakemake-8.28.0-foss-2023b.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/22371
+        from-commit: 29f82e43229663c22f0c76cb3fc7b6dd5c407cd7
diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.2-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.2-2023a.yml
new file mode 100644
index 0000000000..a0635f3602
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.2-2023a.yml
@@ -0,0 +1,7 @@
+easyconfigs:
+  - GRASS-8.4.0-foss-2023a.eb
+  - parallel-20230722-GCCcore-12.3.0.eb
+  - NEST-3.9-foss-2023a.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24259
+        from-commit: 3f59104cfd0aeedc261e2bf7ca18b8ae5efdca0a 
diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.2-2023b.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.2-2023b.yml
new file mode 100644
index 0000000000..cc71888f45
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.2-2023b.yml
@@ -0,0 +1,53 @@
+easyconfigs:
+  - tblite-0.4.0-gfbf-2023b.eb
+  - toil-cwl-8.2.0-foss-2023b.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/23155
+        from-commit: b35081d4454f54996108088780f6554739dc4891
+  - dysco-1.3-foss-2023b.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/23155
+        from-commit: b35081d4454f54996108088780f6554739dc4891
+  - PyVO-1.7-foss-2023b.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/23155
+        from-commit: b35081d4454f54996108088780f6554739dc4891
+  - LSMTool-1.7.0-foss-2023b.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/23155
+        from-commit: b35081d4454f54996108088780f6554739dc4891
+  - LofarStMan-1.0-foss-2023b.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/23155
+        from-commit: b35081d4454f54996108088780f6554739dc4891
+  - LSMTool-1.7.0-foss-2023b.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/23155
+        from-commit: b35081d4454f54996108088780f6554739dc4891
+  - SAGECal-0.8.4-foss-2023b.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/23155
+        from-commit: b35081d4454f54996108088780f6554739dc4891
+  - Ruby-3.4.2-GCCcore-13.2.0.eb
+  - Boost.Python-NumPy-1.83.0-gfbf-2023b.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/23893
+        from-commit: 7f5e2d7d079e9c150d731b0525a310bc6b9008d4
+  - LoSoTo-2.5.0-foss-2023b.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/23155
+        from-commit: b35081d4454f54996108088780f6554739dc4891
+  - PyTables-3.9.2-foss-2023b.eb
+  - RMextract-0.5.1-foss-2023b.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/23155
+        from-commit: b35081d4454f54996108088780f6554739dc4891
+  - LINC-5.0-foss-2023b.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/23155
+        from-commit: b35081d4454f54996108088780f6554739dc4891
+  - ESMF-8.6.1-foss-2023b.eb
+  - RStudio-Server-2024.09.0+375-foss-2023b-Java-11-R-4.4.1.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24490
+        from-commit: c9c20b479dc9220724f0c38f980a372413d0c5ed
diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20250414-eb-4.9.4-SciPy-bundle-2023.07-a64fx.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20250414-eb-4.9.4-SciPy-bundle-2023.07-a64fx.yml
new file mode 100644
index 0000000000..ceed32c037
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/rebuilds/20250414-eb-4.9.4-SciPy-bundle-2023.07-a64fx.yml
@@ -0,0 +1,14 @@
+# 2025.04.14
+# While adding support for Intel Sapphire Rapids, additional patches applied to the
+# original easyconfig were required to successfully build SciPy-bundle 2023.07.
+# In order to keep the stack consistent across the different CPUs,
+# a rebuild was done for all CPU targets - except a64fx.
+# See:
+# - https://github.com/easybuilders/easybuild-easyconfigs/pull/19419
+# - https://github.com/easybuilders/easybuild-easyconfigs/pull/20817
+# - https://github.com/easybuilders/easybuild-easyconfigs/pull/21693
+easyconfigs:
+  - SciPy-bundle-2023.07-gfbf-2023a.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21693
+        from-commit: 7c5144d2c1a061cd9f08b5901970b7f6ec5eb5c0
diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20250912-eb-4.9.2-Python-ctypes-a64fx.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20250912-eb-4.9.2-Python-ctypes-a64fx.yml
new file mode 100644
index 0000000000..c38a6ab44e
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/rebuilds/20250912-eb-4.9.2-Python-ctypes-a64fx.yml
@@ -0,0 +1,20 @@
+# 2025.09.12
+# Python ctypes relies on LD_LIBRARY_PATH and doesn't respect rpath linking. There is a workaround
+# for the EasyBuild context in https://github.com/easybuilders/easybuild-easyblocks/pull/3352.
+#
+# This rebuild ensures this fix is available for all Python versions shipped with EESSI.
+# 
+# See https://gitlab.com/eessi/support/-/issues/77
+easyconfigs:
+  - Python-3.10.8-GCCcore-12.2.0-bare:
+      options:
+        # See https://github.com/easybuilders/easybuild-easyblocks/pull/3352
+        include-easyblocks-from-commit: 1ee17c0f7726c69e97442f53c65c5f041d65c94f
+  - Python-3.11.3-GCCcore-12.3.0:
+      options:
+        # See https://github.com/easybuilders/easybuild-easyblocks/pull/3352
+        include-easyblocks-from-commit: 1ee17c0f7726c69e97442f53c65c5f041d65c94f
+  - Python-3.11.5-GCCcore-13.2.0:
+      options:
+        # See https://github.com/easybuilders/easybuild-easyblocks/pull/3352
+        include-easyblocks-from-commit: 1ee17c0f7726c69e97442f53c65c5f041d65c94f
diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20251003-eb-4.8.2-Rust-1.65.0-a64fx-with-optarch.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20251003-eb-4.8.2-Rust-1.65.0-a64fx-with-optarch.yml
new file mode 100644
index 0000000000..20c35ce358
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/rebuilds/20251003-eb-4.8.2-Rust-1.65.0-a64fx-with-optarch.yml
@@ -0,0 +1,8 @@
+# 2025.10.03
+# Rust 1.65.0 had build failures on A64FX (related to its included LLVM),
+# and we worked around by using 1.75.0 and adding a dummy module file for 1.65.0.
+# It should be possible to build it with optarch=march=armv8.2-a, so we need to rebuild it.
+# 
+# See https://github.com/EESSI/software-layer/issues/1213
+easyconfigs:
+  - Rust-1.65.0-GCCcore-12.2.0.eb
diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20251003-eb-4.9.2-Python-3.10.8-ctypes-and-correct-Rust-dep-a64fx.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20251003-eb-4.9.2-Python-3.10.8-ctypes-and-correct-Rust-dep-a64fx.yml
new file mode 100644
index 0000000000..4430918c04
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/rebuilds/20251003-eb-4.9.2-Python-3.10.8-ctypes-and-correct-Rust-dep-a64fx.yml
@@ -0,0 +1,10 @@
+# 2025.10.03
+# Just to be sure and consistent, rebuild Python 3.10.8 with Rust 1.65.0 instead of 1.75.0.
+# See https://github.com/EESSI/software-layer/issues/1213
+#
+# Also make sure to include the ctypes fix again here.
+easyconfigs:
+  - Python-3.10.8-GCCcore-12.2.0.eb:
+      options:
+        # See https://github.com/easybuilders/easybuild-easyblocks/pull/3352
+        include-easyblocks-from-commit: 1ee17c0f7726c69e97442f53c65c5f041d65c94f
diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20251008-eb-5.1.1-openCARP-17.0-and-deps-without-ParMETIS-a64fx.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20251008-eb-5.1.1-openCARP-17.0-and-deps-without-ParMETIS-a64fx.yml
new file mode 100644
index 0000000000..df6e8c0b34
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/rebuilds/20251008-eb-5.1.1-openCARP-17.0-and-deps-without-ParMETIS-a64fx.yml
@@ -0,0 +1,10 @@
+# 2025.10.08
+# 
+# The openCARP 17.0 installation for A64FX was built with ParMETIS support (because it had an outdated EESSI-extend at the time of building),
+# while it was disabled for the other targets.
+# This rebuild will make sure that openCARP and its dependencies PETSc and SuperLU_DIST  get built without ParMETIS support,
+# and will allow us to remove ParMETIS from the A64FX stack.
+easyconfigs:
+  - SuperLU_DIST-8.2.1-foss-2023b.eb
+  - PETSc-3.22.5-foss-2023b.eb
+  - openCARP-17.0-foss-2023b.eb
diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20251009-eb-5.1.2-Perl-bundle-CPAN-5.36.1-sync-exts-between-archs.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20251009-eb-5.1.2-Perl-bundle-CPAN-5.36.1-sync-exts-between-archs.yml
new file mode 100644
index 0000000000..bed50eaa94
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/rebuilds/20251009-eb-5.1.2-Perl-bundle-CPAN-5.36.1-sync-exts-between-archs.yml
@@ -0,0 +1,8 @@
+# 2025.10.09
+# Rebuild Perl-bundle-CPAN 5.36.1 to synchronise the extensions between archs.
+# This is necessary because the A64FX version was built with a newer EB version,
+# and the list of extensions had changed.
+# Rebuilding for A64FX version didn't work because of a known and solved issue
+# regarding the tests of an extension, so this rebuilds it for the other targets instead.
+easyconfigs:
+  - Perl-bundle-CPAN-5.36.1-GCCcore-12.3.0.eb
diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20251016-eb-5.1.2-Python-ctypes-improved-patch-non-zen4.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20251016-eb-5.1.2-Python-ctypes-improved-patch-non-zen4.yml
new file mode 100644
index 0000000000..3a87ce5957
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/rebuilds/20251016-eb-5.1.2-Python-ctypes-improved-patch-non-zen4.yml
@@ -0,0 +1,24 @@
+# 2025.10.16
+# Python ctypes relies on LD_LIBRARY_PATH and doesn't respect rpath linking. A prior workaround
+# was implemented in EasyBuild in https://github.com/easybuilders/easybuild-easyblocks/pull/3352.
+# However, while this fixed ctypes.util.find_library(), a similar issue popped up in ctypes.CLL
+# and ctypes.cdll.LoadLibrary https://gitlab.com/eessi/support/-/issues/154
+# An easyblock change and patch were implemented for Python.
+#
+# This rebuild ensures this fix is available for all Python versions based on 12.2.0
+# i.e. this rebuild is done for every architecture _except_ zen4, where this toolchain isn't supported
+easyconfigs:
+  - Python-3.10.8-GCCcore-12.2.0-bare:
+      options:
+        # See https://github.com/easybuilders/easybuild-easyblocks/pull/3860
+        # and https://github.com/easybuilders/easybuild-easyblocks/pull/3965
+        include-easyblocks-from-commit: 3fa0df7414d7d8415fe34f7758649f966322472e
+        # See https://github.com/easybuilders/easybuild-easyconfigs/pull/23499
+        from-commit: 08aa521b52c9f83d8df345d083e46d6f304d5641
+  - Python-3.10.8-GCCcore-12.2.0:
+      options:
+        # See https://github.com/easybuilders/easybuild-easyblocks/pull/3860
+        # and https://github.com/easybuilders/easybuild-easyblocks/pull/3965
+        include-easyblocks-from-commit: 3fa0df7414d7d8415fe34f7758649f966322472e
+        # See https://github.com/easybuilders/easybuild-easyconfigs/pull/23499
+        from-commit: 08aa521b52c9f83d8df345d083e46d6f304d5641
diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20251016-eb-5.1.2-Python-ctypes-improved-patch.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20251016-eb-5.1.2-Python-ctypes-improved-patch.yml
new file mode 100644
index 0000000000..8632b56588
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/rebuilds/20251016-eb-5.1.2-Python-ctypes-improved-patch.yml
@@ -0,0 +1,24 @@
+# 2025.10.16
+# Python ctypes relies on LD_LIBRARY_PATH and doesn't respect rpath linking. A prior workaround
+# was implemented in EasyBuild in https://github.com/easybuilders/easybuild-easyblocks/pull/3352.
+# However, while this fixed ctypes.util.find_library(), a similar issue popped up in ctypes.CLL
+# and ctypes.cdll.LoadLibrary https://gitlab.com/eessi/support/-/issues/154
+# An easyblock change and patch were implemented for Python.
+#
+# This rebuild ensures this fix is available for all Python versions shipped with EESSI that are supported on
+# all architectures, including zen4.
+easyconfigs:
+  - Python-3.11.3-GCCcore-12.3.0:
+      options:
+        # See https://github.com/easybuilders/easybuild-easyblocks/pull/3860
+        # and https://github.com/easybuilders/easybuild-easyblocks/pull/3965
+        include-easyblocks-from-commit: 3fa0df7414d7d8415fe34f7758649f966322472e
+        # See https://github.com/easybuilders/easybuild-easyconfigs/pull/23499
+        from-commit: 08aa521b52c9f83d8df345d083e46d6f304d5641
+  - Python-3.11.5-GCCcore-13.2.0:
+      options:
+        # See https://github.com/easybuilders/easybuild-easyblocks/pull/3860
+        # and https://github.com/easybuilders/easybuild-easyblocks/pull/3965
+        include-easyblocks-from-commit: 3fa0df7414d7d8415fe34f7758649f966322472e
+        # See https://github.com/easybuilders/easybuild-easyconfigs/pull/23499
+        from-commit: 08aa521b52c9f83d8df345d083e46d6f304d5641
diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20251025-eb-5.1.2-Ruby-3.2.2-fix-segfaults-aarch64.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20251025-eb-5.1.2-Ruby-3.2.2-fix-segfaults-aarch64.yml
new file mode 100644
index 0000000000..c287d73e94
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/rebuilds/20251025-eb-5.1.2-Ruby-3.2.2-fix-segfaults-aarch64.yml
@@ -0,0 +1,17 @@
+# 2025.10.25
+# Some Ruby 3.2.2 installations for NVIDIA Grace (built on JURECA which has not
+# enabled PAC+BTI CPU features) and for Neoverse V1 (built on AWS) segfault on
+# some NVIDIA Grace systems (SURF-ETP, Olivia, eX3) which have PAC+BTI CPU
+# features enabled.
+# 
+# See https://gitlab.com/eessi/support/-/issues/197 for details.
+#
+# Also version 3.3.0 had the same problem, but is being rebuilt in a separate PR
+# because for 'zen4' there is only a dummy module (for all modules based on
+# foss/2022b)
+#
+easyconfigs:
+  - Ruby-3.2.2-GCCcore-12.2.0:
+      options:
+        # See https://github.com/easybuilders/easybuild-easyconfigs/pull/24368
+        from-commit: 9e2517e90e7e30b2427bd0259dab73bf3a5391bc
diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20251025-eb-5.1.2-Ruby-3.3.0-fix-segfaults-aarch64.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20251025-eb-5.1.2-Ruby-3.3.0-fix-segfaults-aarch64.yml
new file mode 100644
index 0000000000..c3aa56ea13
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/rebuilds/20251025-eb-5.1.2-Ruby-3.3.0-fix-segfaults-aarch64.yml
@@ -0,0 +1,17 @@
+# 2025.10.25
+# Some Ruby 3.3.0 installations for NVIDIA Grace (built on JURECA which has not
+# enabled PAC+BTI CPU features) and for Neoverse V1 (built on AWS) segfault on
+# some NVIDIA Grace systems (SURF-ETP, Olivia, eX3) which have PAC+BTI CPU
+# features enabled.
+# 
+# See https://gitlab.com/eessi/support/-/issues/197 for details.
+#
+# Also version 3.2.2 had the same problem, but is being rebuilt in a separate PR
+# because for 'zen4' there is only a dummy module (for all modules based on
+# foss/2022b)
+#
+easyconfigs:
+  - Ruby-3.3.0-GCCcore-12.3.0:
+      options:
+        # See https://github.com/easybuilders/easybuild-easyconfigs/pull/24368
+        from-commit: 9e2517e90e7e30b2427bd0259dab73bf3a5391bc
diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20251027-eb-5.1.2-EasyBuild-5.1.2-pass_deps_to_toolchain_prep.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20251027-eb-5.1.2-EasyBuild-5.1.2-pass_deps_to_toolchain_prep.yml
new file mode 100644
index 0000000000..b20fa67863
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/rebuilds/20251027-eb-5.1.2-EasyBuild-5.1.2-pass_deps_to_toolchain_prep.yml
@@ -0,0 +1,11 @@
+# Fix long-lived EasyBuild bug with toolchain prepare when not using CPATH
+# The bug has been exposed when using the new options
+# EASYBUILD_MODULE_SEARCH_PATH_HEADERS=include_paths and
+# EASYBUILD_SEARCH_PATH_CPP_HEADERS=include_paths so that CPATH is no longer
+# set with EESSI/2025.06
+#
+easyconfigs:
+  - EasyBuild-5.1.2.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24376
+        from-commit: 80f00063d4896474e46fdd8958b0471735d7ea65
diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20251029-eb-5.1.2-UCX-1.13.1-foss-2022b-bistro-fix.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20251029-eb-5.1.2-UCX-1.13.1-foss-2022b-bistro-fix.yml
new file mode 100644
index 0000000000..4e2fc8c69e
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/rebuilds/20251029-eb-5.1.2-UCX-1.13.1-foss-2022b-bistro-fix.yml
@@ -0,0 +1,11 @@
+# With an update to CUDA driver R575 or newer UCX fails to create a registration cache
+# This cache is essential to prevent having to pin memory for every individual data
+# transfer. Pinning memory for every individual transfer introduces a high overhead on
+# every transfer, crippling performance
+# A patch was introduced to solve the issue, this rebuild reinstalls UCX with that patch.
+# More information, see https://gitlab.com/eessi/support/-/issues/209
+easyconfigs:
+  - UCX-1.13.1-GCCcore-12.2.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24388
+        from-commit: d438adc699f5ff35d866d9045f0aae663a0913cb
diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20251029-eb-5.1.2-UCX-bistro-fix.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20251029-eb-5.1.2-UCX-bistro-fix.yml
new file mode 100644
index 0000000000..633306f4e9
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/rebuilds/20251029-eb-5.1.2-UCX-bistro-fix.yml
@@ -0,0 +1,15 @@
+# With an update to CUDA driver R575 or newer UCX fails to create a registration cache
+# This cache is essential to prevent having to pin memory for every individual data
+# transfer. Pinning memory for every individual transfer introduces a high overhead on
+# every transfer, crippling performance
+# A patch was introduced to solve the issue, this rebuild reinstalls UCX with that patch.
+# More information, see https://gitlab.com/eessi/support/-/issues/209
+easyconfigs:
+  - UCX-1.14.1-GCCcore-12.3.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24388
+        from-commit: d438adc699f5ff35d866d9045f0aae663a0913cb
+  - UCX-1.15.0-GCCcore-13.2.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24388
+        from-commit: d438adc699f5ff35d866d9045f0aae663a0913cb
diff --git a/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.1-001-system.yml b/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.1-001-system.yml
new file mode 100644
index 0000000000..be014b363c
--- /dev/null
+++ b/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.1-001-system.yml
@@ -0,0 +1,11 @@
+easyconfigs:
+  # note: M4 is only listed here because it's a build dependency for GCCcore,
+  #       but it was still filtered out as dependency when GCCcore/13.3.0 and GCCcore/14.2.0 got built;
+  #       now Autotools/Automake/libtool/M4 are retained as (build) dependency because the newer versions
+  #       in EESSI 2025.06 compat layer can cause problems with some installations (like OpenMPI);
+  #       see also https://github.com/EESSI/software-layer-scripts/pull/74
+  - M4-1.4.19.eb
+  - EasyBuild-5.1.2.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24024
+        from-commit: d250e047335cff444680790ceb026676cfb65eb8
diff --git a/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.1-2024a.yml b/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.1-2024a.yml
new file mode 100644
index 0000000000..2d0555424b
--- /dev/null
+++ b/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.1-2024a.yml
@@ -0,0 +1,10 @@
+easyconfigs:
+  - GCC-13.3.0.eb
+  - gfbf-2024a.eb
+  - FFTW-3.3.10-GCC-13.3.0
+  - OpenMPI-5.0.3-GCC-13.3.0.eb
+  - foss-2024a.eb
+  - ollama-0.6.0-GCCcore-13.3.0.eb
+  - MetaBAT-2.17-GCC-13.3.0.eb
+  - p7zip-17.05-GCCcore-13.3.0.eb
+
diff --git a/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.1-2025a.yml b/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.1-2025a.yml
new file mode 100644
index 0000000000..c1ecde53dd
--- /dev/null
+++ b/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.1-2025a.yml
@@ -0,0 +1,2 @@
+easyconfigs:
+  - GCC-14.2.0.eb
diff --git a/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.2-001-system.yml b/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.2-001-system.yml
new file mode 100644
index 0000000000..e6e4e8c20c
--- /dev/null
+++ b/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.2-001-system.yml
@@ -0,0 +1,6 @@
+easyconfigs:
+  - ReFrame-4.7.4.eb
+  - caddy-2.10.2.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24402
+        from-commit: b83c437b11d31e2b8bb6ac8eb683a1b24e0dc810
diff --git a/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.2-2024a.yml b/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.2-2024a.yml
new file mode 100644
index 0000000000..1484420604
--- /dev/null
+++ b/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.2-2024a.yml
@@ -0,0 +1,74 @@
+easyconfigs:
+  - Python-bundle-PyPI-2024.06-GCCcore-13.3.0.eb
+  - LLVM-18.1.8-GCCcore-13.3.0-minimal.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyblocks/pull/3952
+        include-easyblocks-from-commit: 2e5a227c1f0f161d6a96a938b287c0140ef88648
+  - Mesa-24.1.3-GCCcore-13.3.0.eb
+  - libdeflate-1.20-GCCcore-13.3.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24171
+        from-commit: a8acda7b6540f666005f362cd2042f1b0170d717
+  - R-4.4.2-gfbf-2024a.eb
+  - Perl-bundle-CPAN-5.38.2-GCCcore-13.3.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24186
+        from-commit: 7b34eae4ec75e83e13c069203ab6be709da97a96
+  - re2c-3.1-GCCcore-13.3.0.eb 
+  - libwebp-1.4.0-GCCcore-13.3.0.eb
+  - graphite2-1.3.14-GCCcore-13.3.0.eb
+  - assimp-5.4.3-GCCcore-13.3.0.eb
+  - FFmpeg-7.0.2-GCCcore-13.3.0.eb
+  - JasPer-4.2.4-GCCcore-13.3.0.eb
+  - snappy-1.2.1-GCCcore-13.3.0.eb
+  - NSS-3.104-GCCcore-13.3.0.eb
+  - nodejs-20.13.1-GCCcore-13.3.0.eb
+  - TurboVNC-3.1.2-GCCcore-13.3.0.eb
+  - feh-3.10.3-GCCcore-13.3.0.eb
+  - Openbox-3.6.1-GCCcore-13.3.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24280
+        from-commit: cef31b32459a296e95447f89ff17a15371deacef
+  - Rust-1.83.0-GCCcore-13.3.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24331
+        from-commit: fb71f0be42a1e65b9f0aa669f7d2ced3708ca634
+  - tint2-17.0.2-GCCcore-13.3.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24280
+        from-commit: cef31b32459a296e95447f89ff17a15371deacef
+  - xterm-402-GCCcore-13.3.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24280
+        from-commit: cef31b32459a296e95447f89ff17a15371deacef
+  - jgmenu-4.5.0-GCCcore-13.3.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24323
+        from-commit: dda6e6dfbe23177be7d251819007c144c132323a
+  - picom-12.5-GCCcore-13.3.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24279
+        from-commit: ca754557cc23264b213fb09d3e6b2d360e3eb426
+  - Qt6-6.7.2-GCCcore-13.3.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24356
+        from-commit: c057c3242d4a947ae30358ea283659ff0d1a3d17
+  - SciPy-bundle-2024.05-gfbf-2024a.eb
+  - websockify-0.13.0-gfbf-2024a.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24287
+        from-commit: 131a6fecdf26796f85c26a392f511f86078291c6
+  - ParaView-5.13.2-foss-2024a.eb
+  - matplotlib-3.9.2-gfbf-2024a.eb
+  - tensorboard-2.18.0-gfbf-2024a.eb
+  - VTK-9.3.1-foss-2024a.eb
+  - GMP-6.3.0-GCCcore-13.3.0.eb
+  - NLopt-2.7.1-GCCcore-13.3.0.eb
+  - UDUNITS-2.2.28-GCCcore-13.3.0.eb
+  - ImageMagick-7.1.1-38-GCCcore-13.3.0.eb
+  - GSL-2.8-GCC-13.3.0.eb
+  - GDAL-3.10.0-foss-2024a.eb
+  - MPFR-4.2.1-GCCcore-13.3.0.eb
+  - PostgreSQL-16.4-GCCcore-13.3.0.eb
+  - Xvfb-21.1.14-GCCcore-13.3.0.eb
+  - GLPK-5.0-GCCcore-13.3.0.eb
diff --git a/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.2-2025a.yml b/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.2-2025a.yml
new file mode 100644
index 0000000000..b46e0719c4
--- /dev/null
+++ b/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.2-2025a.yml
@@ -0,0 +1,49 @@
+easyconfigs:
+  - Python-3.13.1-GCCcore-14.2.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24189
+        from-commit: dd72fa142487271380eda2029b99c695faf7137d
+  - libarchive-3.7.7-GCCcore-14.2.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24203
+        from-commit: 237970c5b712196f4d01feab8b913591cc6c772f
+  - Perl-bundle-CPAN-5.40.0-GCCcore-14.2.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24186
+        from-commit: 7b34eae4ec75e83e13c069203ab6be709da97a96
+  - OpenBLAS-0.3.29-GCC-14.2.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24204
+        from-commit: 2b4e8419ba88f858a4a5d07f546ccbaa1070553d
+  - BLIS-1.1-GCC-14.2.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24205
+        from-commit: a24af27f1d7f41ba21539955419c8b41f224efdf
+  - FlexiBLAS-3.4.5-GCC-14.2.0.eb
+  - foss-2025a.eb
+  - Rust-1.85.1-GCCcore-14.2.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24331
+        from-commit: b6adb815305bd199f1ade69194e2ca9faaf87e07
+  - Python-bundle-PyPI-2025.04-GCCcore-14.2.0.eb
+  - PyYAML-6.0.2-GCCcore-14.2.0.eb
+  - Z3-4.13.4-GCCcore-14.2.0.eb
+  - libglvnd-1.7.0-GCCcore-14.2.0.eb
+  - SciPy-bundle-2025.06-gfbf-2025a.eb
+  - Boost.MPI-1.88.0-gompi-2025a.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24421
+        from-commit: dc5f86bd3433803b877948c5d667676e93f6afa3
+  - Score-P-9.3-gompi-2025a.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24161
+        from-commit: 04b8829e730bc35a4654441297fb39a7d8d4b4dc
+  - OSU-Micro-Benchmarks-7.5-gompi-2025a.eb    
+  - json-fortran-9.0.5-GCC-14.2.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24095
+        from-commit: dec5a6f7e05325a634fc59d7665ef418ecb553cc
+  - BLAST+-2.17.0-gompi-2025a.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24060
+        from-commit: 5dd9b67d1d5dd0cf4865c4e5166adf8e92b76829
diff --git a/easystacks/software.eessi.io/2025.06/rebuilds/20251016-eb-5.1.2-Python-ctypes-improved-patch.yml b/easystacks/software.eessi.io/2025.06/rebuilds/20251016-eb-5.1.2-Python-ctypes-improved-patch.yml
new file mode 100644
index 0000000000..e71b27dbec
--- /dev/null
+++ b/easystacks/software.eessi.io/2025.06/rebuilds/20251016-eb-5.1.2-Python-ctypes-improved-patch.yml
@@ -0,0 +1,24 @@
+# 2025.10.16
+# Python ctypes relies on LD_LIBRARY_PATH and doesn't respect rpath linking. A prior workaround
+# was implemented in EasyBuild in https://github.com/easybuilders/easybuild-easyblocks/pull/3352.
+# However, while this fixed ctypes.util.find_library(), a similar issue popped up in ctypes.CLL
+# and ctypes.cdll.LoadLibrary https://gitlab.com/eessi/support/-/issues/154
+# An easyblock change and patch were implemented for Python.
+#
+# This rebuild ensures this fix is available for all Python versions shipped with EESSI that are supported on
+# all architectures.
+easyconfigs:
+  - Python-3.12.3-GCCcore-13.3.0:
+      options:
+        # See https://github.com/easybuilders/easybuild-easyblocks/pull/3860
+        # and https://github.com/easybuilders/easybuild-easyblocks/pull/3965
+        include-easyblocks-from-commit: 3fa0df7414d7d8415fe34f7758649f966322472e
+        # See https://github.com/easybuilders/easybuild-easyconfigs/pull/23499
+        from-commit: 08aa521b52c9f83d8df345d083e46d6f304d5641
+  - Python-3.13.1-GCCcore-14.2.0:
+      options:
+        # See https://github.com/easybuilders/easybuild-easyblocks/pull/3860
+        # and https://github.com/easybuilders/easybuild-easyblocks/pull/3965
+        include-easyblocks-from-commit: 3fa0df7414d7d8415fe34f7758649f966322472e
+        # See https://github.com/easybuilders/easybuild-easyconfigs/pull/23499
+        from-commit: 08aa521b52c9f83d8df345d083e46d6f304d5641
diff --git a/easystacks/software.eessi.io/2025.06/rebuilds/20251027-eb-5.1.2-EasyBuild-5.1.2-pass_deps_to_toolchain_prep.yml b/easystacks/software.eessi.io/2025.06/rebuilds/20251027-eb-5.1.2-EasyBuild-5.1.2-pass_deps_to_toolchain_prep.yml
new file mode 100644
index 0000000000..b20fa67863
--- /dev/null
+++ b/easystacks/software.eessi.io/2025.06/rebuilds/20251027-eb-5.1.2-EasyBuild-5.1.2-pass_deps_to_toolchain_prep.yml
@@ -0,0 +1,11 @@
+# Fix long-lived EasyBuild bug with toolchain prepare when not using CPATH
+# The bug has been exposed when using the new options
+# EASYBUILD_MODULE_SEARCH_PATH_HEADERS=include_paths and
+# EASYBUILD_SEARCH_PATH_CPP_HEADERS=include_paths so that CPATH is no longer
+# set with EESSI/2025.06
+#
+easyconfigs:
+  - EasyBuild-5.1.2.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24376
+        from-commit: 80f00063d4896474e46fdd8958b0471735d7ea65
diff --git a/easystacks/software.eessi.io/2025.06/rebuilds/20251030-eb-5.1.2-UCX-bistro-fix.yml b/easystacks/software.eessi.io/2025.06/rebuilds/20251030-eb-5.1.2-UCX-bistro-fix.yml
new file mode 100644
index 0000000000..008023bf37
--- /dev/null
+++ b/easystacks/software.eessi.io/2025.06/rebuilds/20251030-eb-5.1.2-UCX-bistro-fix.yml
@@ -0,0 +1,15 @@
+# With an update to CUDA driver R575 or newer UCX fails to create a registration cache
+# This cache is essential to prevent having to pin memory for every individual data
+# transfer. Pinning memory for every individual transfer introduces a high overhead on
+# every transfer, crippling performance
+# A patch was introduced to solve the issue, this rebuild reinstalls UCX with that patch.
+# More information, see https://gitlab.com/eessi/support/-/issues/209
+easyconfigs:
+  - UCX-1.16.0-GCCcore-13.3.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24388
+        from-commit: d438adc699f5ff35d866d9045f0aae663a0913cb
+  - UCX-1.18.0-GCCcore-14.2.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/24388
+        from-commit: d438adc699f5ff35d866d9045f0aae663a0913cb
diff --git a/eessi-2023.06-known-issues.yml b/eessi-2023.06-known-issues.yml
index 28cc724ada..4e06f9a3de 100644
--- a/eessi-2023.06-known-issues.yml
+++ b/eessi-2023.06-known-issues.yml
@@ -1,4 +1,10 @@
-- aarch64/a64x:
+- aarch64/a64fx:
+  - LLVM-15.0.5-GCCcore-12.2.0.eb:
+    - issue: https://github.com/EESSI/software-layer/issues/1213
+    - info: "build failure: immediate offset out of range"
+  - Rust-1.65.0-GCCcore-12.2.0.eb:
+    - issue: https://github.com/EESSI/software-layer/issues/1213
+    - info: "same build failure as LLVM 15.0.5, as Rust includes LLVM 15"
   - SciPy-bundle-2023.07-gfbf-2023a:
     - issue: https://github.com/EESSI/software-layer/issues/318
     - info: "4 failing tests (vs 54407 passed) in scipy test suite"