diff --git a/build.sh b/build.sh
index 441581d..45e2eb0 100755
--- a/build.sh
+++ b/build.sh
@@ -3,7 +3,8 @@
 now=`date +%Y%m%d%H%M%S`
 
 docker image build --pull --tag "source.devloop.de/docker/courier-mta:${now}"
-docker image tag "source.devloop.de/docker/courier-mta:${now}" "source.devloop.de/docker/courier-mta:latest"
-docker image push "source.devloop.de/docker/courier-mta:${now}"
-docker image push "source.devloop.de/docker/courier-mta:latest"
-
+if [[ $? -eq 0 ]]; then
+	docker image tag "source.devloop.de/docker/courier-mta:${now}" "source.devloop.de/docker/courier-mta:latest"
+	docker image push "source.devloop.de/docker/courier-mta:${now}"
+	docker image push "source.devloop.de/docker/courier-mta:latest"
+fi