diff --git a/Dockerfiles/Dockerfile.latest b/Dockerfiles/Dockerfile.latest
index 3c546a6..7550682 100644
--- a/Dockerfiles/Dockerfile.latest
+++ b/Dockerfiles/Dockerfile.latest
@@ -9,7 +9,7 @@ RUN set -eux \
 		coreutils \
 		curl \
 		git \
-	&& git clone https://github.com/squizlabs/PHP_CodeSniffer
+	&& git clone https://github.com/PHPCSStandards/PHP_CodeSniffer
 
 ARG PBF_VERSION
 RUN set -eux \
@@ -20,7 +20,7 @@ RUN set -eux \
 		VERSION="$( git tag | grep -E "^v?${PBF_VERSION}\.[.0-9]+\$" | sort -V | tail -1 )"; \
 	fi \
 	&& echo "Version: ${VERSION}" \
-	&& curl -sS -L https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${VERSION}/phpcbf.phar -o /phpcbf.phar \
+	&& curl -sS -L https://github.com/PHPCSStandards/PHP_CodeSniffer/releases/download/${VERSION}/phpcbf.phar -o /phpcbf.phar \
 	&& chmod +x /phpcbf.phar \
 	&& mv /phpcbf.phar /usr/bin/phpcbf \
 	\
diff --git a/Makefile b/Makefile
index 74ad4f0..8b31233 100644
--- a/Makefile
+++ b/Makefile
@@ -161,7 +161,7 @@ _test-phpcbf-version:
 	@if [ "$(PBF_VERSION)" = "latest" ]; then \
 		echo "Fetching latest version from GitHub"; \
 		LATEST="$$( \
-		curl -L -sS https://github.com/squizlabs/PHP_CodeSniffer/releases \
+		curl -L -sS https://github.com/PHPCSStandards/PHP_CodeSniffer/releases \
 			| tac | tac \
 			| grep -Eo '/[.0-9]+?\.[.0-9]+"' \
 			| grep -Eo '[.0-9]+' \
diff --git a/README.md b/README.md
index 246272b..50d831f 100644
--- a/README.md
+++ b/README.md
@@ -44,10 +44,10 @@ View **[Dockerfiles](https://github.com/cytopia/docker-phpcbf/blob/master/Docker
 
 **Available Architectures:**  `amd64`, `i386`, `arm64`, `arm/v7`, `arm/v6`
 
-Tiny Alpine-based multistage-builld dockerized version of [phpcbf](https://github.com/squizlabs/PHP_CodeSniffer)<sup>[1]</sup>.
+Tiny Alpine-based multistage-builld dockerized version of [phpcbf](https://github.com/PHPCSStandards/PHP_CodeSniffer)<sup>[1]</sup>.
 The image is built nightly against multiple stable versions and pushed to Dockerhub.
 
-<sup>[1] Official project: https://github.com/squizlabs/PHP_CodeSniffer</sup>
+<sup>[1] Official project: https://github.com/PHPCSStandards/PHP_CodeSniffer</sup>
 
 ## :whale: Available Docker image versions