diff --git a/.travis.yml b/.travis.yml
index cbdd3c8..9cefbe1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,3 +10,4 @@ install:
 
 script:
   - ci/ci.sh
+  - [[ $TRAVIS_TAG == "" ]] || ci/publish-image.sh
diff --git a/ci/publish.sh b/ci/publish.sh
new file mode 100755
index 0000000..13f44ca
--- /dev/null
+++ b/ci/publish.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+######################################
+# Publish the seafile server image (e.g. seafileorg/server:6.0.7) to docker
+# registry. This script should only be called during a travis build trigger by a tag.
+######################################
+
+set -o pipefail
+set -e -x
+
+## Always use the base image we build manually to reduce the download size of the end user.
+docker pull seafileorg/base:16.04
+
+(
+    cd image
+    make server push-server
+)
diff --git a/image/Makefile b/image/Makefile
index 4bb1f86..4593ae4 100644
--- a/image/Makefile
+++ b/image/Makefile
@@ -1,4 +1,4 @@
-server_version=6.0.5
+server_version=6.0.7
 
 base_image=seafileorg/base:16.04
 base_image_squashed=seafileorg/base:16.04-squashed
@@ -19,8 +19,12 @@ squash-base:
 server:
 	cd seafile && docker build -t $(server_image) .
 
-push:
+push-base:
 	docker push $(base_image)
+
+push-server:
 	docker push $(server_image)
 
-.PHONY: base server push
+push: push-base push-server
+
+.PHONY: base server push push-base push-server
diff --git a/image/seafile/Dockerfile b/image/seafile/Dockerfile
index d2e7755..0c15aa7 100644
--- a/image/seafile/Dockerfile
+++ b/image/seafile/Dockerfile
@@ -1,7 +1,7 @@
 FROM seafileorg/base:16.04
 WORKDIR /opt/seafile
 
-ENV SEAFILE_VERSION=6.0.5
+ENV SEAFILE_VERSION=6.0.7
 
 # syslog-ng and syslog-forwarder would mess up the container stdout, not good
 # when debugging/upgrading.
@@ -9,7 +9,7 @@ RUN sed -i -e 's|\(^exec syslog-ng.*$\)|\1 >>/var/log/syslog-ng.log 2>\&1|g' /et
     rm -rf /etc/service/syslog-forwarder
 
 RUN mkdir -p /opt/seafile/ && \
-    curl -sSL -o - https://bintray.com/artifact/download/seafile-org/seafile/seafile-server_6.0.5_x86-64.tar.gz \
+    curl -sSL -o - https://bintray.com/artifact/download/seafile-org/seafile/seafile-server_${SEAFILE_VERSION}_x86-64.tar.gz \
     | tar xzf - -C /opt/seafile/
 
 RUN mkdir -p /etc/my_init.d
diff --git a/launcher b/launcher
index d751e65..6aa3549 100755
--- a/launcher
+++ b/launcher
@@ -21,7 +21,7 @@ usage () {
 set -e
 set -o pipefail
 
-version=6.0.5
+version=6.0.7
 image=seafileorg/server:$version
 local_image=local_seafile/server:latest
 dockerdir=$(cd "$(dirname $0)"; pwd -P)
diff --git a/launcher.ps1 b/launcher.ps1
index 97acf76..d5270d2 100644
--- a/launcher.ps1
+++ b/launcher.ps1
@@ -8,7 +8,7 @@ you should use it instead of the linux 'launcher' script.
 
 $ErrorActionPreference = "Stop"
 
-$version = "6.0.5"
+$version = "6.0.7"
 $image = "seafileorg/server:$version"
 $local_image = "local_seafile/server:latest"
 
diff --git a/tests/Dockerfile b/tests/Dockerfile
index d386bb6..ae37b42 100644
--- a/tests/Dockerfile
+++ b/tests/Dockerfile
@@ -1,7 +1,7 @@
-FROM seafileorg/server:6.0.5
+FROM seafileorg/server:6.0.7
 
 ENV SEAFILE_VERSION=6.1.0
 
-RUN mv /opt/seafile/seafile-server-6.0.5 /opt/seafile/seafile-server-${SEAFILE_VERSION}
+RUN mv /opt/seafile/seafile-server-6.0.7 /opt/seafile/seafile-server-${SEAFILE_VERSION}
 
 ADD upgrade_6.0_6.1.sh /opt/seafile/seafile-server-${SEAFILE_VERSION}/upgrade/upgrade_6.0_6.1.sh