diff --git a/easystacks/riscv/2025.06-001/eessi-2025.06-eb-5.2.0-2025a.yml b/easystacks/riscv/2025.06-001/eessi-2025.06-eb-5.2.0-2025a.yml
new file mode 100644
index 00000000..7b01def1
--- /dev/null
+++ b/easystacks/riscv/2025.06-001/eessi-2025.06-eb-5.2.0-2025a.yml
@@ -0,0 +1,4 @@
+easyconfigs:
+  - SciPy-bundle-2025.06-gfbf-2025a.eb:
+      options:
+        from-commit: 8e1d2441eddbb331de92ae303a78c14db241572e
diff --git a/eb_hooks.py b/eb_hooks.py
index 2165e248..cd980a7c 100644
--- a/eb_hooks.py
+++ b/eb_hooks.py
@@ -41,6 +41,8 @@
 CPU_TARGET_SAPPHIRE_RAPIDS = 'x86_64/intel/sapphirerapids'
 CPU_TARGET_ZEN4 = 'x86_64/amd/zen4'
 
+CPU_TARGET_RISCV64_GENERIC = 'riscv64/generic'
+
 EESSI_RPATH_OVERRIDE_ATTR = 'orig_rpath_override_dirs'
 EESSI_MODULE_ONLY_ATTR = 'orig_module_only'
 EESSI_FORCE_ATTR = 'orig_force'
@@ -1940,4 +1942,9 @@ def set_maximum(parallel, max_value):
         CPU_TARGET_NEOVERSE_N1: (divide_by_factor, 2),
         CPU_TARGET_NEOVERSE_V1: (divide_by_factor, 2),
     },
+    # found problems with the number of opened files in the test phase with
+    # ulimit -n = 2048 and 4 cores
+    'SciPy-bundle': {
+        CPU_TARGET_RISCV64_GENERIC: (set_maximum, 1),
+    },
 }