diff --git a/CHANGELOG-1.0.md b/CHANGELOG-1.0.md
index 1fc5e0b762..0c6a72071e 100644
--- a/CHANGELOG-1.0.md
+++ b/CHANGELOG-1.0.md
@@ -1,5 +1,11 @@
 # Changelog 1.0
 
+## [1.0.6] 2022-xx-xx
+
+### Fixed
+
+- [#3189](https://github.com/epiphany-platform/epiphany/issues/3189) - Fix configuration/feature-mapping enabling
+
 ## [1.0.5] 2022-06-24
 
 ### Fixed
diff --git a/core/src/epicli/cli/engine/ansible/AnsibleInventoryCreator.py b/core/src/epicli/cli/engine/ansible/AnsibleInventoryCreator.py
index b20038ded2..40afafb3d8 100644
--- a/core/src/epicli/cli/engine/ansible/AnsibleInventoryCreator.py
+++ b/core/src/epicli/cli/engine/ansible/AnsibleInventoryCreator.py
@@ -43,7 +43,9 @@ def get_inventory(self):
 
     def get_roles_for_feature(self, component_key):
         features_map = select_single(self.config_docs, lambda x: x.kind == 'configuration/feature-mapping')
-        return features_map.specification.roles_mapping[component_key]
+        feature_roles = features_map.specification.roles_mapping[component_key]
+        enabled_roles = self.get_enabled_roles()
+        return [role for role in feature_roles if role in enabled_roles]
 
     def get_available_roles(self):
         features_map = select_single(self.config_docs, lambda x: x.kind == 'configuration/feature-mapping')