diff --git a/codeship-steps.yml b/codeship-steps.yml
index db3b0cf..42adfd5 100644
--- a/codeship-steps.yml
+++ b/codeship-steps.yml
@@ -1,7 +1,12 @@
-- service: app
+- service: docker push latest
   type: push
   image_name: alinuxninja/postal
   registry: https://index.docker.io/v1/
   encrypted_dockercfg_path: dockercfg.encrypted
-  tag: master
-  image_tag: latest
+  command: docker tag alinuxninja/postal alinuxninja/postal:latest && docker push alinuxninja/postal
+- service: docker push tag
+  type: push
+  image_name: alinuxninja/postal
+  registry: https://index.docker.io/v1/
+  encrypted_dockercfg_path: dockercfg.encrypted
+  command: docker tag alinuxninja/postal alinuxninja/postal:$(git rev-parse --short $(git ls-remote https://github.com/atech/postal.git refs/heads/master | awk '{print $1}')) && docker push alinuxninja/postal