diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
index de1af9b71..0ed6475e2 100644
--- a/.github/workflows/container.yml
+++ b/.github/workflows/container.yml
@@ -66,7 +66,7 @@ jobs:
labels: |
org.opencontainers.image.authors=opensource@aiven.io
org.opencontainers.image.url=https://karapace.io
- org.opencontainers.image.documentation=https://github.com/aiven/karapace/
+ org.opencontainers.image.documentation=https://github.com/Aiven-Open/karapace/
org.opencontainers.image.vendor=Aiven
org.opencontainers.image.licenses=Apache-2.0
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c2aafcf1b..4437a06fb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -12,8 +12,8 @@ Contributions are very welcome on Karapace. When contributing please keep this i
There is very little you need to get started coding for Karapace:
-- Use [one of the supported python versions](https://github.com/aiven/karapace/blob/master/setup.py)
- documented in the `setup.py` classifiers.
+- Use [one of the supported python versions](https://github.com/Aiven-Open/karapace/blob/master/pyproject.toml)
+ documented in the `project:requires-python`.
- Create [a virtual environment](https://docs.python.org/3/tutorial/venv.html) and install the dev dependencies in it:
```python
@@ -74,7 +74,7 @@ The code is statically checked and formatted using [a few tools][requirements-de
To run these automatically on each commit please enable the [pre-commit](https://pre-commit.com)
hooks.
-[requirements-dev]: https://github.com/aiven/karapace/blob/master/requirements/requirements-dev.txt
+[requirements-dev]: https://github.com/Aiven-Open/karapace/blob/master/requirements/requirements-dev.txt
## Manual testing
@@ -89,7 +89,7 @@ karapace karapace.config.json
### Configuration
To see descriptions of configuration keys see our
-[README](https://github.com/aiven/karapace#configuration-keys).
+[README](https://github.com/Aiven-Open/karapace#configuration-keys).
Each configuration key can be overridden with an environment variable prefixed with `KARAPACE_`,
exception being configuration keys that actually start with the `karapace` string. For example, to
diff --git a/README.rst b/README.rst
index 4d8992d0d..adc5b0e8d 100644
--- a/README.rst
+++ b/README.rst
@@ -3,7 +3,7 @@ Karapace
``karapace``. Your Apache Kafka® essentials in one tool.
-An `open-source