diff --git a/docker/build-images.sh b/docker/build-images.sh
index f9da01cd..4eddede8 100755
--- a/docker/build-images.sh
+++ b/docker/build-images.sh
@@ -5,7 +5,11 @@ set -e
 # Update the versions in joex.dockerfile and restserver.dockerfile,
 # docker-compose.yml and joex/entrypoint.sh; update versions here
 
-docker build -t eikek0/docspell:joex-0.5.0 -f joex.dockerfile  .
-docker build -t eikek0/docspell:restserver-0.5.0 -f restserver.dockerfile  .
+docker build -t eikek0/docspell:joex-0.6.0 -f joex.dockerfile  .
+docker build -t eikek0/docspell:restserver-0.6.0 -f restserver.dockerfile  .
+
+docker tag eikek0/docspell:restserver-0.6.0 eikek0/docspell:restserver-latest
+docker tag eikek0/docspell:joex-0.6.0 eikek0/docspell:joex-latest
+
 
 # test with docker-compose up
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index bb11c5f5..e6eda62d 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.7'
 services:
   restserver:
-    image: eikek0/docspell:restserver-0.5.0
+    image: eikek0/docspell:restserver-0.6.0
     container_name: docspell-restserver
     command: /opt/docspell.conf
     ports:
@@ -20,7 +20,7 @@ services:
       - POSTGRES_PASSWORD=dbpass
       - POSTGRES_DB=dbname
   joex:
-    image: eikek0/docspell:joex-0.5.0
+    image: eikek0/docspell:joex-0.6.0
     container_name: docspell-joex
     command: /opt/docspell.conf
     ports:
diff --git a/docker/joex.dockerfile b/docker/joex.dockerfile
index c08f3ade..10c6af1d 100644
--- a/docker/joex.dockerfile
+++ b/docker/joex.dockerfile
@@ -24,7 +24,7 @@ RUN apk add --no-cache openjdk11-jre \
   && ln -s /usr/bin/python3 /usr/bin/python \
   && mkdir -p /opt \
   && cd /opt \
-  && curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.5.0/docspell-joex-0.5.0.zip \
+  && curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.6.0/docspell-joex-0.6.0.zip \
   && unzip docspell.zip \
   && rm docspell.zip \
   && apk del curl unzip
diff --git a/docker/joex/entrypoint.sh b/docker/joex/entrypoint.sh
index fca8fac6..f0c80012 100755
--- a/docker/joex/entrypoint.sh
+++ b/docker/joex/entrypoint.sh
@@ -3,4 +3,4 @@
 echo "Starting unoconv listener"
 unoconv -l &
 
-/opt/docspell-joex-0.5.0/bin/docspell-joex "$@"
+/opt/docspell-joex-0.6.0/bin/docspell-joex "$@"
diff --git a/docker/restserver.dockerfile b/docker/restserver.dockerfile
index ee0d7770..d8c38583 100644
--- a/docker/restserver.dockerfile
+++ b/docker/restserver.dockerfile
@@ -6,11 +6,11 @@ RUN apk add --no-cache openjdk11-jre unzip curl bash
 
 RUN mkdir -p /opt \
   && cd /opt \
-  && curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.5.0/docspell-restserver-0.5.0.zip \
+  && curl -L -o docspell.zip https://github.com/eikek/docspell/releases/download/v0.6.0/docspell-restserver-0.6.0.zip \
   && unzip docspell.zip \
   && rm docspell.zip \
   && apk del unzip curl
 
 EXPOSE 7880
 
-ENTRYPOINT ["/opt/docspell-restserver-0.5.0/bin/docspell-restserver"]
+ENTRYPOINT ["/opt/docspell-restserver-0.6.0/bin/docspell-restserver"]
diff --git a/nix/release.nix b/nix/release.nix
index 9f45812b..b80a578b 100644
--- a/nix/release.nix
+++ b/nix/release.nix
@@ -1,5 +1,20 @@
 rec {
   cfg = {
+    v0_6_0 = rec {
+      version = "0.6.0";
+      server = {
+        url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-restserver-${version}.zip";
+        sha256 = "1mh8f1hkhh3gy5bwvzxb2kyr7v169w59448pi67q4d49kffk3wl3";
+      };
+      joex = {
+        url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-joex-${version}.zip";
+        sha256 = "0p1jjaz19sajvzf750mav4h47q0a79p8555irbd4hpv3i8fpasnb";
+      };
+      tools = {
+        url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-tools-${version}.zip";
+        sha256 = "1yh65crg8hjmmp5ql4k44ipq1aw93qfx2jkc2lbdvi8vza5xaq89";
+      };
+    };
     v0_5_0 = rec {
       version = "0.5.0";
       server = {
@@ -77,7 +92,7 @@ rec {
     };
   };
   pkg = v: import ./pkg.nix v;
-  currentPkg = pkg cfg.v0_5_0;
+  currentPkg = pkg cfg.v0_6_0;
   module-joex = ./module-joex.nix;
   module-restserver = ./module-server.nix;
   module-consumedir = ./module-consumedir.nix;