diff --git a/.github/workflows/test_eessi.yml b/.github/workflows/test_eessi.yml
index 64269d2982..24c036e342 100644
--- a/.github/workflows/test_eessi.yml
+++ b/.github/workflows/test_eessi.yml
@@ -12,10 +12,10 @@ jobs:
         EESSI_VERSION:
         - 2023.06
         EESSI_SOFTWARE_SUBDIR:
-        - aarch64/generic
+#        - aarch64/generic
         - x86_64/amd/zen2
         - x86_64/intel/broadwell
-        - x86_64/intel/cascadelake
+#        - x86_64/intel/cascadelake
         - x86_64/intel/skylake_avx512
         - x86_64/generic
         EASYSTACK_FILE:
diff --git a/eessi-2023.06-eb-4.8.1-system.yml b/eessi-2023.06-eb-4.8.1-system.yml
index fb3f7af4cb..7418c0a9ec 100644
--- a/eessi-2023.06-eb-4.8.1-system.yml
+++ b/eessi-2023.06-eb-4.8.1-system.yml
@@ -1,3 +1,6 @@
 easyconfigs:
   # wraps around Java/11.0.20
   - Java-11.eb
+  - EasyBuild-4.8.2.eb:
+      options:
+        from-pr: 19105