diff --git a/.zuul.yaml b/.zuul.yaml
index 55c65b89..33f1b536 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -10,7 +10,7 @@
         - openstack-tox-pep8
         - openstack-tox-py36
         - ranger-tox-bandit
-    post:
+    promote:
       jobs:
         - ranger-image-publish
 
diff --git a/Makefile b/Makefile
index 3588b511..59498b8b 100644
--- a/Makefile
+++ b/Makefile
@@ -15,15 +15,17 @@
 DOCKER_REGISTRY            ?= quay.io
 IMAGE_NAME                 := ranger rangercli
 IMAGE_PREFIX               ?= attcomdev
-IMAGE_TAG                  ?= ocata
+IMAGE_TAG                  := latest
 HELM                       ?= helm
 LABEL                      ?= commit-id
-PROXY                      ?= 
+PROXY                      ?=
+PUSH_IMAGE                 ?= false
 NO_PROXY                   ?= localhost,127.0.0.1,.svc.cluster.local
 USE_PROXY                  ?= true
 RANGER_USER                := ranger
 
-IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
+IMAGE_LATEST := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
+IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${LABEL}
 IMAGE_DIR:=images/$(IMAGE_NAME)
 
 # Build ranger Docker image for this project
@@ -35,6 +37,7 @@ images: $(IMAGE_NAME)
 	@echo
 	@echo "===== Processing [$@] image ====="
 	@make build_$@ IMAGE=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/$@:${IMAGE_TAG} IMAGE_DIR=images/$@ IMAGE_NAME=$@
+	@make build_$@ IMAGE=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/$@:${LABEL} IMAGE_DIR=images/$@ IMAGE_NAME=$@
 
 # Create tgz of the chart
 .PHONY: charts
@@ -83,6 +86,10 @@ else
 	docker build --network host -t $(IMAGE) --label $(LABEL) -f $(IMAGE_DIR)/Dockerfile .
 endif
 
+ifeq ($(PUSH_IMAGE), true)
+	docker push $(IMAGE)
+	docker push $(IMAGE_LATEST)
+endif
 
 .PHONY: clean
 clean: