diff --git a/hooks/post_push b/hooks/post_push
index d721b68..3d4830d 100644
--- a/hooks/post_push
+++ b/hooks/post_push
@@ -1,7 +1,8 @@
 #!/bin/bash
 
-docker manifest push --purge b4bz/homer:latest
-docker manifest create b4bz/homer:latest b4bz/homer:latest-amd64 b4bz/homer:latest-arm32v7 b4bz/homer:latest-arm64v8
-docker manifest annotate b4bz/homer:latest b4bz/homer:latest-arm32v7 --os linux --arch arm
-docker manifest annotate b4bz/homer:latest b4bz/homer:latest-arm64v8 --os linux --arch arm64 --variant v8
-docker manifest push --purge b4bz/homer:latest
\ No newline at end of file
+IFS='-' read -r TAG string <<< "$DOCKER_TAG"
+
+docker manifest create b4bz/homer:$TAG b4bz/homer:$TAG-amd64 b4bz/homer:$TAG-arm32v7 b4bz/homer:$TAG-arm64v8
+docker manifest annotate b4bz/homer:$TAG b4bz/homer:$TAG-arm32v7 --os linux --arch arm
+docker manifest annotate b4bz/homer:$TAG b4bz/homer:$TAG-arm64v8 --os linux --arch arm64 --variant v8
+docker manifest push --purge b4bz/homer:$TAG