diff --git a/.changeset/few-windows-whisper.md b/.changeset/few-windows-whisper.md
new file mode 100644
index 0000000000..565e8798a1
--- /dev/null
+++ b/.changeset/few-windows-whisper.md
@@ -0,0 +1,8 @@
+---
+'@backstage/core-app-api': patch
+'@backstage/core-plugin-api': patch
+'@backstage/plugin-catalog': patch
+'@backstage/plugin-scaffolder': patch
+---
+
+Adding `FeatureFlag` component and treating `FeatureFlags` as first class citizens to composability API