diff --git a/eb_hooks.py b/eb_hooks.py
index 488e53d929..a792a952eb 100644
--- a/eb_hooks.py
+++ b/eb_hooks.py
@@ -62,6 +62,20 @@ def parse_hook(ec, *args, **kwargs):
     if ec.name in PARSE_HOOKS:
         PARSE_HOOKS[ec.name](ec, eprefix)
 
+def post_ready_hook(self, *args, **kwargs):
+    """
+    Post-ready hook: limit parallellism for selected builds, because they require a lot of memory per used core.
+    """
+    # 'parallel' easyconfig parameter is set via EasyBlock.set_parallel in ready step based on available cores.
+    # here we reduce parallellism to only use half of that for selected software,
+    # to avoid failing builds/tests due to out-of-memory problems
+    if self.name in ['TensorFlow']:
+        parallel = self.cfg['parallel']
+        if parallel > 1:
+            self.cfg['parallel'] = parallel // 2
+            msg = "limiting parallelism to %s (was %s) for %s to avoid out-of-memory failures during building/testing"
+            print_msg(msg % (self.cfg['parallel'], parallel, self.name), log=self.log)
+
 
 def pre_prepare_hook(self, *args, **kwargs):
     """Main pre-prepare hook: trigger custom functions."""
diff --git a/eessi-2023.06-eb-4.8.1-2021b.yml b/eessi-2023.06-eb-4.8.1-2021b.yml
index 62f529563a..cd82791876 100644
--- a/eessi-2023.06-eb-4.8.1-2021b.yml
+++ b/eessi-2023.06-eb-4.8.1-2021b.yml
@@ -5,3 +5,6 @@ easyconfigs:
       options:
         from-pr: 18834
   - R-4.2.0-foss-2021b.eb
+  - TensorFlow-2.8.4-foss-2021b.eb
+      options:
+        include-easyblocks-from-pr: 3011