diff --git a/easystacks/software.eessi.io/2023.06/icelake_cclake/008-eb-4.9.0.yml b/easystacks/software.eessi.io/2023.06/icelake_cclake/008-eb-4.9.0.yml
new file mode 100644
index 0000000000..7b8115f7ac
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/icelake_cclake/008-eb-4.9.0.yml
@@ -0,0 +1,5 @@
+# 008-eb-4.9.0.yml: total build duration = 24 minutes
+easyconfigs:
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/OpenMPI/4.1.5-GCC-12.3.0/easybuild/OpenMPI-4.1.5-GCC-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/OpenMPI/4.1.5-GCC-12.3.0/easybuild/reprod/easyblocks/*.py
diff --git a/easystacks/software.eessi.io/2023.06/icelake_cclake/009-eb-4.8.2.yml b/easystacks/software.eessi.io/2023.06/icelake_cclake/009-eb-4.8.2.yml
new file mode 100644
index 0000000000..714731a5db
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/icelake_cclake/009-eb-4.8.2.yml
@@ -0,0 +1,26 @@
+# 009-eb-4.8.2.yml: total build duration = 13 minutes
+easyconfigs:
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/gompi/2023a/easybuild/gompi-2023a.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/gompi/2023a/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/FFTW.MPI/3.3.10-gompi-2023a/easybuild/FFTW.MPI-3.3.10-gompi-2023a.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/FFTW.MPI/3.3.10-gompi-2023a/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/ScaLAPACK/2.2.0-gompi-2023a-fb/easybuild/ScaLAPACK-2.2.0-gompi-2023a-fb.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/ScaLAPACK/2.2.0-gompi-2023a-fb/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/foss/2023a/easybuild/foss-2023a.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/foss/2023a/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Eigen/3.4.0-GCCcore-12.3.0/easybuild/Eigen-3.4.0-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Eigen/3.4.0-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Catch2/2.13.9-GCCcore-12.3.0/easybuild/Catch2-2.13.9-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Catch2/2.13.9-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/expat/2.5.0-GCCcore-12.3.0/easybuild/expat-2.5.0-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/expat/2.5.0-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/git/2.41.0-GCCcore-12.3.0-nodocs/easybuild/git-2.41.0-GCCcore-12.3.0-nodocs.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/git/2.41.0-GCCcore-12.3.0-nodocs/easybuild/reprod/easyblocks/*.py
diff --git a/easystacks/software.eessi.io/2023.06/icelake_cclake/010-eb-4.9.2.yml b/easystacks/software.eessi.io/2023.06/icelake_cclake/010-eb-4.9.2.yml
new file mode 100644
index 0000000000..79c671eab9
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/icelake_cclake/010-eb-4.9.2.yml
@@ -0,0 +1,5 @@
+# 010-eb-4.9.2.yml: total build duration = 0 minutes
+easyconfigs:
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/hatchling/1.18.0-GCCcore-12.3.0/easybuild/hatchling-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/hatchling/1.18.0-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
diff --git a/easystacks/software.eessi.io/2023.06/icelake_cclake/011-eb-4.8.2.yml b/easystacks/software.eessi.io/2023.06/icelake_cclake/011-eb-4.8.2.yml
new file mode 100644
index 0000000000..0f129ce35c
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/icelake_cclake/011-eb-4.8.2.yml
@@ -0,0 +1,23 @@
+# 011-eb-4.8.2.yml: total build duration = 2 minutes
+easyconfigs:
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/scikit-build/0.17.6-GCCcore-12.3.0/easybuild/scikit-build-0.17.6-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/scikit-build/0.17.6-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/flit/3.9.0-GCCcore-12.3.0/easybuild/flit-3.9.0-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/flit/3.9.0-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/virtualenv/20.23.1-GCCcore-12.3.0/easybuild/virtualenv-20.23.1-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/virtualenv/20.23.1-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/setuptools-rust/1.6.0-GCCcore-12.3.0/easybuild/setuptools-rust-1.6.0-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/setuptools-rust/1.6.0-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/cffi/1.15.1-GCCcore-12.3.0/easybuild/cffi-1.15.1-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/cffi/1.15.1-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/cryptography/41.0.1-GCCcore-12.3.0/easybuild/cryptography-41.0.1-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/cryptography/41.0.1-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/poetry/1.5.1-GCCcore-12.3.0/easybuild/poetry-1.5.1-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/poetry/1.5.1-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
diff --git a/easystacks/software.eessi.io/2023.06/icelake_cclake/012-eb-4.9.1.yml b/easystacks/software.eessi.io/2023.06/icelake_cclake/012-eb-4.9.1.yml
new file mode 100644
index 0000000000..360fc00a8d
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/icelake_cclake/012-eb-4.9.1.yml
@@ -0,0 +1,5 @@
+# 012-eb-4.9.1.yml: total build duration = 16 minutes
+easyconfigs:
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Python-bundle-PyPI/2023.06-GCCcore-12.3.0/easybuild/Python-bundle-PyPI-2023.06-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Python-bundle-PyPI/2023.06-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
diff --git a/easystacks/software.eessi.io/2023.06/icelake_cclake/013-eb-4.8.2.yml b/easystacks/software.eessi.io/2023.06/icelake_cclake/013-eb-4.8.2.yml
new file mode 100644
index 0000000000..23a0187f0f
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/icelake_cclake/013-eb-4.8.2.yml
@@ -0,0 +1,50 @@
+# 013-eb-4.8.2.yml: total build duration = 15 minutes
+easyconfigs:
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/pybind11/2.11.1-GCCcore-12.3.0/easybuild/pybind11-2.11.1-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/pybind11/2.11.1-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/hypothesis/6.82.0-GCCcore-12.3.0/easybuild/hypothesis-6.82.0-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/hypothesis/6.82.0-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Meson/1.1.1-GCCcore-12.3.0/easybuild/Meson-1.1.1-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Meson/1.1.1-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/gfbf/2023a/easybuild/gfbf-2023a.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/gfbf/2023a/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Zip/3.0-GCCcore-12.3.0/easybuild/Zip-3.0-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Zip/3.0-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/dill/0.3.7-GCCcore-12.3.0/easybuild/dill-0.3.7-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/dill/0.3.7-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/pkgconfig/1.5.5-GCCcore-12.3.0-python/easybuild/pkgconfig-1.5.5-GCCcore-12.3.0-python.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/pkgconfig/1.5.5-GCCcore-12.3.0-python/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/double-conversion/3.3.0-GCCcore-12.3.0/easybuild/double-conversion-3.3.0-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/double-conversion/3.3.0-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/mpi4py/3.1.4-gompi-2023a/easybuild/mpi4py-3.1.4-gompi-2023a.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/mpi4py/3.1.4-gompi-2023a/easybuild/reprod/easyblocks/*.py
+  - Java-11.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Java/11.0.20/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Java/11.0.20/easybuild/Java-11.0.20.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Java/11.0.20/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Bazel/6.3.1-GCCcore-12.3.0/easybuild/Bazel-6.3.1-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Bazel/6.3.1-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/flatbuffers/23.5.26-GCCcore-12.3.0/easybuild/flatbuffers-23.5.26-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/flatbuffers/23.5.26-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/flatbuffers-python/23.5.26-GCCcore-12.3.0/easybuild/flatbuffers-python-23.5.26-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/flatbuffers-python/23.5.26-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Szip/2.1.1-GCCcore-12.3.0/easybuild/Szip-2.1.1-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Szip/2.1.1-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/HDF5/1.14.0-gompi-2023a/easybuild/HDF5-1.14.0-gompi-2023a.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/HDF5/1.14.0-gompi-2023a/easybuild/reprod/easyblocks/*.py
diff --git a/easystacks/software.eessi.io/2023.06/icelake_cclake/014-eb-4.9.2.yml b/easystacks/software.eessi.io/2023.06/icelake_cclake/014-eb-4.9.2.yml
new file mode 100644
index 0000000000..195a7ea1f5
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/icelake_cclake/014-eb-4.9.2.yml
@@ -0,0 +1,5 @@
+# 014-eb-4.9.2.yml: total build duration = 3 minutes
+easyconfigs:
+  - /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Cython/3.0.8-GCCcore-12.3.0/easybuild/Cython-3.0.8-GCCcore-12.3.0.eb:
+      options:
+        include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Cython/3.0.8-GCCcore-12.3.0/easybuild/reprod/easyblocks/*.py