diff --git a/.travis.yml b/.travis.yml
index 7face41..01037d8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,12 +37,12 @@ matrix:
 
 env:
   matrix:
-    - BUILD=gone/php:cli-latest
-    - BUILD=gone/php:cli-latest-onbuild
-    - BUILD=gone/php:apache-latest
-    - BUILD=gone/php:apache-latest-onbuild
-    - BUILD=gone/php:nginx-latest
-    - BUILD=gone/php:nginx-latest-onbuild
+    - BUILD=gone/php:cli
+    - BUILD=gone/php:cli-onbuild
+    - BUILD=gone/php:apache
+    - BUILD=gone/php:apache-onbuild
+    - BUILD=gone/php:nginx
+    - BUILD=gone/php:nginx-onbuild
     - BUILD=gone/marshall
     - BUILD=gone/php:core-5.6
     - BUILD=gone/php:core-7.0
diff --git a/Makefile b/Makefile
index 62b1abd..4bff951 100644
--- a/Makefile
+++ b/Makefile
@@ -323,17 +323,17 @@ gone/node\:12-compiler-onbuild:
 #      ░  ░     ░  ░           ░  ░      ░               ░         ░      ░      ░  ░   ░          ░
 #                                                             ░                       ░
 
-gone/php\:cli-latest:
+gone/php\:cli:
 	$(CMD_BUILD) -t gone/php:cli 					--target=php-cli 			--build-arg "PHP_VERSION=7.3" 	--build-arg "PHP_PACKAGES=$(PHP_PACKAGES_73)" .
-gone/php\:cli-latest-onbuild:
+gone/php\:cli-onbuild:
 	$(CMD_BUILD) -t gone/php:cli-onbuild 			--target=php-cli-onbuild 	--build-arg "PHP_VERSION=7.3" 	--build-arg "PHP_PACKAGES=$(PHP_PACKAGES_73)" .
 gone/php\:apache-latest:
 	$(CMD_BUILD) -t gone/php:apache 				--target=php-apache 		--build-arg "PHP_VERSION=7.3" 	--build-arg "PHP_PACKAGES=$(PHP_PACKAGES_73)" .
-gone/php\:apache-latest-onbuild:
+gone/php\:apache-onbuild:
 	$(CMD_BUILD) -t gone/php:apache-onbuild 		--target=php-apache-onbuild --build-arg "PHP_VERSION=7.3" 	--build-arg "PHP_PACKAGES=$(PHP_PACKAGES_73)" .
-gone/php\:nginx-latest:
+gone/php\:nginx:
 	$(CMD_BUILD) -t gone/php:nginx 					--target=php-nginx 			--build-arg "PHP_VERSION=7.3" 	--build-arg "PHP_PACKAGES=$(PHP_PACKAGES_73)" .
-gone/php\:nginx-latest-onbuild:
+gone/php\:nginx-onbuild:
 	$(CMD_BUILD) -t gone/php:nginx-onbuild 			--target=php-nginx-onbuild 	--build-arg "PHP_VERSION=7.3" 	--build-arg "PHP_PACKAGES=$(PHP_PACKAGES_73)" .
 gone/node\:latest:
 	$(CMD_BUILD) -t gone/node			 			--target=nodejs 			--build-arg NODE_VERSION=12.3.1	--build-arg YARN_VERSION=1.16.0 .