diff --git a/.travis.yml b/.travis.yml
index 839d20d9..970b56b5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,18 +19,20 @@ jobs:
     python: 3.6
     env: TOXENV=doc_travis
     deploy:
-      skip_cleanup: true
-      on:
-        tags: true
       - provider: pages
+        skip_cleanup: true
         local-dir: doc/build_travis
         github-token: $GH_TOKEN
         keep-history: true
+        on:
+          tags: true
       - provider: pypi
+        skip_cleanup: true
         user: schaefi
-        password:
-          secure: oGf30REGDDqQIGntwx/sklLp/4mAsLNWM6+cPFOzk5Q3T6f1jzXjhi3jo6vMbeGzHxZ4XOHUn/pzuhNY6d2Qlpjvsvxphdx4c9j/VxKopbLlKqBO9aQtRA+SaHFLgVgPGezuflcbKvIOQsNaejTalIVGsPDao1f30dfSZZL6kFTh++nDLBQih7Blu7lXauNekWn6F3/835x9LQe+EEE3pT9nydbKLkFKoTIzCMSgakBm0vBSDXR9DtBUT78roP1KcubGgoMgsgTJr2SN11J0IdMY1RK2NXdPUfoDNIblh7jcfd7UVslK3BjdZ3fWgLY7WrI3jNvuAf/7bIDXr1TjIvMZUu2p4R5Vfyoia9R/z9SZ+yGaRZiDh39fuWWwU0YeCvAhGdLXJOSqBGGxfQcD47i07Xo5oSd+hmT1c0XMwKe+GphVyl2jX/24GsVRfvZeySqBzcQxVEVClq8aoF7LYkRCAksaJMz/aeVFApHJRBalb70ESp0W7+LbGzUC+fVnQVRZZfbM7DXq4TIuAgl0ReVJcb4D7KN7ZS/VPwPBB4BFenm/p+73X2vr+5f7Swykigmyx8gFGjuOqYBUtR1q27qSCShmxCZvVdAsuexCqq3IQ1/XHAbgYn6fQK+pAycQLyEMwCTy9CmazmPYMLZmW2+bbpUUjjIchI1Kp19V3Wk=
+        password: $PYPI_PASS
         distributions: sdist
+        on:
+          tags: true
 
 before_install:
 - sudo apt-get update -qq