diff --git a/brian_dashboard_manager/dashboards/region_eap.json b/brian_dashboard_manager/dashboards/region_eap.json
index 3e2933c88e731ed86d620620fb28f97cbc320305..8897ba6bd2e33aab8e7a60f19bafd502f7b9b9fb 100644
--- a/brian_dashboard_manager/dashboards/region_eap.json
+++ b/brian_dashboard_manager/dashboards/region_eap.json
@@ -90,7 +90,6 @@
   "schemaVersion": 26,
   "style": "dark",
    "tags": [
-    "customers"
   ],
   "templating": {
     "list": []
@@ -114,6 +113,6 @@
     ]
   },
   "timezone": "",
-  "title": "EAP Dashboard",
+  "title": "EAP NRENs",
   "version": 1
 }
diff --git a/brian_dashboard_manager/templating/helpers.py b/brian_dashboard_manager/templating/helpers.py
index 01d1528aef000d486a659d66025ce6ada6084b2d..0996d0759668b302c5a4fd929f3b15ec761ad3b4 100644
--- a/brian_dashboard_manager/templating/helpers.py
+++ b/brian_dashboard_manager/templating/helpers.py
@@ -977,16 +977,19 @@ def get_dashboard_data(
     """
 
     with ProcessPoolExecutor(max_workers=NUM_PROCESSES) as executor:
-        for dash in executor.map(
-                partial(
-                    get_dashboard_data_single,
-                    datasource=datasource,
-                    tag=tag,
-                    panel_generator=panel_generator,
-                    errors=errors),
-                data.items()
-        ):
-            yield dash
+        try:
+            for dash in executor.map(
+                    partial(
+                        get_dashboard_data_single,
+                        datasource=datasource,
+                        tag=tag,
+                        panel_generator=panel_generator,
+                        errors=errors),
+                    data.items()
+            ):
+                yield dash
+        finally:
+            executor.shutdown(wait=False, cancel_futures=True)
 
 
 def create_aggregate_panel(title, gridpos, targets, datasource):
diff --git a/changelog.md b/changelog.md
index 055c2006b4c112c0a742db3fcc21ed222a35a59f..cb22e6b3c395541518176690b2ac21454afba01b 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.69] - 2024-11-04
+- Remove EAP dashboard from NREN access dropdown by removing customers tag
+- Ensure process executors are always shutdown in case of errors or when the with block is exited.
+
 ## [0.68] - 2024-10-31
 - Add in use of pkg_resources for old versions of python
 
diff --git a/setup.py b/setup.py
index a127575aa06aca1f758460e2dc0d1d008c3add14..762753b6ec4345406120e82fdf9a441f74a32a52 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='brian-dashboard-manager',
-    version="0.68",
+    version="0.69",
     author='GEANT',
     author_email='swd@geant.org',
     description='',