diff --git a/docker/prod/Dockerfile.amd64 b/docker/prod/Dockerfile.amd64
index ecdf81c..2e89682 100644
--- a/docker/prod/Dockerfile.amd64
+++ b/docker/prod/Dockerfile.amd64
@@ -213,7 +213,11 @@ RUN \
 COPY --from=pict-rs-builder /opt/build/pict-rs/target/$TARGET/$BUILD_MODE/pict-rs /usr/local/bin/pict-rs
 COPY --from=imagemagick-builder /usr/local /usr/local
 
-ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
+ENV \
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
+
+RUN \
+ chown pictrs:pictrs /mnt
 
 VOLUME /mnt
 WORKDIR /opt/pict-rs
diff --git a/docker/prod/Dockerfile.arm32v7 b/docker/prod/Dockerfile.arm32v7
index 7c2cd67..5c143cc 100644
--- a/docker/prod/Dockerfile.arm32v7
+++ b/docker/prod/Dockerfile.arm32v7
@@ -214,7 +214,11 @@ RUN \
 COPY --from=pict-rs-builder /opt/build/pict-rs/target/$TARGET/$BUILD_MODE/pict-rs /usr/local/bin/pict-rs
 COPY --from=imagemagick-builder /usr/local /usr/local
 
-ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
+ENV \
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
+
+RUN \
+ chown pictrs:pictrs /mnt
 
 VOLUME /mnt
 WORKDIR /opt/pict-rs
diff --git a/docker/prod/Dockerfile.arm64v8 b/docker/prod/Dockerfile.arm64v8
index 4c06232..0dcb760 100644
--- a/docker/prod/Dockerfile.arm64v8
+++ b/docker/prod/Dockerfile.arm64v8
@@ -214,7 +214,11 @@ RUN \
 COPY --from=pict-rs-builder /opt/build/pict-rs/target/$TARGET/$BUILD_MODE/pict-rs /usr/local/bin/pict-rs
 COPY --from=imagemagick-builder /usr/local /usr/local
 
-ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
+ENV \
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
+
+RUN \
+ chown pictrs:pictrs /mnt
 
 VOLUME /mnt
 WORKDIR /opt/pict-rs
diff --git a/docker/prod/deploy.sh b/docker/prod/deploy.sh
index c98cb83..d285b3f 100755
--- a/docker/prod/deploy.sh
+++ b/docker/prod/deploy.sh
@@ -12,7 +12,7 @@ function print_help() {
     echo "deploy.sh"
     echo ""
     echo "Usage:"
-    echo "	deploy.sh [tag]"
+    echo "	deploy.sh [tag] [branch]"
     echo ""
     echo "Args:"
     echo "	tag: The git tag to be applied to the repository and docker build"
@@ -25,6 +25,8 @@ function build_image() {
 
     ./build-image.sh asonix/pictrs $tag $arch
 
+    docker tag asonix/pictrs:$arch-$tag asonix/pictrs:$arch-latest
+
     docker push asonix/pictrs:$arch-$tag
     docker push asonix/pictrs:$arch-latest
 }
diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml
index 4882ab8..68eeac1 100644
--- a/docker/prod/docker-compose.yml
+++ b/docker/prod/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.3'
 
 services:
   pictrs:
-    image: asonix/pictrs:v0.2.0-alpha.2-r1
+    image: asonix/pictrs:v0.2.0-alpha.2-r2
     ports:
       - "127.0.0.1:8080:8080"
     restart: always