diff --git a/kdb-bot/src/bot/config b/kdb-bot/src/bot/config
index 9262f4f8..28bd879d 160000
--- a/kdb-bot/src/bot/config
+++ b/kdb-bot/src/bot/config
@@ -1 +1 @@
-Subproject commit 9262f4f88f68f8461cfbc0a5ef3f4d89edf78c7b
+Subproject commit 28bd879dab2e5ea6ca8bb38e44c7786eb67cb7a2
diff --git a/kdb-bot/src/bot/startup_settings_extension.py b/kdb-bot/src/bot/startup_settings_extension.py
index 655ccd7b..71896c69 100644
--- a/kdb-bot/src/bot/startup_settings_extension.py
+++ b/kdb-bot/src/bot/startup_settings_extension.py
@@ -31,6 +31,8 @@ class StartupSettingsExtension(StartupExtensionABC):
         configuration.add_json_file(f'config/appsettings.{environment.host_name}.json', optional=True)
         # load feature-flags
         configuration.add_json_file(f'config/feature-flags.json', optional=False)
+        configuration.add_json_file(f'config/feature-flags.{environment.environment_name}.json', optional=True)
+        configuration.add_json_file(f'config/feature-flags.{environment.host_name}.json', optional=True)
 
         configuration.add_configuration('Startup_StartTime', str(self._start_time))
         self._configure_settings_with_sub_settings(configuration, BotSettings, lambda x: x.servers, lambda x: x.id)