diff --git a/README.md b/README.md
index 3f6a613..22881d1 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 
-[![Commit Activity](https://img.shields.io/github/commit-activity/m/Luftfartsverket/reqstool-python-poetry-plugin?label=commits&style=for-the-badge)](https://github.com/Luftfartsverket/reqstool-python-poetry-plugin/pulse)
-[![GitHub Issues](https://img.shields.io/github/issues/Luftfartsverket/reqstool-python-poetry-plugin?style=for-the-badge&logo=github)](https://github.com/Luftfartsverket/reqstool-python-poetry-plugin/issues)
-[![License](https://img.shields.io/github/license/Luftfartsverket/reqstool-python-poetry-plugin?style=for-the-badge&logo=opensourceinitiative)](https://opensource.org/license/mit/)
-[![Build](https://img.shields.io/github/actions/workflow/status/Luftfartsverket/reqstool-python-poetry-plugin/build.yml?style=for-the-badge&logo=github)](https://github.com/Luftfartsverket/reqstool-python-poetry-plugin/actions/workflows/build.yml)
-[![Static Badge](https://img.shields.io/badge/Documentation-blue?style=for-the-badge&link=docs)](https://luftfartsverket.github.io/reqstool-python-poetry-plugin/reqstool-python-poetry-plugin/0.0.2/index.html)
+[![Commit Activity](https://img.shields.io/github/commit-activity/m/reqstool/reqstool-python-poetry-plugin?label=commits&style=for-the-badge)](https://github.com/reqstool/reqstool-python-poetry-plugin/pulse)
+[![GitHub Issues](https://img.shields.io/github/issues/reqstool/reqstool-python-poetry-plugin?style=for-the-badge&logo=github)](https://github.com/reqstool/reqstool-python-poetry-plugin/issues)
+[![License](https://img.shields.io/github/license/reqstool/reqstool-python-poetry-plugin?style=for-the-badge&logo=opensourceinitiative)](https://opensource.org/license/mit/)
+[![Build](https://img.shields.io/github/actions/workflow/status/reqstool/reqstool-python-poetry-plugin/build.yml?style=for-the-badge&logo=github)](https://github.com/reqstool/reqstool-python-poetry-plugin/actions/workflows/build.yml)
+[![Static Badge](https://img.shields.io/badge/Documentation-blue?style=for-the-badge&link=docs)](https://reqstool.github.io/reqstool-python-poetry-plugin/reqstool-python-poetry-plugin/0.0.2/index.html)
 
 # Reqstool Python Poetry Plugin
 
diff --git a/docs/antora-playbook.yml b/docs/antora-playbook.yml
index a6e17cc..53e60f6 100644
--- a/docs/antora-playbook.yml
+++ b/docs/antora-playbook.yml
@@ -2,7 +2,7 @@
 
 site:
   title: Reqstool Python Poetry Plugin Documentation
-  url: https://github.com/luftfartsverket/reqstool-python-poetry-plugin
+  url: https://github.com/reqstool/reqstool-python-poetry-plugin
   start_page: reqstool-python-poetry-plugin::index.adoc
 
 content:
diff --git a/docs/reqstool/reqstool_config.yml b/docs/reqstool/reqstool_config.yml
index ae25e8f..d7c9a13 100644
--- a/docs/reqstool/reqstool_config.yml
+++ b/docs/reqstool/reqstool_config.yml
@@ -1,4 +1,4 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/Luftfartsverket/reqstool-client/main/src/reqstool/resources/schemas/v1/reqstool_config.schema.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/reqstool/reqstool-client/main/src/reqstool/resources/schemas/v1/reqstool_config.schema.json
 
 language: python
 build: poetry
diff --git a/docs/reqstool/requirements.yml b/docs/reqstool/requirements.yml
index b793023..e08a9d6 100644
--- a/docs/reqstool/requirements.yml
+++ b/docs/reqstool/requirements.yml
@@ -1,10 +1,10 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/Luftfartsverket/reqstool-client/main/src/reqstool/resources/schemas/v1/requirements.schema.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/reqstool/reqstool-client/main/src/reqstool/resources/schemas/v1/requirements.schema.json
 
 metadata:
   urn: reqstool-python-poetry-plugin
   variant: microservice
   title: Reqstool client
-  url: https://github.com/Luftfartsverket/reqstool-python-poetry-plugin
+  url: https://github.com/reqstool/reqstool-python-poetry-plugin
 
 requirements:
   - id: POETRY_PLUGIN_001
diff --git a/pyproject.toml b/pyproject.toml
index 8150d61..259c51b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,6 +3,7 @@ build-backend = "poetry_dynamic_versioning.backend"
 requires = ["poetry-core>=1.0.0", "poetry-dynamic-versioning>=1.0.0,<2.0.0"]
 
 [project]
+name = "reqstool-python-poetry-plugin"
 dynamic = ["version"]
 
 [tool.poetry]
@@ -12,9 +13,9 @@ description = "Reqstool Python Poetry Plugin"
 authors = ["reqstool"]
 license = "MIT License"
 readme = "README.md"
-repository = "https://github.com/Luftfartsverket/reqstool-python-poetry-plugin.git"
-homepage = "https://github.com/Luftfartsverket/reqstool-python-poetry-plugin.git"
-documentation = "https://github.com/Luftfartsverket/reqstool-python-poetry-plugin.git"
+repository = "https://github.com/reqstool/reqstool-python-poetry-plugin.git"
+homepage = "https://reqstool.github.io"
+documentation = "https://github.com/reqstool/reqstool-python-poetry-plugin.git"
 classifiers = [
     "License :: OSI Approved :: MIT License",
     "Programming Language :: Python :: 3",
diff --git a/src/reqstool_python_poetry_plugin/plugin.py b/src/reqstool_python_poetry_plugin/plugin.py
index 8ed96d8..c2b1d2c 100644
--- a/src/reqstool_python_poetry_plugin/plugin.py
+++ b/src/reqstool_python_poetry_plugin/plugin.py
@@ -31,7 +31,7 @@ class ReqstoolPlugin(Plugin):
 
     ARCHIVE_OUTPUT_DIR_TEST_RESULTS: str = "test_results"
 
-    YAML_LANGUAGE_SERVER = "# yaml-language-server: $schema=https://raw.githubusercontent.com/Luftfartsverket/reqstool-client/main/src/reqstool/resources/schemas/v1/reqstool_config.schema.json\n"  # noqa: E501
+    YAML_LANGUAGE_SERVER = "# yaml-language-server: $schema=https://raw.githubusercontent.com/reqstool/reqstool-client/main/src/reqstool/resources/schemas/v1/reqstool_config.schema.json\n"  # noqa: E501
 
     def activate(self, poetry: Poetry, cleo_io: IO) -> None:
         self._poetry = poetry