diff --git a/.travis.yml b/.travis.yml
index 981d3fd9aa..59986f7647 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,11 @@ cache:
     directories:
         - "node_modules"
 env:
-    - FX_VERSION="54.0b"
-    - FX_VERSION="45.0.2esr"
+    global:
+        secure: ""
+    matrix:
+        - FX_VERSION="54.0b"
+        - FX_VERSION="45.0.2esr"
 matrix:
     fast_finish: true
     #allow_failures:
@@ -27,23 +30,23 @@ before_script:
     - sh -e /etc/init.d/xvfb start
     - npm i
     - node_modules/.bin/gulp build
+    - if [ $FX_VERSION = "54.0b" ] &&
+         [ $TRAVIS_REPO_SLUG = "zotero/zotero" ] &&
+         [ $TRAVIS_BRANCH = "master" ] &&
+         [ $TRAVIS_PULL_REQUEST = "false" ]; then
+        mkdir build-zip;
+        cd build;
+        zip -r ../build-zip/$TRAVIS_COMMIT.zip *;
+        cd ..;
+        gem install dpl;
+        dpl --provider=s3
+            --access-key-id=AKIAJFDVJ54MCAEXPQ5Q
+            --bucket=zotero-download
+            --local-dir=build-zip
+            --upload-dir=ci/client
+            --acl=public-read
+            --skip_cleanup=true;
+      fi
+    - unset AWS_SECRET_ACCESS_KEY
 script:
     - test/runtests.sh -x firefox/firefox
-before_deploy:
-    - mkdir build-zip
-    - cd build
-    - zip -r ../build-zip/$TRAVIS_COMMIT.zip *
-    - cd ..
-deploy:
-    provider: s3
-    access_key_id: AKIAJFDVJ54MCAEXPQ5Q
-    secret_access_key:
-        secure: YXRlWOAMELuCmArVTR50NH3HHEK/nwltmiS5iIEIVx0hFtI/GJCZWjWH0eQ5ro1V1GgYyEGT+Miud9SXNDeejYFNpR80G4gBSSpbngvT/CBYE5IIN/rvlykklCy5+HEgAZEt72zowBDzlX2DBRYPjryKXjL0Ahcz/H7NGvtS5Hk=
-    bucket: zotero-download
-    skip_cleanup: true
-    local-dir: build-zip
-    upload-dir: ci/client
-    acl: public-read
-    on:
-        repo: zotero/zotero
-        condition: "$FX_VERSION = 54.0b"