diff --git a/brian_dashboard_manager/config.py b/brian_dashboard_manager/config.py
index c94da1d81b20df68db32c7992752797a8a7cf332..03181e49b0cf156d96301b06c85e5871c4f559d5 100644
--- a/brian_dashboard_manager/config.py
+++ b/brian_dashboard_manager/config.py
@@ -51,7 +51,9 @@ DEFAULT_ORGANIZATIONS = [
             "Lab Devices"
         ],
         "excluded_folders": {
-            "Aggregates": ["CAE1"]
+            "Aggregates": ["CAE1"],
+            "GWS Direct": True,
+            "GWS Indirect": True,
         }
     },
     {
@@ -94,7 +96,10 @@ DEFAULT_ORGANIZATIONS = [
             "GÉANT VM",
             "Lab Devices",
         ],
-        "excluded_folders": {}
+        "excluded_folders": {
+            "GWS Direct": True,
+            "GWS Indirect": True,
+        }
     },
     {
         "name": "CAE1 - Asia",
diff --git a/changelog.md b/changelog.md
index e720b6e32219f4d086a41a1beb5958e624f9b0e3..130050e3043d8eeaab900ac05cd8dc1b4c8ddbd8 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,9 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.18] - 2021-08-23
+- Only provision GWS folders for GEANT Staff organization temporarily
+
 ## [0.17] - 2021-08-23
 - [POL1-482] to [POL1-484] - Moved dashboard grouping logic to inventory provider to make it easier to look up where interfaces should be in BRIAN.
 - [POL1-479] (follows from the above) add LAG and SRV_L3VPN to R&E Peers dashboard
diff --git a/setup.py b/setup.py
index 8576608c58d2465153ade4d778edfd809a578f5e..f4d7c5bed363b4ba09eecdd699160463d5bbf855 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='brian-dashboard-manager',
-    version="0.17",
+    version="0.18",
     author='GEANT',
     author_email='swd@geant.org',
     description='',