diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml
index 00eae3cf5bbc37611669b8233ab3bc0ecd2819a1..684d4e5672caeaaf330b9c4f147f9c44ad373882 100644
--- a/.github/workflows/build-container.yml
+++ b/.github/workflows/build-container.yml
@@ -12,7 +12,7 @@ jobs:
     env:
       DOCKER_REPO: inspircd/inspircd-docker
       GITHUB_BRANCH: master
-      GITHUB_REPO: inspircd/inspircd-docker
+      GITHUB_REPO: inspircd/docker
       INSP_VERSION: v3.17.1
     steps:
       -
diff --git a/README.md b/README.md
index 52f8089e7ca80031dc47d03a3d75448e16e9ec52..a515008c3a693a8a2a0d28c36d1a6461397cd387 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ The easiest way to run this image is using our bootstrap script.
 To use it run the following statement:
 
 ```console
-wget -qO- https://raw.githubusercontent.com/inspircd/inspircd-docker/master/bootstrap.sh | sh
+wget -qO- https://raw.githubusercontent.com/inspircd/docker/master/bootstrap.sh | sh
 ```
 
 The bootstrap script takes care of the fact that docker is installed and runs the image.
@@ -326,9 +326,9 @@ We provide information about features we remove in future.
 
 We document changes that possibly broken your setup and are no longer supported. Hopefully, we can provide useful information for debugging.
 
-* [`046bb02`](https://github.com/inspircd/inspircd-docker/commit/046bb028a700755ee9669b20c02057a947e2fe34) Update to InspIRCd 3.0 requires some config changes. If you run InspIRCd using docker-compose or by mounting a volume, make sure you update your config according to the [docs page](https://docs.inspircd.org/3/configuration-changes/).
+* [`046bb02`](https://github.com/inspircd/docker/commit/046bb028a700755ee9669b20c02057a947e2fe34) Update to InspIRCd 3.0 requires some config changes. If you run InspIRCd using docker-compose or by mounting a volume, make sure you update your config according to the [docs page](https://docs.inspircd.org/3/configuration-changes/).
 
-* [`cdba94f`](https://github.com/inspircd/inspircd-docker/commit/cdba94f6ae0c71ad37b3a88114a14ecb0c5177c1) `ADDPACKAGES` and `DELPACKAGES` are replaced by `BUILD_DEPENDENCIES` and `RUN_DEPENDENCIES`
+* [`cdba94f`](https://github.com/inspircd/docker/commit/cdba94f6ae0c71ad37b3a88114a14ecb0c5177c1) `ADDPACKAGES` and `DELPACKAGES` are replaced by `BUILD_DEPENDENCIES` and `RUN_DEPENDENCIES`
 
 # Additional information
 
@@ -354,7 +354,7 @@ Please see [the Docker installation documentation](https://docs.docker.com/insta
 
 ## Issues
 
-If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/inspircd/inspircd-docker/issues).
+If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/inspircd/docker/issues).
 
 You can also reach many of the project maintainers via the `#inspircd` IRC channel on [Chatspike](https://chatspike.net).
 
diff --git a/bootstrap.sh b/bootstrap.sh
index 9c3ba3248f9b9750bd1d90dfd33b705414b105e4..02a4c6f24614fb86146fe8abd3896c575720b8b6 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -11,7 +11,7 @@ command_exists wget
 docker_installed
 
 # Workaround for CentOS and maybe more OSes where docker.service is not started automatically
-# See https://github.com/inspircd/inspircd-docker/issues/35
+# See https://github.com/inspircd/docker/issues/35
 if command -v systemctl >/dev/null 2>&1; then
     # Make sure docker unit exists
     if [ "$(systemctl cat docker | wc -l)" -ne 0 ]; then
diff --git a/conf/docker.motd b/conf/docker.motd
index f01c27db8f35e5609281652c8ba199753174a9a7..739a1d412880bab032d60db31fd6d98ee74497a2 100644
--- a/conf/docker.motd
+++ b/conf/docker.motd
@@ -51,6 +51,6 @@
 
       A warm welcome from the InspIRCd-Docker Team, too!
       For Issues:
-      https://github.com/inspircd/inspircd-docker/issues
+      https://github.com/inspircd/docker/issues
 
       Have fun with the image!
diff --git a/conf/links.sh b/conf/links.sh
index f3ded6a104e38d949b6227ca7808ed72d628b277..5fef39a79a020ad267d6d7ed69abd87536e9cbc6 100755
--- a/conf/links.sh
+++ b/conf/links.sh
@@ -13,7 +13,7 @@
 # generateLinkBlock <NAME> <IPADDR> <PORT> <SENDPASS> <RECVPASS> <ALLOWMASK> <MORE>
 generateLinkBlock() {
 if [ "$6" = "" ]; then
-    echo "<die reason value=\"Wrong configured link block. Please check your configs! For details see: https://github.com/inspircd/inspircd-docker#linking-servers-and-services\">"
+    echo "<die reason value=\"Wrong configured link block. Please check your configs! For details see: https://github.com/inspircd/docker#linking-servers-and-services\">"
     exit 1
 fi
 cat <<EOF