diff --git a/docker_test.sh b/docker_test.sh
index c8b17fa2faba86fd7d78fdd44753374b0b3bfa69..ad4c7a6fc7a13d69386dca9f62c985c1c2c783d9 100755
--- a/docker_test.sh
+++ b/docker_test.sh
@@ -50,7 +50,8 @@ fi
 
 echo -e "\n==== Remove and re-create named external volumes ===="
 for v in $(docker-compose config --volumes); do
-  docker volume rm "$v"
+  # Don't fail if volume does not exists
+  docker volume rm "$v" || true
   docker volume create "$v"
 done
 
diff --git a/pica-dokuwiki/Dockerfile b/pica-dokuwiki/Dockerfile
index b2b59e88df35cae16e19bf4d70ddb9b82d309f81..0249d3427fe9b222ed8e579a3c1837d9b6548b85 100644
--- a/pica-dokuwiki/Dockerfile
+++ b/pica-dokuwiki/Dockerfile
@@ -22,7 +22,8 @@ RUN apt-get update -y && \
     sed -i -e "s|;listen\.group\s*=\s*|listen.group = |g" /etc/php/7.3/fpm/pool.d/www.conf && \
     sed -i -e "s|;listen\.mode\s*=\s*|listen.mode = |g" /etc/php/7.3/fpm/pool.d/www.conf && \
     wget -O dokuwiki.tgz "https://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz" && \
-    tar -xzf dokuwiki.tgz -C html --strip-components 1 && \
+    mkdir update && \
+    tar -xzf dokuwiki.tgz -C update --strip-components 1 && \
     rm -f dokuwiki.tgz && \
     chown -R www-data . && \
     chmod +x /run.sh && \