diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9de1ed3..4105b927 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.30.5] - 2024-10-15
+### Fixed
+- Fix per-bootset CFS setting
+
 ## [2.30.4] - 2024-10-15
 ### Added
 #### BOS option
diff --git a/src/bos/operators/session_setup.py b/src/bos/operators/session_setup.py
index fe59c9d1..6c7270fd 100644
--- a/src/bos/operators/session_setup.py
+++ b/src/bos/operators/session_setup.py
@@ -364,7 +364,7 @@ def _get_configuration_from_boot_set(self, boot_set: dict):
         """
         if not self.template.get('enable_cfs', True):
             return ''
-        bs_config = boot_set.get('configuration', '')
+        bs_config = boot_set.get('cfs', {}).get('configuration', '')
         if bs_config:
             return bs_config
         # Otherwise, we take the configuration value from the session template itself