diff --git a/.github/issue_template.md b/.github/issue_template.md
index 0cd7b15..bc0ea26 100644
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@@ -2,7 +2,7 @@
 
 Before raising an issue here, answer the following questions for yourself, please:
 
-* Did you read through the troubleshooting section? (https://github.com/ninech/netbox-docker/#troubleshooting)
+* Did you read through the troubleshooting section? (https://github.com/netbox-community/netbox-docker/#troubleshooting)
 * Have you updated to the latest version and tried again? (i.e. `git pull` and `docker-compose pull`)
 * Have you reset the project and tried again? (i.e. `docker-compose down -v`)
 * Are you confident that your problem is related to the Docker or Docker Compose setup this project provides?
diff --git a/Dockerfile.ldap b/Dockerfile.ldap
index 86f402b..303c3a8 100644
--- a/Dockerfile.ldap
+++ b/Dockerfile.ldap
@@ -1,4 +1,4 @@
-ARG DOCKER_ORG=ninech
+ARG DOCKER_ORG=netboxcommunity
 ARG DOCKER_REPO=netbox
 ARG FROM_TAG=latest
 FROM $DOCKER_ORG/$DOCKER_REPO:$FROM_TAG
diff --git a/README.md b/README.md
index 59dbdf3..348efab 100644
--- a/README.md
+++ b/README.md
@@ -383,18 +383,22 @@ The following is a list of breaking changes of the `netbox-docker` project:
 * 0.5.0: Alpine was updated to 3.8, `*.env` moved to `/env` folder
 * 0.4.0: In order to use Netbox webhooks you need to add Redis and a netbox-worker to your docker-compose.yml.
 * 0.3.0: Field `filterable: <boolean` was replaced with field `filter_logic: loose/exact/disabled`. It will default to `CF_FILTER_LOOSE=loose` when not defined.
-* 0.2.0: Re-organized paths: `/etc/netbox -> /etc/netbox/config` and `/etc/reports -> /etc/netbox/reports`. Fixes [#54](https://github.com/netbox-community/netbox-docker/issues/54).
+* 0.2.0: Re-organized paths: `/etc/netbox -> /etc/netbox/config` and `/etc/reports -> /etc/netbox/reports`. Fixes [#54][54].
 * 0.1.0: Introduction of the `NETBOX_DOCKER_PROJECT_VERSION`. (Not a breaking change per se.)
 
+[54]: https://github.com/netbox-community/netbox-docker/issues/54
+
 ## Rebuilding & Publishing images
 
 `./build.sh` can be used to rebuild the Docker image. See `./build.sh --help` for more information.
 
 ### Publishing Docker Images
 
-New Docker Images are built and published every 24h on the [Docker Build Infrastructure](https://hub.docker.com/r/netboxcommunity/netbox/builds/).
+New Docker images are built and published every 24h on the [Docker Build Infrastructure][docker-build-infra].
 `DOCKER_HUB.md` contains more information about the build infrastructure.
 
+[docker-build-infra]: https://hub.docker.com/r/netboxcommunity/netbox/builds/
+
 ## Tests
 
 To run the tests coming with Netbox, use the `docker-compose.yml` file as such:
@@ -405,4 +409,6 @@ $ docker-compose run netbox ./manage.py test
 
 ## About
 
-This repository is currently maintained and funded by [nxt](https://nxt.engineering).
+This repository is currently maintained and funded by [nxt][nxt].
+
+[nxt]: https://nxt.engineering/en/
diff --git a/build-latest.sh b/build-latest.sh
index 5732bd2..89c183e 100755
--- a/build-latest.sh
+++ b/build-latest.sh
@@ -47,7 +47,7 @@ if [ "${PRERELEASE}" == "true" ]; then
 fi
 
 # Check if that version is not already available on docker hub:
-ORIGINAL_DOCKERHUB_REPO="ninech/netbox"
+ORIGINAL_DOCKERHUB_REPO="netboxcommunity/netbox"
 DOCKERHUB_REPO="${DOCKERHUB_REPO-$ORIGINAL_DOCKERHUB_REPO}"
 URL_DOCKERHUB_TOKEN="https://auth.docker.io/token?service=registry.docker.io&scope=repository:${DOCKERHUB_REPO}:pull"
 BEARER_TOKEN="$($CURL "${URL_DOCKERHUB_TOKEN}" | jq -r .token)"
diff --git a/build.sh b/build.sh
index a400f6f..aeca79f 100755
--- a/build.sh
+++ b/build.sh
@@ -27,7 +27,7 @@ if [ "${1}x" == "x" ] || [ "${1}" == "--help" ] || [ "${1}" == "-h" ]; then
   echo "             Else:          same as <BRANCH>"
   echo "  DOCKER_ORG The Docker registry (i.e. hub.docker.com/r/<DOCKER_ORG>/<DOCKER_REPO>) "
   echo "           Also used for tagging the image."
-  echo "           Default: ninech"
+  echo "           Default: netboxcommunity"
   echo "  DOCKER_REPO The Docker registry (i.e. hub.docker.com/r/<DOCKER_ORG>/<DOCKER_REPO>) "
   echo "           Also used for tagging the image."
   echo "           Default: netbox"
@@ -45,7 +45,7 @@ if [ "${1}x" == "x" ] || [ "${1}" == "--help" ] || [ "${1}" == "-h" ]; then
   echo "           The value will be used as a suffix to the \$TAG and for the Dockerfile"
   echo "           selection. The TAG being build must exist for the base variant and"
   echo "           corresponding Dockerfile must start with the following lines:"
-  echo "             ARG DOCKER_ORG=ninech"
+  echo "             ARG DOCKER_ORG=netboxcommunity"
   echo "             ARG DOCKER_REPO=netbox"
   echo "             ARG FROM_TAG=latest"
   echo "             FROM \$DOCKER_ORG/\$DOCKER_REPO:\$FROM_TAG"
@@ -84,7 +84,7 @@ BRANCH="${1}"
 URL="${URL-https://github.com/${SRC_ORG}/${SRC_REPO}/archive/$BRANCH.tar.gz}"
 
 # variables for tagging the docker image
-DOCKER_ORG="${DOCKER_ORG-ninech}"
+DOCKER_ORG="${DOCKER_ORG-netboxcommunity}"
 DOCKER_REPO="${DOCKER_REPO-netbox}"
 case "${BRANCH}" in
   master)
diff --git a/docker-compose.yml b/docker-compose.yml
index ebcfab3..80500e5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
       context: .
       args:
         - BRANCH=${VERSION-master}
-    image: ninech/netbox:${VERSION-latest}
+    image: netboxcommunity/netbox:${VERSION-latest}
     depends_on:
     - postgres
     - redis