diff --git a/10/Dockerfile b/10/Dockerfile
index aba9335..f487f71 100644
--- a/10/Dockerfile
+++ b/10/Dockerfile
@@ -1,15 +1,7 @@
 FROM postgres:10-alpine
 
 # Install dependencies
-RUN apk update && apk add --no-cache --virtual .build-deps && apk add \
-    bash make curl openssh git aws-cli
-
-# Install python
-RUN apk -Uuv add groff less python3
-
-# Cleanup
-RUN rm /var/cache/apk/*
-
+RUN apk add --no-cache -uv curl aws-cli python3
 
 VOLUME ["/data/backups"]
 
diff --git a/11/Dockerfile b/11/Dockerfile
index 46fef05..a8fa259 100644
--- a/11/Dockerfile
+++ b/11/Dockerfile
@@ -1,15 +1,7 @@
 FROM postgres:11-alpine
 
 # Install dependencies
-RUN apk update && apk add --no-cache --virtual .build-deps && apk add \
-    bash make curl openssh git aws-cli
-
-# Install python
-RUN apk -Uuv add groff less python3
-
-# Cleanup
-RUN rm /var/cache/apk/*
-
+RUN apk add --no-cache -uv curl aws-cli python3
 
 VOLUME ["/data/backups"]
 
diff --git a/12/Dockerfile b/12/Dockerfile
index 36dcc2d..e707545 100644
--- a/12/Dockerfile
+++ b/12/Dockerfile
@@ -1,15 +1,7 @@
 FROM postgres:12-alpine
 
 # Install dependencies
-RUN apk update && apk add --no-cache --virtual .build-deps && apk add \
-    bash make curl openssh git aws-cli
-
-# Install python
-RUN apk -Uuv add groff less python3
-
-# Cleanup
-RUN rm /var/cache/apk/*
-
+RUN apk add --no-cache -uv curl aws-cli python3
 
 VOLUME ["/data/backups"]
 
diff --git a/13/Dockerfile b/13/Dockerfile
index 03a9582..00c071f 100644
--- a/13/Dockerfile
+++ b/13/Dockerfile
@@ -1,15 +1,7 @@
 FROM postgres:13-alpine
 
 # Install dependencies
-RUN apk update && apk add --no-cache --virtual .build-deps && apk add \
-    bash make curl openssh git aws-cli
-
-# Install python
-RUN apk -Uuv add groff less python3
-
-# Cleanup
-RUN rm /var/cache/apk/*
-
+RUN apk add --no-cache -uv curl aws-cli python3
 
 VOLUME ["/data/backups"]
 
diff --git a/14/Dockerfile b/14/Dockerfile
index abd4212..ad5b4da 100644
--- a/14/Dockerfile
+++ b/14/Dockerfile
@@ -1,15 +1,7 @@
 FROM postgres:14-alpine
 
 # Install dependencies
-RUN apk update && apk add --no-cache --virtual .build-deps && apk add \
-    bash make curl openssh git aws-cli
-
-# Install python
-RUN apk -Uuv add groff less python3
-
-# Cleanup
-RUN rm /var/cache/apk/*
-
+RUN apk add --no-cache -uv curl aws-cli python3
 
 VOLUME ["/data/backups"]
 
diff --git a/15/Dockerfile b/15/Dockerfile
index e714ab7..3b835f1 100644
--- a/15/Dockerfile
+++ b/15/Dockerfile
@@ -1,15 +1,7 @@
 FROM postgres:15-alpine
 
 # Install dependencies
-RUN apk update && apk add --no-cache --virtual .build-deps && apk add \
-    bash make curl openssh git aws-cli
-
-# Install python
-RUN apk -Uuv add groff less python3
-
-# Cleanup
-RUN rm /var/cache/apk/*
-
+RUN apk add --no-cache -uv curl aws-cli python3
 
 VOLUME ["/data/backups"]
 
diff --git a/16/Dockerfile b/16/Dockerfile
index bfb65e1..8d3da53 100644
--- a/16/Dockerfile
+++ b/16/Dockerfile
@@ -1,15 +1,7 @@
 FROM postgres:16-alpine
 
 # Install dependencies
-RUN apk update && apk add --no-cache --virtual .build-deps && apk add \
-    bash make curl openssh git aws-cli
-
-# Install python
-RUN apk -Uuv add groff less python3
-
-# Cleanup
-RUN rm /var/cache/apk/*
-
+RUN apk add --no-cache -uv curl aws-cli python3
 
 VOLUME ["/data/backups"]
 
diff --git a/template/Dockerfile.template b/template/Dockerfile.template
index 7c67561..36cc38c 100644
--- a/template/Dockerfile.template
+++ b/template/Dockerfile.template
@@ -1,15 +1,7 @@
 FROM postgres:%(VERSION)s-alpine
 
 # Install dependencies
-RUN apk update && apk add --no-cache --virtual .build-deps && apk add \
-    bash make curl openssh git aws-cli
-
-# Install python
-RUN apk -Uuv add groff less python3
-
-# Cleanup
-RUN rm /var/cache/apk/*
-
+RUN apk add --no-cache -uv curl aws-cli python3
 
 VOLUME ["/data/backups"]