diff --git a/.travis.yml b/.travis.yml
index c868291d..40799d84 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,6 +30,17 @@ jobs:
         - export ALIAS=`echo $TRAVIS_COMMIT | cut -c 1-7`
         - datasette publish nowv1 fixtures.db -m fixtures.json --token=$NOW_TOKEN --branch=$TRAVIS_COMMIT --version-note=$TRAVIS_COMMIT --name=datasette-latest-$ALIAS --alias=latest.datasette.io --alias=$ALIAS.datasette.io
     - stage: release tagged version
+      if: tag IS present
+      python: 3.6
+      deploy:
+        - provider: pypi
+          user: simonw
+          distributions: bdist_wheel
+          password: ${PYPI_PASSWORD}
+          on:
+            branch: master
+            tags: true
+    - stage: publish docker image
       if: tag IS present
       python: 3.6
       script:
@@ -43,11 +54,3 @@ jobs:
         - docker build -f Dockerfile -t $REPO:$TRAVIS_TAG .
         - docker tag $REPO:$TRAVIS_TAG $REPO:latest
         - docker push $REPO
-      deploy:
-        - provider: pypi
-          user: simonw
-          distributions: bdist_wheel
-          password: ${PYPI_PASSWORD}
-          on:
-            branch: master
-            tags: true