diff --git a/easystacks/software.eessi.io/2023.06/grace/eessi-2023.06-eb-4.9.4-2023b.yml b/easystacks/software.eessi.io/2023.06/grace/eessi-2023.06-eb-4.9.4-2023b.yml
index ef02e35f7e..f81d506be0 100644
--- a/easystacks/software.eessi.io/2023.06/grace/eessi-2023.06-eb-4.9.4-2023b.yml
+++ b/easystacks/software.eessi.io/2023.06/grace/eessi-2023.06-eb-4.9.4-2023b.yml
@@ -11,3 +11,78 @@ easyconfigs:
 #        from-pr: 19940
   - OpenMPI-4.1.6-GCC-13.2.0.eb
   - foss-2023b.eb
+  - SciPy-bundle-2023.11-gfbf-2023b.eb
+# originally built with EB 4.9.0, PR was included since EB 4.9.1
+#  - netCDF-4.9.2-gompi-2023b.eb:
+#      options:
+#        from-pr: 19534
+  - netCDF-4.9.2-gompi-2023b.eb
+# originally built with EB 4.9.0, PR was included since EB 4.9.1
+#  - matplotlib-3.8.2-gfbf-2023b.eb:
+#      options:
+#        from-pr: 19552
+  - matplotlib-3.8.2-gfbf-2023b.eb
+  - Boost-1.83.0-GCC-13.2.0.eb:
+      options:
+        # source URLs for Boost have changed, corresponding PR is
+        # https://github.com/easybuilders/easybuild-easyconfigs/pull/22157
+        # Boost is a dependency of AOFlagger
+        from-commit: 5bebccf792ccf35a8ee3250bc8fed86dff5d5df9
+  - Boost.Python-1.83.0-GCC-13.2.0.eb:
+      options:
+        # source URLs for Boost.* have changed, corresponding PR is
+        # https://github.com/easybuilders/easybuild-easyconfigs/pull/22240
+        # Boost.Python is a dependency of AOFlagger
+        from-commit: e610fe1ac5393d1de668a466fdaaea74c580ee03
+  - wget-1.21.4-GCCcore-13.2.0.eb:
+      options:
+        # way to define source for wget has changed, corresponding PR is
+        # https://github.com/easybuilders/easybuild-easyconfigs/pull/22091
+        # wget is a dependency of AOFlagger
+        from-commit: 9487eb335902fae6c184f7ee03711fd6c09b1710
+# originally built with EB 4.9.0, PRs were included since EB 4.9.1
+#  - AOFlagger-3.4.0-foss-2023b.eb:
+#      options:
+#        from-pr: 19840
+#        include-easyblocks-from-pr: 3088
+  - AOFlagger-3.4.0-foss-2023b.eb
+# originally built with EB 4.9.0, PRs were included since EB 4.9.1, same as AOFlagger
+  - arpack-ng-3.9.0-foss-2023b.eb
+# originally built with EB 4.9.0, PRs were included since EB 4.9.1, same as AOFlagger
+  - Armadillo-12.8.0-foss-2023b.eb
+# originally built with EB 4.9.0, PRs were included since EB 4.9.1, same as AOFlagger
+  - casacore-3.5.0-foss-2023b.eb
+# originally built with EB 4.9.0, PRs were included since EB 4.9.1, same as AOFlagger
+  - IDG-1.2.0-foss-2023b.eb
+# originally built with EB 4.9.0, PRs were included since EB 4.9.1, same as AOFlagger
+  - EveryBeam-0.5.2-foss-2023b.eb
+# originally built with EB 4.9.0, PRs were included since EB 4.9.1, same as AOFlagger
+  - DP3-6.0-foss-2023b.eb
+# originally built with EB 4.9.0, PRs were included since EB 4.9.1, same as AOFlagger
+  - WSClean-3.4-foss-2023b.eb
+# originally built with EB 4.9.0, PR was included since EB 4.9.1
+#  - CDO-2.2.2-gompi-2023b.eb:
+#      options:
+#        from-pr: 19792
+  - CDO-2.2.2-gompi-2023b.eb
+# originally built with EB 4.9.0, PR was included since EB 4.9.1
+#  - python-casacore-3.5.2-foss-2023b.eb:
+#      options:
+#        from-pr: 20089
+  - python-casacore-3.5.2-foss-2023b.eb
+# originally built with EB 4.9.0, PR was included since EB 4.9.1
+#  - libspatialindex-1.9.3-GCCcore-13.2.0.eb:
+#      options:
+#        from-pr: 19922
+  - libspatialindex-1.9.3-GCCcore-13.2.0.eb
+  - LittleCMS-2.15-GCCcore-13.2.0.eb
+  - giflib-5.2.1-GCCcore-13.2.0.eb
+  - OpenJPEG-2.5.0-GCCcore-13.2.0.eb
+  - libwebp-1.3.2-GCCcore-13.2.0.eb
+  - Wayland-1.22.0-GCCcore-13.2.0.eb
+# originally built with EB 4.9.0, PR was included since EB 4.9.1
+#  - Qt5-5.15.13-GCCcore-13.2.0.eb:
+#      options:
+#        from-pr: 20201
+  - Qt5-5.15.13-GCCcore-13.2.0.eb
+  - OSU-Micro-Benchmarks-7.2-gompi-2023b.eb
diff --git a/eb_hooks.py b/eb_hooks.py
index e862af00d5..cfb70084ed 100644
--- a/eb_hooks.py
+++ b/eb_hooks.py
@@ -25,6 +25,7 @@
 CPU_TARGET_NEOVERSE_V1 = 'aarch64/neoverse_v1'
 CPU_TARGET_AARCH64_GENERIC = 'aarch64/generic'
 CPU_TARGET_A64FX = 'aarch64/a64fx'
+CPU_TARGET_NVIDIA_GRACE = 'aarch64/nvidia/grace'
 
 CPU_TARGET_SAPPHIRE_RAPIDS = 'x86_64/intel/sapphirerapids'
 CPU_TARGET_ZEN4 = 'x86_64/amd/zen4'
@@ -790,16 +791,23 @@ def pre_test_hook_ignore_failing_tests_SciPybundle(self, *args, **kwargs):
         FAILED scipy/spatial/tests/test_distance.py::TestPdist::test_pdist_correlation_iris
         FAILED scipy/spatial/tests/test_distance.py::TestPdist::test_pdist_correlation_iris_float32
         = 4 failed, 54407 passed, 3016 skipped, 223 xfailed, 13 xpassed, 10917 warnings in 6068.43s (1:41:08) =
+    In version 2023.11 on grace, 2 failing tests in scipy (version 1.11.4):
+        FAILED scipy/optimize/tests/test_linprog.py::TestLinprogIPSparse::test_bug_6139
+        FAILED scipy/optimize/tests/test_linprog.py::TestLinprogIPSparsePresolve::test_bug_6139
+        = 2 failed, 54876 passed, 3021 skipped, 223 xfailed, 13 xpassed in 581.85s (0:09:41) =
     (in previous versions we were not as strict yet on the numpy/SciPy tests)
     """
     cpu_target = get_eessi_envvar('EESSI_SOFTWARE_SUBDIR')
     scipy_bundle_versions_nv1 = ('2021.10', '2023.02', '2023.07', '2023.11')
     scipy_bundle_versions_a64fx = ('2023.07', '2023.11')
+    scipy_bundle_versions_nvidia_grace = ('2023.11')
     if self.name == 'SciPy-bundle':
         if cpu_target == CPU_TARGET_NEOVERSE_V1 and self.version in scipy_bundle_versions_nv1:
             self.cfg['testopts'] = "|| echo ignoring failing tests"
         elif cpu_target == CPU_TARGET_A64FX and self.version in scipy_bundle_versions_a64fx:
             self.cfg['testopts'] = "|| echo ignoring failing tests"
+        elif cpu_target == CPU_TARGET_NVIDIA_GRACE and self.version in scipy_bundle_versions_nvidia_grace:
+            self.cfg['testopts'] = "|| echo ignoring failing tests"
 
 
 def pre_test_hook_ignore_failing_tests_netCDF(self, *args, **kwargs):