diff --git a/Documentation/ContinuousIntegration.rst b/Documentation/ContinuousIntegration.rst
index 1bc5e73..c518e75 100644
--- a/Documentation/ContinuousIntegration.rst
+++ b/Documentation/ContinuousIntegration.rst
@@ -23,15 +23,15 @@ GitHub Actions
 ==============
 
 This extension has two code-checking workflows for
-`GitHub Actions <https://github.com/TYPO3-Documentation/tea/actions>`__:
+`GitHub Actions <https://github.com/FriendsOfTYPO3/tea/actions>`__:
 
-- `one that uses the local tools <https://github.com/TYPO3-Documentation/tea/blob/main/.github/workflows/ci.yml>`__:
+- `one that uses the local tools <https://github.com/FriendsOfTYPO3/tea/blob/main/.github/workflows/ci.yml>`__:
   This is the workflow you most probably would want to use:
   This workflow uses the development tools installed via Composer and PHIVE and
   calls them using the provided Composer scripts. Use this workflow if you want
   to run the code quality checks locally as well as in GitHub Actions.
 
-- `one that completely relies on predefined actions <https://github.com/TYPO3-Documentation/tea/blob/main/.github/workflows/predefined.yml>`__:
+- `one that completely relies on predefined actions <https://github.com/FriendsOfTYPO3/tea/blob/main/.github/workflows/predefined.yml>`__:
   This workflow does not need the development tools to be installed locally.
   Use this workflow if you only want to run the code quality checks in GitHub
   Actions, but not locally.
@@ -42,5 +42,5 @@ GitLab CI
 =========
 
 This extension also provides
-`configuration <https://github.com/TYPO3-Documentation/tea/blob/main/.gitlab/pipeline/.gitlab-ci.yml>`__
+`configuration <https://github.com/FriendsOfTYPO3/tea/blob/main/.gitlab/pipeline/.gitlab-ci.yml>`__
 for `GitLab CI <https://gitlab.typo3.org/qa/example-extension/-/pipelines>`__.
diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg
index cffc38a..ace7c24 100644
--- a/Documentation/Settings.cfg
+++ b/Documentation/Settings.cfg
@@ -17,8 +17,8 @@ github_branch        = main
 # Footer links
 project_home         = https://extensions.typo3.org/extension/tea
 project_contact      = mailto:typo3-coding@oliverklee.de
-project_repository   = https://github.com/TYPO3-Documentation/tea
-project_issues       = https://github.com/TYPO3-Documentation/tea/issues
+project_repository   = https://github.com/FriendsOfTYPO3/tea
+project_issues       = https://github.com/FriendsOfTYPO3/tea/issues
 project_discussions  =
 
 use_opensearch       =
diff --git a/README.md b/README.md
index ecde785..1aa8c43 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 [![TYPO3 V11](https://img.shields.io/badge/TYPO3-11-orange.svg)](https://get.typo3.org/version/11)
 [![License](https://img.shields.io/github/license/TYPO3-Documentation/tea)](https://packagist.org/packages/ttn/tea)
 [![Total downloads](https://poser.pugx.org/ttn/tea/downloads.svg)](https://packagist.org/packages/ttn/tea)
-[![GitHub CI status](https://github.com/TYPO3-Documentation/tea/workflows/CI/badge.svg?branch=main)](https://github.com/TYPO3-Documentation/tea/actions)
+[![GitHub CI status](https://github.com/FriendsOfTYPO3/tea/workflows/CI/badge.svg?branch=main)](https://github.com/FriendsOfTYPO3/tea/actions)
 [![GitLab CI status](https://gitlab.typo3.org/qa/example-extension/badges/main/pipeline.svg)](https://gitlab.typo3.org/qa/example-extension/-/pipelines)
 [![Coverage Status](https://coveralls.io/repos/github/TYPO3-Documentation/tea/badge.svg?branch=main)](https://coveralls.io/github/TYPO3-Documentation/tea?branch=main)
 
@@ -16,7 +16,7 @@ You can also use this extension to manage your collection of delicious teas.
 
 |                  | URL                                                |
 |------------------|----------------------------------------------------|
-| **Repository:**  | https://github.com/TYPO3-Documentation/tea         |
+| **Repository:**  | https://github.com/FriendsOfTYPO3/tea         |
 | **Read online:** | https://docs.typo3.org/p/ttn/tea/main/en-us/       |
 | **TER:**         | https://extensions.typo3.org/extension/tea/        |
 | **Slack:**       | https://typo3.slack.com/channels/qa-best-practices |
diff --git a/composer.json b/composer.json
index bdbde01..ff5137f 100644
--- a/composer.json
+++ b/composer.json
@@ -22,8 +22,8 @@
 	],
 	"homepage": "https://extensions.typo3.org/extension/tea/",
 	"support": {
-		"issues": "https://github.com/TYPO3-Documentation/tea/issues",
-		"source": "https://github.com/TYPO3-Documentation/tea",
+		"issues": "https://github.com/FriendsOfTYPO3/tea/issues",
+		"source": "https://github.com/FriendsOfTYPO3/tea",
 		"docs": "https://docs.typo3.org/p/ttn/tea/main/en-us/"
 	},
 	"require": {
diff --git a/package.json b/package.json
index aad0305..b88fc25 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
 	"name": "tea",
 	"description": "npm helper tools used for the extension",
 	"repository": {
-		"url": "https://github.com/TYPO3-Documentation/tea.git"
+		"url": "https://github.com/FriendsOfTYPO3/tea.git"
 	},
 	"keywords": [],
 	"author": "",