diff --git a/containers/tools/pgbackup/Dockerfile b/containers/tools/pgbackup/Dockerfile
index 64b9eb9..8af1739 100644
--- a/containers/tools/pgbackup/Dockerfile
+++ b/containers/tools/pgbackup/Dockerfile
@@ -4,13 +4,12 @@ LABEL org.opencontainers.image.source="https://github.com/haiku/infrastructure"
 LABEL org.opencontainers.image.url="https://github.com/haiku/infrastructure/tree/main/containers/tools/pgbackup"
 LABEL org.opencontainers.image.authors="Haiku, Inc."
 LABEL org.opencontainers.image.vendor="Haiku, Inc."
-LABEL org.opencontainers.image.description="cgit Interface for Haiku"
+LABEL org.opencontainers.image.description="pgbackup for Haiku Infrastructure"
 
 RUN apk add --update bash rsync gnupg rsync xz tar postgresql14-client jq \
   && if [ "$(uname -m)" = "x86_64" ]; then wget https://dl.min.io/client/mc/release/linux-amd64/mc -O /usr/local/bin/mc; fi \
-  && if [ "$(uname -m)" = "aarch64" ]; then wget https://dl.min.io/client/mc/release/linux-arm64/mc -O /usr/local/bin/mc; fi;
+  && if [ "$(uname -m)" = "aarch64" ]; then wget https://dl.min.io/client/mc/release/linux-arm64/mc -O /usr/local/bin/mc; fi \
+  && chmod 755 /usr/local/bin/mc
 
 ADD pgsync.sh /usr/local/bin/pgsync
-RUN chmod 755 /usr/local/bin/mc
-
 ENTRYPOINT ["/usr/local/bin/pgsync"]
diff --git a/containers/tools/pvbackup/Dockerfile b/containers/tools/pvbackup/Dockerfile
index b2d7282..345026c 100644
--- a/containers/tools/pvbackup/Dockerfile
+++ b/containers/tools/pvbackup/Dockerfile
@@ -1,15 +1,16 @@
-FROM alpine
+FROM docker.io/alpine:3.20
 
-MAINTAINER Haiku, Inc <haiku-inc@gmail.com>
-LABEL org.opencontainers.image.source https://github.com/haiku/infrastructure
-LABEL org.opencontainers.image.url https://github.com/haiku/infrastructure/tree/master/containers/tools/pvbackup
-LABEL org.opencontainers.image.vendor Haiku, Inc.
+LABEL org.opencontainers.image.source="https://github.com/haiku/infrastructure"
+LABEL org.opencontainers.image.url="https://github.com/haiku/infrastructure/tree/main/containers/tools/pvbackup"
+LABEL org.opencontainers.image.authors="Haiku, Inc."
+LABEL org.opencontainers.image.vendor="Haiku, Inc."
+LABEL org.opencontainers.image.description="pvbackup for Haiku Infrastructure"
 
-RUN apk add --update bash rsync gnupg rsync xz tar
+RUN apk add --update bash rsync gnupg rsync xz tar \
+  && if [ "$(uname -m)" = "x86_64" ]; then wget https://dl.min.io/client/mc/release/linux-amd64/mc -O /usr/local/bin/mc; fi \
+  && if [ "$(uname -m)" = "aarch64" ]; then wget https://dl.min.io/client/mc/release/linux-arm64/mc -O /usr/local/bin/mc; fi \
+  && chmod 755 /usr/local/bin/mc \
+  && mkdir -p /pvs
 
-ADD https://dl.minio.io/client/mc/release/linux-amd64/mc /usr/local/bin/mc
 ADD pvsync.sh /usr/local/bin/pvsync
-RUN chmod 755 /usr/local/bin/mc
-RUN mkdir -p /pvs
-
 ENTRYPOINT ["/usr/local/bin/pvsync"]
diff --git a/containers/tools/pvbackup/Makefile b/containers/tools/pvbackup/Makefile
index ea23c5a..d29b0b3 100644
--- a/containers/tools/pvbackup/Makefile
+++ b/containers/tools/pvbackup/Makefile
@@ -1,6 +1,4 @@
-VERSION = 1.2
+VERSION = $(shell cat VERSION | grep -Ev "^#" | tail -1)-development
 REGISTRY = ghcr.io/haiku
 default:
-	docker build --no-cache --tag ${REGISTRY}/pvbackup:${VERSION} .
-push:
-	docker push ${REGISTRY}/pvbackup:${VERSION}
+	podman build --no-cache --tag ${REGISTRY}/pvbackup:${VERSION} .