diff --git a/Makefile b/Makefile
index f8ef4f2..9c222f3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,5 @@
+DOCKER_DATE_TAG := $(shell date +%Y%m%d%H%M)
+
 build:
 	CGO_ENABLED=0 go build -v -o bin/fake-smtp ./cmd/fake-smtp
 
@@ -21,8 +23,10 @@ docker-run:
 
 docker-release:
 	docker tag fake-smtp:latest bornholm/fake-smtp:latest
+	docker tag fake-smtp:latest bornholm/fake-smtp:$(DOCKER_DATE_TAG)
 	docker login
 	docker push bornholm/fake-smtp:latest
+	docker push bornholm/fake-smtp:$(DOCKER_DATE_TAG)
 
 test:
 	go test -v -race ./...