diff --git a/.travis.yml b/.travis.yml
index fd2d9ec2..4bd46b98 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,8 +30,13 @@ after_success:
   - bash <(curl -s https://codecov.io/bash)
 
 deploy:
-  provider: script
-  script: chmod +x scripts/deploy.sh && scripts/deploy.sh
-  skip_cleanup: true
-  on:
-    condition: $TRAVIS_BRANCH == "master" || -n $TRAVIS_TAG
+  - provider: script
+    script: chmod +x scripts/deploy.sh && scripts/deploy.sh
+    skip_cleanup: true
+    on:
+      branch: master
+  - provider: script
+    script: chmod +x scripts/deploy.sh && scripts/deploy.sh
+    skip_cleanup: true
+    on:
+      tags: true
diff --git a/conform.yaml b/conform.yaml
index eed4f017..4eb2096d 100644
--- a/conform.yaml
+++ b/conform.yaml
@@ -41,8 +41,8 @@ scripts:
     docker push ${CONFORM_IMAGE}
 
     if [ ${CONFORM_IS_TAG} == "true" ]; then
-      docker tag ${CONFORM_IMAGE} autonomy/conform:${CONFORM_TAG}
-      docker push autonomy/conform:${CONFORM_TAG}
+      docker tag ${CONFORM_IMAGE} autonomy/conform:${CONFORM_TAG:1}
+      docker push autonomy/conform:${CONFORM_TAG:1}
       if [ ${CONFORM_PRERELEASE} == "" ]; then
         docker tag ${CONFORM_IMAGE} autonomy/conform:latest
         docker push autonomy/conform:latest