diff --git a/docs/ci/hidden-jobs/workspace.rst b/docs/ci/hidden-jobs/workspace.rst
index 6918033c43ba1a05af1237645b9e81df11e601c0..0e61470a3e8224439175b1ac8b975ea5dbdb7549 100644
--- a/docs/ci/hidden-jobs/workspace.rst
+++ b/docs/ci/hidden-jobs/workspace.rst
@@ -57,7 +57,7 @@ CI_ONIRO_MANIFEST_URL
 The URL consumed by git-repo. You only want to change this if you forked the
 entire infrastructure and want to use it in private.
 
-The default value is ``https://booting.oniroproject.org/distro/oniro``.
+The default value is ``https://gitlab.eclipse.org/eclipse/oniro-core/oniro``.
 
 If you change the default value, please set ``CI_ONIRO_MANIFEST_MIRROR``
 as well.
diff --git a/docs/hardware-support/adding-hardware-support.rst b/docs/hardware-support/adding-hardware-support.rst
index 66b83c259f3c810a5606db0bcc739f5d6a1bbfa0..7844c1682aaf426696c618d89d3a54fdcecc482e 100644
--- a/docs/hardware-support/adding-hardware-support.rst
+++ b/docs/hardware-support/adding-hardware-support.rst
@@ -33,8 +33,10 @@ maintained support** in targeted kernels.
 Add Required meta-layers
 ************************
 
-Oniro flavours configuration templates (stored in `distro/oniro/flavours <https://booting.oniroproject.org/distro/oniro/-/tree/dunfell/flavours>`_
-directory) consist of the following files:
+Oniro flavours configuration templates (stored in the `flavours
+<https://gitlab.eclipse.org/eclipse/oniro-core/oniro/-/tree/kirkstone/flavours>`_
+`oniro <https://gitlab.eclipse.org/eclipse/oniro-core/oniro>`_ repository
+subdirectory) consist of the following files:
 
 .. list-table:: Configuration Files
    :header-rows: 1
@@ -51,7 +53,7 @@ directory) consist of the following files:
 
 |main_project_name| build system uses ***repo*** tool for cloning required meta-layers
 into appropriate build directory structure (see :ref:`Setting up a repo workspace <RepoWorkspace>`).
-To include a new layer, it has to be added in two places of the `oniro repository <https://booting.oniroproject.org/distro/oniro/-/tree/dunfell/manifests>`_:
+To include a new layer, it has to be added in two places of the `oniro repository <https://gitlab.eclipse.org/eclipse/oniro-core/oniro/-/tree/kirkstone/manifests>`_:
 
 - The manifest file
 - The flavours ``bblayers.conf.sample`` file
@@ -80,4 +82,4 @@ Create Merge Requests
 Create the Merge Request against the ***dunfell*** branch according to the
 Contributing Process for repositories:
 
-- `distro/oniro <https://booting.oniroproject.org/distro/oniro>`_
+- `eclipse/oniro-core/oniro <https://gitlab.eclipse.org/eclipse/oniro-core/oniro>`_
diff --git a/docs/oniro-quick-build.rst b/docs/oniro-quick-build.rst
index 58c266074681a4e5b98c1b0f66ccf1d8e57a9fca..3d107ef460cda985ecf0ec3283670cb6cb6765cf 100644
--- a/docs/oniro-quick-build.rst
+++ b/docs/oniro-quick-build.rst
@@ -52,7 +52,7 @@ Initialize a repo workspace and clone all required repositories:
 .. code-block:: console
 
     $ mkdir oniroproject; cd oniroproject
-    $ repo init -u https://booting.oniroproject.org/distro/oniro
+    $ repo init -u https://gitlab.eclipse.org/eclipse/oniro-core/oniro.git -b kirkstone
     $ repo sync --no-clone-bundle
 
 Building an Oniro image
diff --git a/docs/os/linux/partition-table.rst b/docs/os/linux/partition-table.rst
index 22b6ca9faa8d0471bedc4e00c4e50a30cca918de..40979ce80aff2c82af1fe5f950a9ddd12c5b6e45 100644
--- a/docs/os/linux/partition-table.rst
+++ b/docs/os/linux/partition-table.rst
@@ -11,8 +11,8 @@ Disk Partition Table
 Overview
 ********
 
-The OS defines the partitions included as part of the Linux-based distro as it
-follows:
+The OS defines the partitions included as part of the Linux-based distribution
+as it follows:
 
 * boot
 
diff --git a/docs/repo-workspace.rst b/docs/repo-workspace.rst
index 7a12c26a3a7dd8e06b47dad85bab1e6b268a4379..b7c2b7e41f9786dcff0b3859e3dea056ff7bd13d 100644
--- a/docs/repo-workspace.rst
+++ b/docs/repo-workspace.rst
@@ -92,7 +92,7 @@ repositories. If you're on OpenMandriva, simply ``dnf install repo``.
 The Manifests
 *************
 
-The ``repo manifest`` files are part of the main `oniro repository <https://booting.oniroproject.org/distro/oniro>`_
+The ``repo manifest`` files are part of the main `oniro repository <https://gitlab.eclipse.org/eclipse/oniro-core/oniro.git>`_
 and are to be used for configuring a workspace. The project provides a single
 ``default.xml`` manifest file in each of the active branches.
 
@@ -109,7 +109,7 @@ This will bring in all the needed sources for building |main_project_name|:
 .. code-block:: console
 
    $ mkdir oniroproject; cd oniroproject
-   $ repo init -u https://booting.oniroproject.org/distro/oniro
+   $ repo init -u https://gitlab.eclipse.org/eclipse/oniro-core/oniro.git -b kirkstone
    $ repo sync --no-clone-bundle
 
 Workspace Structure
diff --git a/docs/yocto-build-system/yocto-project.rst b/docs/yocto-build-system/yocto-project.rst
index 3ac32e6c2a8c54312d5073a5533b7b6a9cc73582..026029b39a6f28bcc0b3102b1fc80b515086a21d 100644
--- a/docs/yocto-build-system/yocto-project.rst
+++ b/docs/yocto-build-system/yocto-project.rst
@@ -35,7 +35,7 @@ for more information.
 --------------------------------
 
 |main_project_name| bases its build setup on OE-core and bitbake. The main hub
-of layers, is `oniro <https://booting.oniroproject.org/distro/oniro/>`_, a
+of layers, is `oniro <https://gitlab.eclipse.org/eclipse/oniro-core/oniro/>`_, a
 collection of layers with different scopes for defining the project's
 requirements and capabilities.
 
@@ -51,7 +51,7 @@ For more details of each provided layer of ``oniro``, see the relevant
 ``README.md`` file at the root of the layer.
 
 Besides the ``oniro`` collection of layers, the project is also the home
-to a set of other build system layers. Explore them all in our project `GitLab <https://booting.oniroproject.org/distro>`_
+to a set of other build system layers. Explore them all in our project `GitLab <https://gitlab.eclipse.org/eclipse/oniro-core/>`_
 instance.
 
 Additional Documentation
diff --git a/meta-oniro-core/README.md b/meta-oniro-core/README.md
index 863f276319269f53a0b166cae2e5e5c2b70cdc79..d35ca42d857cb3b997299f256b53454c193a8498 100644
--- a/meta-oniro-core/README.md
+++ b/meta-oniro-core/README.md
@@ -37,9 +37,10 @@ consideration.
 
 ## Merge requests
 
-All contributions are to be handled as merge requests in the
-[oniro Gitlab repository](https://booting.oniroproject.org/distro/oniro). For
-more information on the contributing process, check the `CONRIBUTING.md` file.
+All contributions are to be handled as merge requests to the
+[oniro Gitlab repository](https://gitlab.eclipse.org/eclipse/oniro-core/oniro.git).
+For more information on the contributing process, check the `CONRIBUTING.md`
+file.
 
 ## Maintainers
 
diff --git a/meta-oniro-staging/README.md b/meta-oniro-staging/README.md
index 36669fbac60f1036a6e688de1b14fde58a742974..ceee4a7106c778f6bc974885587be23dae041894 100644
--- a/meta-oniro-staging/README.md
+++ b/meta-oniro-staging/README.md
@@ -26,9 +26,10 @@ consideration.
 
 ## Merge requests
 
-All contributions are to be handled as merge requests in the
-[oniro Gitlab repository](https://booting.oniroproject.org/distro/oniro). For
-more information on the contributing process, check the `CONRIBUTING.md` file.
+All contributions are to be handled as merge requests to the
+[oniro Gitlab repository](https://gitlab.eclipse.org/eclipse/oniro-core/oniro.git).
+For more information on the contributing process, check the `CONRIBUTING.md`
+file.
 
 ## Maintainers