diff --git a/.travis.yml b/.travis.yml
index f4ffdc29..6cf0ebff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,18 +29,19 @@ after_failure:
 
 jobs:
   include:
-    - stage: deploy
+    - stage: package
       script: skip
       before_deploy:
         - curl -sL https://raw.githubusercontent.com/travis-ci/artifacts/master/install | bash
       deploy:
-        provider: script
-        skip_cleanup: true
-        script: ./.travis/deploy_script.sh
-        on:
-            branch: master
-            php: '7.0'
-    - stage: release
+        - provider: script
+          skip_cleanup: true
+          script:
+            - if [ "$TRAVIS_BRANCH" = "dev" ]; then ./.travis/deploy_script.sh; fi
+            - if [ "$TRAVIS_BRANCH" = "master" ]; then ./.travis/deploy_script.sh; fi
+          on:
+              php: '7.0'
+    - stage: deploy-release
       script: skip
       before_deploy:
         - curl -sL https://raw.githubusercontent.com/travis-ci/artifacts/master/install | bash
diff --git a/.travis/deploy_script.sh b/.travis/deploy_script.sh
index caa092d9..b7dab83f 100755
--- a/.travis/deploy_script.sh
+++ b/.travis/deploy_script.sh
@@ -5,7 +5,7 @@ if [ "$TRAVIS" = "true" ]; then
     if test "$TRAVIS_TAG"; then
         PKG_NAME=$TRAVIS_TAG
     else
-        PKG_NAME=v7.0.0-master
+        PKG_NAME=v7.0.0-$TRAVIS_BRANCH
     fi
 
     FILE_NAME="phpvms-$PKG_NAME"