diff --git a/easystacks/software.eessi.io/2023.06/icelake_cclake/001-eb-4.9.4.yml b/easystacks/software.eessi.io/2023.06/icelake_cclake/001-eb-4.9.4.yml
index afe5d33ce3..45b2b1d1c7 100644
--- a/easystacks/software.eessi.io/2023.06/icelake_cclake/001-eb-4.9.4.yml
+++ b/easystacks/software.eessi.io/2023.06/icelake_cclake/001-eb-4.9.4.yml
@@ -1,3 +1,4 @@
+# 001-eb-4.9.4.yml: total build duration = 4 minutes
 easyconfigs:
   - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/EasyBuild/4.8.2/easybuild/reprod/EasyBuild-4.8.2.eb:
       options:
diff --git a/easystacks/software.eessi.io/2023.06/icelake_cclake/002-eb-4.9.1.yml b/easystacks/software.eessi.io/2023.06/icelake_cclake/002-eb-4.9.1.yml
index ce43ff7da5..af8d26d4dc 100644
--- a/easystacks/software.eessi.io/2023.06/icelake_cclake/002-eb-4.9.1.yml
+++ b/easystacks/software.eessi.io/2023.06/icelake_cclake/002-eb-4.9.1.yml
@@ -1,3 +1,4 @@
+# 002-eb-4.9.1.yml: total build duration = 1 minutes
 easyconfigs:
   - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/EasyBuild/4.9.2/easybuild/reprod/EasyBuild-4.9.2.eb:
       options:
diff --git a/easystacks/software.eessi.io/2023.06/icelake_cclake/003-eb-4.9.2.yml b/easystacks/software.eessi.io/2023.06/icelake_cclake/003-eb-4.9.2.yml
index 083bc53fef..985bd561aa 100644
--- a/easystacks/software.eessi.io/2023.06/icelake_cclake/003-eb-4.9.2.yml
+++ b/easystacks/software.eessi.io/2023.06/icelake_cclake/003-eb-4.9.2.yml
@@ -1,3 +1,4 @@
+# 003-eb-4.9.2.yml: total build duration = 1 minutes
 easyconfigs:
   - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/EasyBuild/4.9.3/easybuild/reprod/EasyBuild-4.9.3.eb:
       options:
diff --git a/easystacks/software.eessi.io/2023.06/icelake_cclake/004-eb-4.9.0.yml b/easystacks/software.eessi.io/2023.06/icelake_cclake/004-eb-4.9.0.yml
new file mode 100644
index 0000000000..15a438f71c
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/icelake_cclake/004-eb-4.9.0.yml
@@ -0,0 +1,8 @@
+# 004-eb-4.9.0.yml: total build duration = 121 minutes
+easyconfigs:
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/GCCcore/12.3.0/easybuild/GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/GCCcore/12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/GCCcore/13.2.0/easybuild/GCCcore-13.2.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/GCCcore/13.2.0/easybuild/reprod/easyblocks/*.py
diff --git a/easystacks/software.eessi.io/2023.06/icelake_cclake/005-eb-4.8.2.yml b/easystacks/software.eessi.io/2023.06/icelake_cclake/005-eb-4.8.2.yml
new file mode 100644
index 0000000000..acd3c0d7fc
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/icelake_cclake/005-eb-4.8.2.yml
@@ -0,0 +1,38 @@
+# 005-eb-4.8.2.yml: total build duration = 12 minutes
+easyconfigs:
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/GCC/12.3.0/easybuild/reprod/GCC-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/GCC/12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/UnZip/6.0-GCCcore-12.3.0/easybuild/reprod/UnZip-6.0-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/UnZip/6.0-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/pkgconf/1.9.5-GCCcore-12.3.0/easybuild/reprod/pkgconf-1.9.5-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/pkgconf/1.9.5-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/pkgconf/1.8.0/easybuild/reprod/pkgconf-1.8.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/pkgconf/1.8.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/OpenSSL/1.1/easybuild/OpenSSL-1.1.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/OpenSSL/1.1/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/cURL/8.0.1-GCCcore-12.3.0/easybuild/reprod/cURL-8.0.1-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/cURL/8.0.1-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/libarchive/3.6.2-GCCcore-12.3.0/easybuild/reprod/libarchive-3.6.2-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/libarchive/3.6.2-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/CMake/3.26.3-GCCcore-12.3.0/easybuild/reprod/CMake-3.26.3-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/CMake/3.26.3-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/patchelf/0.18.0-GCCcore-12.3.0/easybuild/reprod/patchelf-0.18.0-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/patchelf/0.18.0-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/libffi/3.4.4-GCCcore-12.3.0/easybuild/reprod/libffi-3.4.4-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/libffi/3.4.4-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Tcl/8.6.13-GCCcore-12.3.0/easybuild/reprod/Tcl-8.6.13-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Tcl/8.6.13-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/SQLite/3.42.0-GCCcore-12.3.0/easybuild/reprod/SQLite-3.42.0-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/SQLite/3.42.0-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
diff --git a/easystacks/software.eessi.io/2023.06/icelake_cclake/006-eb-4.9.2.yml b/easystacks/software.eessi.io/2023.06/icelake_cclake/006-eb-4.9.2.yml
new file mode 100644
index 0000000000..c6f3aeb369
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/icelake_cclake/006-eb-4.9.2.yml
@@ -0,0 +1,5 @@
+# 006-eb-4.9.2.yml: total build duration = 12 minutes
+easyconfigs:
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Python/3.11.3-GCCcore-12.3.0/easybuild/reprod/Python-3.11.3-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Python/3.11.3-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
diff --git a/easystacks/software.eessi.io/2023.06/icelake_cclake/007-eb-4.8.2.yml b/easystacks/software.eessi.io/2023.06/icelake_cclake/007-eb-4.8.2.yml
new file mode 100644
index 0000000000..7175a38514
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/icelake_cclake/007-eb-4.8.2.yml
@@ -0,0 +1,56 @@
+# 007-eb-4.8.2.yml: total build duration = 133 minutes
+easyconfigs:
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Ninja/1.11.1-GCCcore-12.3.0/easybuild/reprod/Ninja-1.11.1-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Ninja/1.11.1-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Rust/1.70.0-GCCcore-12.3.0/easybuild/reprod/Rust-1.70.0-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Rust/1.70.0-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Perl/5.36.1-GCCcore-12.3.0/easybuild/reprod/Perl-5.36.1-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Perl/5.36.1-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/FFTW/3.3.10-GCC-12.3.0/easybuild/reprod/FFTW-3.3.10-GCC-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/FFTW/3.3.10-GCC-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/BLIS/0.9.0-GCC-12.3.0/easybuild/reprod/BLIS-0.9.0-GCC-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/BLIS/0.9.0-GCC-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/libevent/2.1.12-GCCcore-12.3.0/easybuild/reprod/libevent-2.1.12-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/libevent/2.1.12-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/numactl/2.0.16-GCCcore-12.3.0/easybuild/reprod/numactl-2.0.16-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/numactl/2.0.16-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/UCX/1.14.1-GCCcore-12.3.0/easybuild/reprod/UCX-1.14.1-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/UCX/1.14.1-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/libxml2/2.11.4-GCCcore-12.3.0/easybuild/reprod/libxml2-2.11.4-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/libxml2/2.11.4-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/make/4.4.1-GCCcore-12.3.0/easybuild/reprod/make-4.4.1-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/make/4.4.1-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/OpenBLAS/0.3.23-GCC-12.3.0/easybuild/reprod/OpenBLAS-0.3.23-GCC-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/OpenBLAS/0.3.23-GCC-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/FlexiBLAS/3.3.1-GCC-12.3.0/easybuild/FlexiBLAS-3.3.1-GCC-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/FlexiBLAS/3.3.1-GCC-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/libfabric/1.18.0-GCCcore-12.3.0/easybuild/reprod/libfabric-1.18.0-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/libfabric/1.18.0-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/xorg-macros/1.20.0-GCCcore-12.3.0/easybuild/reprod/xorg-macros-1.20.0-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/xorg-macros/1.20.0-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/libpciaccess/0.17-GCCcore-12.3.0/easybuild/reprod/libpciaccess-0.17-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/libpciaccess/0.17-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/hwloc/2.9.1-GCCcore-12.3.0/easybuild/reprod/hwloc-2.9.1-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/hwloc/2.9.1-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/PMIx/4.2.4-GCCcore-12.3.0/easybuild/reprod/PMIx-4.2.4-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/PMIx/4.2.4-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/UCC/1.2.0-GCCcore-12.3.0/easybuild/reprod/UCC-1.2.0-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/UCC/1.2.0-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py