diff --git a/.changeset/red-mangos-fly.md b/.changeset/red-mangos-fly.md
new file mode 100644
index 0000000000..73af978be2
--- /dev/null
+++ b/.changeset/red-mangos-fly.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-github-org': patch
+---
+
+Fixed an issue where the `catalog-backend-module-github-org` would not correctly create groups using `default` as namespace in case a single organization was configured.
diff --git a/.changeset/wild-cats-hug.md b/.changeset/wild-cats-hug.md
new file mode 100644
index 0000000000..180bf50747
--- /dev/null
+++ b/.changeset/wild-cats-hug.md
@@ -0,0 +1,7 @@
+---
+'@backstage/plugin-catalog-backend-module-github': patch
+---
+
+Added `defaultNamespace` option to `GithubMultiOrgEntityProvider`.
+
+If set to true, the provider will use `default` as the namespace for all group entities. Groups with the same name across different orgs will be considered the same group.