diff --git a/.travis.yml b/.travis.yml
index ebacb168e9..6ce813dbfd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,9 +24,14 @@ stages:
   - test
   - build
   - name: build-docker-image-for-release
-    if: branch = master AND tag IS present
+    if: tag =~ /^v\d+\.\d+(\.\d+)?(-release)?$/
   - name: build-docker-image-for-dev
-    if: branch = dev AND tag IS present
+    if: tag =~ /^v\d+\.\d+(\.\d+)?-(beta|alpha)+(\.\d+)?$/
+branches:
+  only:
+    - master
+    - dev
+    - /^v\d+\.\d+(\.\d+)?(-\S*)?$/
 notifications:
   webhooks:
     - https://fathomless-fjord-24024.herokuapp.com/notify