diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6a3077a1f162c16ab41556b0d27f1a62c04922c4..45bc1df5f23b67c3c7c442562aff3648a3fb7885 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -64,7 +64,7 @@ mr-settings:
   before_script:
     - *global_before_scripts
     - "apk -q add python3"
-    - "wget -q 'https://gitlab.com/postmarketOS/ci-common/-/raw/master/check_mr_settings.py'"
+    - "wget -q 'https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/check_mr_settings.py'"
   script:
     - "python3 ./check_mr_settings.py"
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 08ea1a17423f773eb7ccd98c7bc1c58a3f6eec5f..f54d4b375f709465c7a0d1fa5d7f58549b820e4d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -41,7 +41,7 @@ This is a reST style.
 #### The `args` variable
 This contains the arguments passed to pmbootstrap, and some additional data.
 See `pmb/helpers/args.py` for details. This is a legacy construct, see
-[#1879](https://gitlab.com/postmarketOS/pmbootstrap/-/issues/1879).
+[#1879](https://gitlab.postmarketos.org/postmarketOS/pmbootstrap/-/issues/1879).
 
 #### Executing commands
 Use one of the following functions instead of Python's built-in `subprocess`:
diff --git a/README.md b/README.md
index 03fd681e58529b0bb9a36de5fd74f84536b143de..2c857afc1b19f6529e041dc607f6165ee87f6850 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ $ pytest -vv ./test/test_keys.py
 ## Issues
 
 Issues are being tracked
-[here](https://gitlab.com/postmarketOS/pmbootstrap/-/issues).
+[here](https://gitlab.postmarketos.org/postmarketOS/pmbootstrap/-/issues).
 
 ## Requirements
 * Linux distribution on the host system (`x86`, `x86_64`, `aarch64` or `armv7`)
@@ -42,7 +42,7 @@ Issues are being tracked
     does **not** work! Please use [VirtualBox](https://www.virtualbox.org/) instead.
   * [Linux kernel 3.17 or higher](https://postmarketos.org/oldkernel)
   * Note: kernel versions between 5.8.8 and 6.0 might 
-    [have issues with parted](https://gitlab.com/postmarketOS/pmbootstrap/-/issues/2309).
+    [have issues with parted](https://gitlab.postmarketos.org/postmarketOS/pmbootstrap/-/issues/2309).
 * Python 3.10+
 * For python3 < 3.11: tomli
 * OpenSSL
@@ -52,7 +52,7 @@ Issues are being tracked
 
 ## Relation to pmaports
 For pmbootstrap to be useful, it needs to maintain a local copy of the
-[pmaports](https://gitlab.com/postmarketOS/pmaports) repository where
+[pmaports](https://gitlab.postmarketos.org/postmarketOS/pmaports) repository where
 postmarketOS-specific packages are maintained. This is set up automatically, but
 the local copy of pmaports does not automatically get updated. To update it, you
 can run `$ pmbootstrap pull`.
@@ -117,7 +117,7 @@ $ pmbootstrap checksum hello-world
 
 Generate a template for a new package:
 ```
-$ pmbootstrap newapkbuild "https://gitlab.com/postmarketOS/tinydm/-/archive/1.2.0/tinydm-1.2.0.tar.gz"
+$ pmbootstrap newapkbuild "https://gitlab.postmarketos.org/postmarketOS/tinydm/-/archive/1.2.0/tinydm-1.2.0.tar.gz"
 ```
 
 #### Default architecture
diff --git a/docs/index.rst b/docs/index.rst
index 1ea5263b150d7858efd1be959a0b96b5bc768633..1f0dc3dec8c88481e5df29d9f4c8327c0f6164d3 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -34,6 +34,6 @@ Indices and tables
 *Note:* This documentation is currently a work-in-progress, your feedback and contributions are very welcome!
 
 .. _postmarketOS-wiki: https://wiki.postmarketos.org/wiki/Main_Page
-.. _issue-tracker: https://gitlab.com/postmarketOS/pmbootstrap/-/issues
-.. _repository: https://gitlab.com/postmarketOS/pmbootstrap/
+.. _issue-tracker: https://gitlab.postmarketos.org/postmarketOS/pmbootstrap/-/issues
+.. _repository: https://gitlab.postmarketos.org/postmarketOS/pmbootstrap/
 .. _Installation: https://wiki.postmarketos.org/wiki/Installation
diff --git a/docs/installation.rst b/docs/installation.rst
index f4a6779ff3ed8b065b546392b78525610c9140b5..fd2ff07f68e3a1dff61bf1aa2ec4b10a56417a46 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -40,7 +40,7 @@ Follow this section if your Linux distribution doesn't have pmbootstrap packaged
 
 .. code-block::
    
-   $ git clone --depth=1 https://gitlab.com/postmarketOS/pmbootstrap.git
+   $ git clone --depth=1 https://gitlab.postmarketos.org/postmarketOS/pmbootstrap.git
    $ mkdir -p ~/.local/bin
    $ ln -s "$PWD/pmbootstrap/pmbootstrap.py" ~/.local/bin/pmbootstrap
    $ pmbootstrap --version
diff --git a/pmb/__init__.py b/pmb/__init__.py
index 9d237d3f1f0f1f56689ecf663f90e93dc5fa8c31..4c93efa39d2aa1583fd57f98e084dfbb1808b1fe 100644
--- a/pmb/__init__.py
+++ b/pmb/__init__.py
@@ -141,7 +141,9 @@ def main() -> int:
         print_log_hint()
         print()
         print("Before you report this error, ensure that pmbootstrap is " "up to date.")
-        print("Find the latest version here:" " https://gitlab.com/postmarketOS/pmbootstrap/-/tags")
+        print(
+            "Find the latest version here: https://gitlab.postmarketos.org/postmarketOS/pmbootstrap/-/tags"
+        )
         print(f"Your version: {__version__}")
         return 1
 
diff --git a/pmb/data/kconfigcheck.toml b/pmb/data/kconfigcheck.toml
index 9e2cd7790df75fa86d5213bc57a217202003dfe6..cd722b7de24e9b6bbbc3cd3fea3fa4bb60350354 100644
--- a/pmb/data/kconfigcheck.toml
+++ b/pmb/data/kconfigcheck.toml
@@ -300,7 +300,7 @@ UCLAMP_TASK = true  # Scheduler hints
 UCLAMP_TASK_GROUP = true  # Scheduler hints
 UHID = true  # e.g. Bluetooth input devices
 USB_STORAGE = true  # USB mass storage devices
-RT_GROUP_SCHED = false  # https://gitlab.com/postmarketOS/pmaports/-/issues/2652
+RT_GROUP_SCHED = false  # https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/2652
 
 # uefi: proper modern booting
 ["category:uefi".">=0.0.0"."all"]
diff --git a/pmb/flasher/variables.py b/pmb/flasher/variables.py
index 1dca15e5eb4b982be62d4b2cc2608da7cc03a718..338032d0988cbf986cad3a21a2512781f4955c8b 100644
--- a/pmb/flasher/variables.py
+++ b/pmb/flasher/variables.py
@@ -17,7 +17,7 @@ def variables(args: PmbArgs, flavor: str, method: str):
 
     # TODO Remove _partition_system deviceinfo support once pmaports has been
     # updated and minimum pmbootstrap version bumped.
-    # See also https://gitlab.com/postmarketOS/pmbootstrap/-/issues/2243
+    # See also https://gitlab.postmarketos.org/postmarketOS/pmbootstrap/-/issues/2243
 
     _partition_kernel: str | None
     _partition_rootfs: str | None
diff --git a/pmb/helpers/frontend.py b/pmb/helpers/frontend.py
index 3ca989b08df5e6bec09bafb2d1140f46cbff8165..b234541ce47e1ee6d3f05a3775b25eb762635e1a 100644
--- a/pmb/helpers/frontend.py
+++ b/pmb/helpers/frontend.py
@@ -201,7 +201,7 @@ def chroot(args: PmbArgs) -> None:
             "--install-blockdev is deprecated for the chroot command"
             " and will be removed in a future release. If you need this"
             " for some reason, please open an issue on"
-            " https://gitlab.com/postmarketOS/pmbootstrap.git"
+            " https://gitlab.postmarketos.org/postmarketOS/pmbootstrap.git"
         )
         size_boot = 128  # 128 MiB
         size_root = 4096  # 4 GiB