diff --git a/.travis.yml b/.travis.yml
index 5d7b740b..6e33cc2a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,6 +34,13 @@ jobs:
           "${BASE_IMAGE}"
           bash -c "apt update && apt install -y g++ &&
           coverage run --omit=nansat/mappers/*,nansat/tests/*,nansat/nansatmap.py --source=nansat setup.py test && coveralls"
+      deploy:
+        - provider: pypi
+          user: "__token__"
+          password: "${PYPI_TOKEN}"
+          skip_existing: true
+          on:
+            tags: true
 
     - stage: 'Build docker images'
       name: 'Build standard image'
@@ -83,15 +90,4 @@ jobs:
           on:
             tags: true
           script: /bin/bash scripts/docker_push.sh "${TRAVIS_TAG}${DOCKER_TAG_SUFFIX}" "latest${DOCKER_TAG_SUFFIX}"
-
-    - stage: 'PyPI deployment'
-      if: tag IS present
-      deploy:
-        - provider: pypi
-          edge: true
-          user: "__token__"
-          password: "${PYPI_TOKEN}"
-          skip_existing: true
-          on:
-            tags: true
 ...