diff --git a/7.2/build-images.sh b/7.2/build-images.sh
index 90b7f89..10eec2e 100755
--- a/7.2/build-images.sh
+++ b/7.2/build-images.sh
@@ -3,5 +3,5 @@
 set -x
 set -e
 
-(cd 7.2/base && docker build --rm  --pull  -t formapro/nginx-php-fpm:7.2-latest .)
-(cd 7.2/php-all-exts && docker build --rm -t formapro/nginx-php-fpm:7.2-latest-all-exts .)
+(cd 7.2/base && docker build --rm --pull -t makasim/nginx-php-fpm:7.2 .)
+(cd 7.2/php-all-exts && docker build --rm -t makasim/nginx-php-fpm:7.2-all-exts .)
diff --git a/7.2/push-images.sh b/7.2/push-images.sh
index eafb255..ff76e32 100755
--- a/7.2/push-images.sh
+++ b/7.2/push-images.sh
@@ -4,5 +4,5 @@ set -x
 set -e
 
 docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
-docker push formapro/nginx-php-fpm:7.2-latest
-docker push formapro/nginx-php-fpm:7.2-latest-all-exts
+docker push makasim/nginx-php-fpm:7.2
+docker push makasim/nginx-php-fpm:7.2-all-exts
diff --git a/7.3/build-images.sh b/7.3/build-images.sh
index 74ebb67..25feff5 100755
--- a/7.3/build-images.sh
+++ b/7.3/build-images.sh
@@ -3,5 +3,5 @@
 set -x
 set -e
 
-(cd 7.3/base && docker build --rm  --pull  -t formapro/nginx-php-fpm:7.3-latest .)
-(cd 7.3/php-all-exts && docker build --rm -t formapro/nginx-php-fpm:7.3-latest-all-exts .)
+(cd 7.3/base && docker build --rm  --pull  -t makasim/nginx-php-fpm:7.3 .)
+(cd 7.3/php-all-exts && docker build --rm -t makasim/nginx-php-fpm:7.3-all-exts .)
diff --git a/7.3/push-images.sh b/7.3/push-images.sh
index 8458a3c..5c8c1d7 100755
--- a/7.3/push-images.sh
+++ b/7.3/push-images.sh
@@ -4,5 +4,5 @@ set -x
 set -e
 
 docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
-docker push formapro/nginx-php-fpm:7.3-latest
-docker push formapro/nginx-php-fpm:7.3-latest-all-exts
+docker push makasim/nginx-php-fpm:7.3
+docker push makasim/nginx-php-fpm:7.3-all-exts
diff --git a/8.0/build-images.sh b/8.0/build-images.sh
index 91821f4..90f5865 100755
--- a/8.0/build-images.sh
+++ b/8.0/build-images.sh
@@ -3,5 +3,5 @@
 set -x
 set -e
 
-(cd 8.0/base && docker build --rm --pull -t formapro/nginx-php-fpm:8.0-latest .)
-(cd 8.0/php-all-exts && docker build --rm -t formapro/nginx-php-fpm:8.0-latest-all-exts .)
+(cd 8.0/base && docker build --rm --pull -t makasim/nginx-php-fpm:8.0 -t makasim/nginx-php-fpm:latest .)
+(cd 8.0/php-all-exts && docker build --rm -t makasim/nginx-php-fpm:8.0-all-exts -t makasim/nginx-php-fpm:latest-all-exts .)
diff --git a/8.0/push-images.sh b/8.0/push-images.sh
index 5794764..3f95bb1 100755
--- a/8.0/push-images.sh
+++ b/8.0/push-images.sh
@@ -4,5 +4,7 @@ set -x
 set -e
 
 docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
-docker push formapro/nginx-php-fpm:8.0-latest
-docker push formapro/nginx-php-fpm:8.0-latest-all-exts
+docker push makasim/nginx-php-fpm:8.0
+docker push makasim/nginx-php-fpm:8.0-all-exts
+docker push makasim/nginx-php-fpm:latest
+docker push makasim/nginx-php-fpm:latest-all-exts