diff --git a/Makefile b/Makefile
index 5f992ed..1532246 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,10 @@ docker_build:
 docker_tag:
 	docker tag $(DOCKER_IMAGE):$(DOCKER_TAG) $(DOCKER_IMAGE):latest
 
+docker_tag:
+	docker tag $(DOCKER_IMAGE):$(GIT_COMMIT) $(DOCKER_IMAGE):$(DOCKER_TAG)
+	docker tag $(DOCKER_IMAGE):$(DOCKER_TAG) $(DOCKER_IMAGE):latest
+
 docker_push:
 	docker push $(DOCKER_IMAGE):latest
 	docker push $(DOCKER_IMAGE):$(DOCKER_TAG)
diff --git a/hooks/build b/hooks/build
index d087e83..019bbae 100755
--- a/hooks/build
+++ b/hooks/build
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-make release
+make build && make release