diff --git a/.tests/scripts/get-modules.sh b/.tests/scripts/get-modules.sh
index 7cefc4cc4..d2b5b34c3 100755
--- a/.tests/scripts/get-modules.sh
+++ b/.tests/scripts/get-modules.sh
@@ -19,8 +19,9 @@ RETRIES=10
 # FUNCTIONS
 # -------------------------------------------------------------------------------------------------
 
-PHP_TAG="$( grep 'devilbox/php' "${DVLBOX_PATH}/docker-compose.yml" | sed 's/^.*-work-//g' )"
-PHP_MOD="$( run "curl -sS 'https://raw.githubusercontent.com/devilbox/docker-php-fpm/${PHP_TAG}/doc/php-modules.md'" "${RETRIES}" )";
+PHP_TAG="$( grep 'johnea/php' "${DVLBOX_PATH}/docker-compose.yml" | sed 's/^.*-work-//g' )"
+PHP_BRANCH="$( run "curl -sS 'https://api.github.com/repos/john-ea/docker-php-fpm' | grep -o '\"default_branch\": \"[^\"]*' | grep -o '[^\"]*$' | head -1" "${RETRIES}" )";
+PHP_MOD="$( run "curl -sS 'https://raw.githubusercontent.com/john-ea/docker-php-fpm/${PHP_BRANCH}/doc/php-modules.md'" "${RETRIES}" )";
 
 
 get_modules() {
diff --git a/.tests/scripts/get-tools.sh b/.tests/scripts/get-tools.sh
index 3c53bf412..cc55847f6 100755
--- a/.tests/scripts/get-tools.sh
+++ b/.tests/scripts/get-tools.sh
@@ -18,8 +18,8 @@ RETRIES=10
 # -------------------------------------------------------------------------------------------------
 # FUNCTIONS
 # -------------------------------------------------------------------------------------------------
-
-PHP_TAG="$( grep 'devilbox/php' "${DVLBOX_PATH}/docker-compose.yml" | sed 's/^.*-work-//g' )"
-PHP_TOOLS="$( run "curl -sS 'https://raw.githubusercontent.com/devilbox/docker-php-fpm/${PHP_TAG}/doc/available-tools.md'" "${RETRIES}" )";
+PHP_TAG="$( grep 'johnea/php' "${DVLBOX_PATH}/docker-compose.yml" | sed 's/^.*-work-//g' )"
+PHP_BRANCH="$( run "curl -sS 'https://api.github.com/repos/john-ea/docker-php-fpm' | grep -o '\"default_branch\": \"[^\"]*' | grep -o '[^\"]*$' | head -1" "${RETRIES}" )";
+PHP_TOOLS="$( run "curl -sS 'https://raw.githubusercontent.com/john-ea/docker-php-fpm/${PHP_BRANCH}/doc/available-tools.md'" "${RETRIES}" )";
 
 echo "${PHP_TOOLS}" | grep -A 1000000 'TOOLS_WORK_START'
diff --git a/.tests/tests/modules-fetch-tests.sh b/.tests/tests/modules-fetch-tests.sh
index b0cf4cecc..0610ca946 100755
--- a/.tests/tests/modules-fetch-tests.sh
+++ b/.tests/tests/modules-fetch-tests.sh
@@ -41,12 +41,12 @@ VHOST="${1}"
 # The following ensures to download the module test directory
 
 # Where to download from
-TEST_REPO="https://github.com/devilbox/docker-php-fpm"
+TEST_REPO="https://github.com/john-ea/docker-php-fpm"
 TEST_PATH="tests/mods/modules"
 
 # Get current PHP_FPM git tag or branch
 PHP_FPM_GIT_SLUG="$( \
-	grep -E '^[[:space:]]+image:[[:space:]]+devilbox/php-fpm:' "${DVLBOX_PATH}/docker-compose.yml" \
+	grep -E '^[[:space:]]+image:[[:space:]]+johnea/php-fpm:' "${DVLBOX_PATH}/docker-compose.yml" \
 	| perl -p -e 's/.*(base|mods|prod|work|)-//g'
 )"
 
@@ -56,7 +56,10 @@ if [[ ${PHP_FPM_GIT_SLUG} =~ ^[.0-9]+$ ]]; then
 else
 	SVN_PATH="${TEST_REPO}/branches/${PHP_FPM_GIT_SLUG}/${TEST_PATH}"
 fi
-
+if [ -z "${PHP_FPM_GIT_SLUG}" ]; then
+	PHP_BRANCH="$( run "curl -sS 'https://api.github.com/repos/john-ea/docker-php-fpm' | grep -o '\"default_branch\": \"[^\"]*' | grep -o '[^\"]*$' | head -1" "${RETRIES}" )";
+	SVN_PATH="${TEST_REPO}/branches/${PHP_BRANCH}/${TEST_PATH}"
+fi
 # Cleanup and fetch data
 run "docker-compose exec -T --user devilbox php rm -rf /shared/httpd/${VHOST} || true" "${RETRIES}" "${DVLBOX_PATH}"
 run "docker-compose exec -T --user devilbox php mkdir -p /shared/httpd/${VHOST}" "${RETRIES}" "${DVLBOX_PATH}"
diff --git a/compose/docker-compose.override.yml-php-multi.yml b/compose/docker-compose.override.yml-php-multi.yml
index c063cd0cf..5aed237a1 100644
--- a/compose/docker-compose.override.yml-php-multi.yml
+++ b/compose/docker-compose.override.yml-php-multi.yml
@@ -34,7 +34,7 @@ services:
 
   php54:
     <<: *default-php
-    image: devilbox/php-fpm:5.4-prod-0.150
+    image: devilbox/php-fpm:5.4-prod
     hostname: php54
     networks:
       app_net:
@@ -52,7 +52,7 @@ services:
 
   php55:
     <<: *default-php
-    image: devilbox/php-fpm:5.5-prod-0.150
+    image: devilbox/php-fpm:5.5-prod
     hostname: php55
     networks:
       app_net:
@@ -70,7 +70,7 @@ services:
 
   php56:
     <<: *default-php
-    image: devilbox/php-fpm:5.6-prod-0.150
+    image: johnea/php-fpm:5.6-prod
     hostname: php56
     networks:
       app_net:
@@ -88,7 +88,7 @@ services:
 
   php70:
     <<: *default-php
-    image: devilbox/php-fpm:7.0-prod-0.150
+    image: johnea/php-fpm:7.0-prod
     hostname: php70
     networks:
       app_net:
@@ -106,7 +106,7 @@ services:
 
   php71:
     <<: *default-php
-    image: devilbox/php-fpm:7.1-prod-0.150
+    image: johnea/php-fpm:7.1-prod
     hostname: php71
     networks:
       app_net:
@@ -124,7 +124,7 @@ services:
 
   php72:
     <<: *default-php
-    image: devilbox/php-fpm:7.2-prod-0.150
+    image: johnea/php-fpm:7.2-prod
     hostname: php72
     networks:
       app_net:
@@ -142,7 +142,7 @@ services:
 
   php73:
     <<: *default-php
-    image: devilbox/php-fpm:7.3-prod-0.150
+    image: johnea/php-fpm:7.3-prod
     hostname: php73
     networks:
       app_net:
@@ -160,7 +160,7 @@ services:
 
   php74:
     <<: *default-php
-    image: devilbox/php-fpm:7.4-prod-0.150
+    image: johnea/php-fpm:7.4-prod
     hostname: php74
     networks:
       app_net:
@@ -178,7 +178,7 @@ services:
 
   php80:
     <<: *default-php
-    image: devilbox/php-fpm:8.0-prod-0.150
+    image: johnea/php-fpm:8.0-prod
     hostname: php80
     networks:
       app_net:
@@ -196,7 +196,7 @@ services:
 
   php81:
     <<: *default-php
-    image: devilbox/php-fpm:8.1-prod-0.150
+    image: johnea/php-fpm:8.1-prod
     hostname: php81
     networks:
       app_net:
@@ -214,7 +214,7 @@ services:
 
   php82:
     <<: *default-php
-    image: devilbox/php-fpm:8.2-prod-0.150
+    image: johnea/php-fpm:8.2-prod
     hostname: php82
     networks:
       app_net:
@@ -232,7 +232,7 @@ services:
 
   php83:
     <<: *default-php
-    image: devilbox/php-fpm:8.3-prod-0.150
+    image: johnea/php-fpm:8.3-prod
     hostname: php83
     networks:
       app_net:
diff --git a/docker-compose.yml b/docker-compose.yml
index 8c4d46dd1..371442a96 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -100,7 +100,7 @@ services:
   # PHP
   # ------------------------------------------------------------
   php:
-    image: devilbox/php-fpm:${PHP_SERVER}-work-0.151
+    image: johnea/php-fpm:${PHP_SERVER}-work
     hostname: php
 
     ##
diff --git a/update-docker.sh b/update-docker.sh
index f8d0a136a..98c0baabf 100755
--- a/update-docker.sh
+++ b/update-docker.sh
@@ -46,10 +46,10 @@ fi
 ### PHP
 ###
 if [ "${WHICH}" = "all" ] || [ "${WHICH}" = "php" ]; then
-	SUFFIX="$( grep -E '^\s+image:\s+devilbox/php-fpm' "${CWD}/docker-compose.yml" | sed 's/.*}//g' )"
+	SUFFIX="$( grep -E '^\s+image:\s+johnea/php-fpm' "${CWD}/docker-compose.yml" | sed 's/.*}//g' )"
 	IMAGES="$( grep -Eo '^#*PHP_SERVER=[.0-9]+' "${CWD}/env-example" | sed 's/.*=//g' )"
 	echo "${IMAGES}" | while read version ; do
-		docker pull devilbox/php-fpm:${version}${SUFFIX}
+		docker pull johnea/php-fpm:${version}${SUFFIX}
 	done
 fi