diff --git a/changelogs/unreleased-ee/.gitkeep b/ee/changelogs/unreleased/.gitkeep
similarity index 100%
rename from changelogs/unreleased-ee/.gitkeep
rename to ee/changelogs/unreleased/.gitkeep
diff --git a/changelogs/unreleased-ee/1830-integrate-file-locking-with-lfs-file-locking.yml b/ee/changelogs/unreleased/1830-integrate-file-locking-with-lfs-file-locking.yml
similarity index 100%
rename from changelogs/unreleased-ee/1830-integrate-file-locking-with-lfs-file-locking.yml
rename to ee/changelogs/unreleased/1830-integrate-file-locking-with-lfs-file-locking.yml
diff --git a/changelogs/unreleased-ee/20868-include-external-files-in-gitlab-ci-yml.yml b/ee/changelogs/unreleased/20868-include-external-files-in-gitlab-ci-yml.yml
similarity index 100%
rename from changelogs/unreleased-ee/20868-include-external-files-in-gitlab-ci-yml.yml
rename to ee/changelogs/unreleased/20868-include-external-files-in-gitlab-ci-yml.yml
diff --git a/changelogs/unreleased-ee/2534-developers-should-be-able-to-create-new-projects-in-group.yml b/ee/changelogs/unreleased/2534-developers-should-be-able-to-create-new-projects-in-group.yml
similarity index 100%
rename from changelogs/unreleased-ee/2534-developers-should-be-able-to-create-new-projects-in-group.yml
rename to ee/changelogs/unreleased/2534-developers-should-be-able-to-create-new-projects-in-group.yml
diff --git a/changelogs/unreleased-ee/2877-code-quality-requires-codequality-json-to-be-the-only-artifact-file-in-the-job.yml b/ee/changelogs/unreleased/2877-code-quality-requires-codequality-json-to-be-the-only-artifact-file-in-the-job.yml
similarity index 100%
rename from changelogs/unreleased-ee/2877-code-quality-requires-codequality-json-to-be-the-only-artifact-file-in-the-job.yml
rename to ee/changelogs/unreleased/2877-code-quality-requires-codequality-json-to-be-the-only-artifact-file-in-the-job.yml
diff --git a/changelogs/unreleased-ee/3225-require-license-for-member-lock-setting.yml b/ee/changelogs/unreleased/3225-require-license-for-member-lock-setting.yml
similarity index 100%
rename from changelogs/unreleased-ee/3225-require-license-for-member-lock-setting.yml
rename to ee/changelogs/unreleased/3225-require-license-for-member-lock-setting.yml
diff --git a/changelogs/unreleased-ee/3256-improve-replication-status-2.yml b/ee/changelogs/unreleased/3256-improve-replication-status-2.yml
similarity index 100%
rename from changelogs/unreleased-ee/3256-improve-replication-status-2.yml
rename to ee/changelogs/unreleased/3256-improve-replication-status-2.yml
diff --git a/changelogs/unreleased-ee/3256-improve-replication-status.yml b/ee/changelogs/unreleased/3256-improve-replication-status.yml
similarity index 100%
rename from changelogs/unreleased-ee/3256-improve-replication-status.yml
rename to ee/changelogs/unreleased/3256-improve-replication-status.yml
diff --git a/changelogs/unreleased-ee/3559-group-level-roadmap.yml b/ee/changelogs/unreleased/3559-group-level-roadmap.yml
similarity index 100%
rename from changelogs/unreleased-ee/3559-group-level-roadmap.yml
rename to ee/changelogs/unreleased/3559-group-level-roadmap.yml
diff --git a/changelogs/unreleased-ee/39118-dynamic-pipeline-variables-fe.yml b/ee/changelogs/unreleased/39118-dynamic-pipeline-variables-fe.yml
similarity index 100%
rename from changelogs/unreleased-ee/39118-dynamic-pipeline-variables-fe.yml
rename to ee/changelogs/unreleased/39118-dynamic-pipeline-variables-fe.yml
diff --git a/changelogs/unreleased-ee/3995-improve-sast.yml b/ee/changelogs/unreleased/3995-improve-sast.yml
similarity index 100%
rename from changelogs/unreleased-ee/3995-improve-sast.yml
rename to ee/changelogs/unreleased/3995-improve-sast.yml
diff --git a/changelogs/unreleased-ee/4032-add-filtered-search-epics.yml b/ee/changelogs/unreleased/4032-add-filtered-search-epics.yml
similarity index 100%
rename from changelogs/unreleased-ee/4032-add-filtered-search-epics.yml
rename to ee/changelogs/unreleased/4032-add-filtered-search-epics.yml
diff --git a/changelogs/unreleased-ee/4099-remote-removal-port-to-background-job.yml b/ee/changelogs/unreleased/4099-remote-removal-port-to-background-job.yml
similarity index 100%
rename from changelogs/unreleased-ee/4099-remote-removal-port-to-background-job.yml
rename to ee/changelogs/unreleased/4099-remote-removal-port-to-background-job.yml
diff --git a/changelogs/unreleased-ee/4101-sync-gitattributes-geo.yml b/ee/changelogs/unreleased/4101-sync-gitattributes-geo.yml
similarity index 100%
rename from changelogs/unreleased-ee/4101-sync-gitattributes-geo.yml
rename to ee/changelogs/unreleased/4101-sync-gitattributes-geo.yml
diff --git a/changelogs/unreleased-ee/4134-approve-additionally.yml b/ee/changelogs/unreleased/4134-approve-additionally.yml
similarity index 100%
rename from changelogs/unreleased-ee/4134-approve-additionally.yml
rename to ee/changelogs/unreleased/4134-approve-additionally.yml
diff --git a/changelogs/unreleased-ee/4163-move-uploads-to-object-storage-vsizov.yml b/ee/changelogs/unreleased/4163-move-uploads-to-object-storage-vsizov.yml
similarity index 100%
rename from changelogs/unreleased-ee/4163-move-uploads-to-object-storage-vsizov.yml
rename to ee/changelogs/unreleased/4163-move-uploads-to-object-storage-vsizov.yml
diff --git a/changelogs/unreleased-ee/4163-move-uploads-to-object-storage.yml b/ee/changelogs/unreleased/4163-move-uploads-to-object-storage.yml
similarity index 100%
rename from changelogs/unreleased-ee/4163-move-uploads-to-object-storage.yml
rename to ee/changelogs/unreleased/4163-move-uploads-to-object-storage.yml
diff --git a/changelogs/unreleased-ee/4253-dr-compliant-secrets.yml b/ee/changelogs/unreleased/4253-dr-compliant-secrets.yml
similarity index 100%
rename from changelogs/unreleased-ee/4253-dr-compliant-secrets.yml
rename to ee/changelogs/unreleased/4253-dr-compliant-secrets.yml
diff --git a/changelogs/unreleased-ee/4261-moving-issue-note.yml b/ee/changelogs/unreleased/4261-moving-issue-note.yml
similarity index 100%
rename from changelogs/unreleased-ee/4261-moving-issue-note.yml
rename to ee/changelogs/unreleased/4261-moving-issue-note.yml
diff --git a/changelogs/unreleased-ee/4289-add-epic-issue-board-sidebar.yml b/ee/changelogs/unreleased/4289-add-epic-issue-board-sidebar.yml
similarity index 100%
rename from changelogs/unreleased-ee/4289-add-epic-issue-board-sidebar.yml
rename to ee/changelogs/unreleased/4289-add-epic-issue-board-sidebar.yml
diff --git a/changelogs/unreleased-ee/4297-fdw-status.yml b/ee/changelogs/unreleased/4297-fdw-status.yml
similarity index 100%
rename from changelogs/unreleased-ee/4297-fdw-status.yml
rename to ee/changelogs/unreleased/4297-fdw-status.yml
diff --git a/changelogs/unreleased-ee/4310-security-reports.yml b/ee/changelogs/unreleased/4310-security-reports.yml
similarity index 100%
rename from changelogs/unreleased-ee/4310-security-reports.yml
rename to ee/changelogs/unreleased/4310-security-reports.yml
diff --git a/changelogs/unreleased-ee/4332-unapproved-check.yml b/ee/changelogs/unreleased/4332-unapproved-check.yml
similarity index 100%
rename from changelogs/unreleased-ee/4332-unapproved-check.yml
rename to ee/changelogs/unreleased/4332-unapproved-check.yml
diff --git a/changelogs/unreleased-ee/4395-geo-disaster-recovery.yml b/ee/changelogs/unreleased/4395-geo-disaster-recovery.yml
similarity index 100%
rename from changelogs/unreleased-ee/4395-geo-disaster-recovery.yml
rename to ee/changelogs/unreleased/4395-geo-disaster-recovery.yml
diff --git a/changelogs/unreleased-ee/4398-reuse-primary-host-key-on-secondaries.yml b/ee/changelogs/unreleased/4398-reuse-primary-host-key-on-secondaries.yml
similarity index 100%
rename from changelogs/unreleased-ee/4398-reuse-primary-host-key-on-secondaries.yml
rename to ee/changelogs/unreleased/4398-reuse-primary-host-key-on-secondaries.yml
diff --git a/changelogs/unreleased-ee/4411-geo-node-status-rake-task.yml b/ee/changelogs/unreleased/4411-geo-node-status-rake-task.yml
similarity index 100%
rename from changelogs/unreleased-ee/4411-geo-node-status-rake-task.yml
rename to ee/changelogs/unreleased/4411-geo-node-status-rake-task.yml
diff --git a/changelogs/unreleased-ee/4417-dr-turn-off-primary.yml b/ee/changelogs/unreleased/4417-dr-turn-off-primary.yml
similarity index 100%
rename from changelogs/unreleased-ee/4417-dr-turn-off-primary.yml
rename to ee/changelogs/unreleased/4417-dr-turn-off-primary.yml
diff --git a/changelogs/unreleased-ee/4497-geo-reuse-log-level.yml b/ee/changelogs/unreleased/4497-geo-reuse-log-level.yml
similarity index 100%
rename from changelogs/unreleased-ee/4497-geo-reuse-log-level.yml
rename to ee/changelogs/unreleased/4497-geo-reuse-log-level.yml
diff --git a/changelogs/unreleased-ee/4510-fix-membership-lock-progagate-from-parent.yml b/ee/changelogs/unreleased/4510-fix-membership-lock-progagate-from-parent.yml
similarity index 100%
rename from changelogs/unreleased-ee/4510-fix-membership-lock-progagate-from-parent.yml
rename to ee/changelogs/unreleased/4510-fix-membership-lock-progagate-from-parent.yml
diff --git a/changelogs/unreleased-ee/4547-measure-multi-file-editor-usage-on-gitlab-com.yml b/ee/changelogs/unreleased/4547-measure-multi-file-editor-usage-on-gitlab-com.yml
similarity index 100%
rename from changelogs/unreleased-ee/4547-measure-multi-file-editor-usage-on-gitlab-com.yml
rename to ee/changelogs/unreleased/4547-measure-multi-file-editor-usage-on-gitlab-com.yml
diff --git a/changelogs/unreleased-ee/4614-fix-trial-license-expiration-duration.yml b/ee/changelogs/unreleased/4614-fix-trial-license-expiration-duration.yml
similarity index 100%
rename from changelogs/unreleased-ee/4614-fix-trial-license-expiration-duration.yml
rename to ee/changelogs/unreleased/4614-fix-trial-license-expiration-duration.yml
diff --git a/changelogs/unreleased-ee/4616-fix-sidebar-toggle-position.yml b/ee/changelogs/unreleased/4616-fix-sidebar-toggle-position.yml
similarity index 100%
rename from changelogs/unreleased-ee/4616-fix-sidebar-toggle-position.yml
rename to ee/changelogs/unreleased/4616-fix-sidebar-toggle-position.yml
diff --git a/changelogs/unreleased-ee/4644-geo-selective-sync-by-shard.yml b/ee/changelogs/unreleased/4644-geo-selective-sync-by-shard.yml
similarity index 100%
rename from changelogs/unreleased-ee/4644-geo-selective-sync-by-shard.yml
rename to ee/changelogs/unreleased/4644-geo-selective-sync-by-shard.yml
diff --git a/changelogs/unreleased-ee/4707-improve-geo-geo-disaster-recovery-docs-for-systems-with-multiple-secondaries.yml b/ee/changelogs/unreleased/4707-improve-geo-geo-disaster-recovery-docs-for-systems-with-multiple-secondaries.yml
similarity index 100%
rename from changelogs/unreleased-ee/4707-improve-geo-geo-disaster-recovery-docs-for-systems-with-multiple-secondaries.yml
rename to ee/changelogs/unreleased/4707-improve-geo-geo-disaster-recovery-docs-for-systems-with-multiple-secondaries.yml
diff --git a/changelogs/unreleased-ee/4732-epics-api-searching-sorting.yml b/ee/changelogs/unreleased/4732-epics-api-searching-sorting.yml
similarity index 100%
rename from changelogs/unreleased-ee/4732-epics-api-searching-sorting.yml
rename to ee/changelogs/unreleased/4732-epics-api-searching-sorting.yml
diff --git a/changelogs/unreleased-ee/4773-replication-slots-max-retained-wal-bytes-too-small.yml b/ee/changelogs/unreleased/4773-replication-slots-max-retained-wal-bytes-too-small.yml
similarity index 100%
rename from changelogs/unreleased-ee/4773-replication-slots-max-retained-wal-bytes-too-small.yml
rename to ee/changelogs/unreleased/4773-replication-slots-max-retained-wal-bytes-too-small.yml
diff --git a/changelogs/unreleased-ee/4782-fix-geo-node-status-version-and-revision.yml b/ee/changelogs/unreleased/4782-fix-geo-node-status-version-and-revision.yml
similarity index 100%
rename from changelogs/unreleased-ee/4782-fix-geo-node-status-version-and-revision.yml
rename to ee/changelogs/unreleased/4782-fix-geo-node-status-version-and-revision.yml
diff --git a/changelogs/unreleased-ee/4915-background-upload-option-is-not-effective.yml b/ee/changelogs/unreleased/4915-background-upload-option-is-not-effective.yml
similarity index 100%
rename from changelogs/unreleased-ee/4915-background-upload-option-is-not-effective.yml
rename to ee/changelogs/unreleased/4915-background-upload-option-is-not-effective.yml
diff --git a/changelogs/unreleased-ee/4920-count-of-users-by-role-in-admin.yml b/ee/changelogs/unreleased/4920-count-of-users-by-role-in-admin.yml
similarity index 100%
rename from changelogs/unreleased-ee/4920-count-of-users-by-role-in-admin.yml
rename to ee/changelogs/unreleased/4920-count-of-users-by-role-in-admin.yml
diff --git a/changelogs/unreleased-ee/4944-dast-modal.yml b/ee/changelogs/unreleased/4944-dast-modal.yml
similarity index 100%
rename from changelogs/unreleased-ee/4944-dast-modal.yml
rename to ee/changelogs/unreleased/4944-dast-modal.yml
diff --git a/changelogs/unreleased-ee/4961-sast-text.yml b/ee/changelogs/unreleased/4961-sast-text.yml
similarity index 100%
rename from changelogs/unreleased-ee/4961-sast-text.yml
rename to ee/changelogs/unreleased/4961-sast-text.yml
diff --git a/changelogs/unreleased-ee/add-support-metrics-smaller.yml b/ee/changelogs/unreleased/add-support-metrics-smaller.yml
similarity index 100%
rename from changelogs/unreleased-ee/add-support-metrics-smaller.yml
rename to ee/changelogs/unreleased/add-support-metrics-smaller.yml
diff --git a/changelogs/unreleased-ee/da-fix-duplicated-message-geo-update-primary-node-url.yml b/ee/changelogs/unreleased/da-fix-duplicated-message-geo-update-primary-node-url.yml
similarity index 100%
rename from changelogs/unreleased-ee/da-fix-duplicated-message-geo-update-primary-node-url.yml
rename to ee/changelogs/unreleased/da-fix-duplicated-message-geo-update-primary-node-url.yml
diff --git a/changelogs/unreleased-ee/da-fix-rake-geo-db-seed.yml b/ee/changelogs/unreleased/da-fix-rake-geo-db-seed.yml
similarity index 100%
rename from changelogs/unreleased-ee/da-fix-rake-geo-db-seed.yml
rename to ee/changelogs/unreleased/da-fix-rake-geo-db-seed.yml
diff --git a/changelogs/unreleased-ee/dm-push-rule-regexp-error.yml b/ee/changelogs/unreleased/dm-push-rule-regexp-error.yml
similarity index 100%
rename from changelogs/unreleased-ee/dm-push-rule-regexp-error.yml
rename to ee/changelogs/unreleased/dm-push-rule-regexp-error.yml
diff --git a/changelogs/unreleased-ee/docker_registry_geo.yml b/ee/changelogs/unreleased/docker_registry_geo.yml
similarity index 100%
rename from changelogs/unreleased-ee/docker_registry_geo.yml
rename to ee/changelogs/unreleased/docker_registry_geo.yml
diff --git a/changelogs/unreleased-ee/ee-subepics.yml b/ee/changelogs/unreleased/ee-subepics.yml
similarity index 100%
rename from changelogs/unreleased-ee/ee-subepics.yml
rename to ee/changelogs/unreleased/ee-subepics.yml
diff --git a/changelogs/unreleased-ee/fix-show-sidebar-sub-level-items-for-billing.yml b/ee/changelogs/unreleased/fix-show-sidebar-sub-level-items-for-billing.yml
similarity index 100%
rename from changelogs/unreleased-ee/fix-show-sidebar-sub-level-items-for-billing.yml
rename to ee/changelogs/unreleased/fix-show-sidebar-sub-level-items-for-billing.yml
diff --git a/changelogs/unreleased-ee/fix-validation-of-environment-scope-for-variables.yml b/ee/changelogs/unreleased/fix-validation-of-environment-scope-for-variables.yml
similarity index 100%
rename from changelogs/unreleased-ee/fix-validation-of-environment-scope-for-variables.yml
rename to ee/changelogs/unreleased/fix-validation-of-environment-scope-for-variables.yml
diff --git a/changelogs/unreleased-ee/move-epic-issue.yml b/ee/changelogs/unreleased/move-epic-issue.yml
similarity index 100%
rename from changelogs/unreleased-ee/move-epic-issue.yml
rename to ee/changelogs/unreleased/move-epic-issue.yml
diff --git a/changelogs/unreleased-ee/sh-bump-jwt-timeout.yml b/ee/changelogs/unreleased/sh-bump-jwt-timeout.yml
similarity index 100%
rename from changelogs/unreleased-ee/sh-bump-jwt-timeout.yml
rename to ee/changelogs/unreleased/sh-bump-jwt-timeout.yml
diff --git a/changelogs/unreleased-ee/sh-fix-nplus-one-groups-api.yml b/ee/changelogs/unreleased/sh-fix-nplus-one-groups-api.yml
similarity index 100%
rename from changelogs/unreleased-ee/sh-fix-nplus-one-groups-api.yml
rename to ee/changelogs/unreleased/sh-fix-nplus-one-groups-api.yml
diff --git a/changelogs/unreleased-ee/sh-gitaly-check-for-healthy-shards.yml b/ee/changelogs/unreleased/sh-gitaly-check-for-healthy-shards.yml
similarity index 100%
rename from changelogs/unreleased-ee/sh-gitaly-check-for-healthy-shards.yml
rename to ee/changelogs/unreleased/sh-gitaly-check-for-healthy-shards.yml
diff --git a/changelogs/unreleased-ee/sh-strong-memoize-validate-path-locks.yml b/ee/changelogs/unreleased/sh-strong-memoize-validate-path-locks.yml
similarity index 100%
rename from changelogs/unreleased-ee/sh-strong-memoize-validate-path-locks.yml
rename to ee/changelogs/unreleased/sh-strong-memoize-validate-path-locks.yml
diff --git a/changelogs/unreleased-ee/tc-geo-cursor-prometheus.yml b/ee/changelogs/unreleased/tc-geo-cursor-prometheus.yml
similarity index 100%
rename from changelogs/unreleased-ee/tc-geo-cursor-prometheus.yml
rename to ee/changelogs/unreleased/tc-geo-cursor-prometheus.yml
diff --git a/changelogs/unreleased-ee/tc-geo-nodes-more-api.yml b/ee/changelogs/unreleased/tc-geo-nodes-more-api.yml
similarity index 100%
rename from changelogs/unreleased-ee/tc-geo-nodes-more-api.yml
rename to ee/changelogs/unreleased/tc-geo-nodes-more-api.yml
diff --git a/changelogs/unreleased-ee/upload-migration-task.yml b/ee/changelogs/unreleased/upload-migration-task.yml
similarity index 100%
rename from changelogs/unreleased-ee/upload-migration-task.yml
rename to ee/changelogs/unreleased/upload-migration-task.yml
diff --git a/changelogs/unreleased-ee/use-send-url-for-incompatible-runners.yml b/ee/changelogs/unreleased/use-send-url-for-incompatible-runners.yml
similarity index 100%
rename from changelogs/unreleased-ee/use-send-url-for-incompatible-runners.yml
rename to ee/changelogs/unreleased/use-send-url-for-incompatible-runners.yml