diff --git a/.gitignore b/.gitignore
index 5f95787..5aad05d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 aports
 distfiles
 packages
+work
diff --git a/Makefile b/Makefile
index 7f7d238..365fae7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
-BUILDER ?= v3.15.1-4
+BUILDER ?= v3.15.2-1
 RELEASE := v3.15
+PKG := '*'
 
 .PHONY: builder aports_update
 
@@ -9,6 +10,8 @@ packages:
 	mkdir -p packages
 distfiles:
 	mkdir -p distfiles
+work:
+	mkdir -p work
 
 aports:
 	git clone https://gitlab.alpinelinux.org/alpine/aports.git --depth=1
@@ -17,14 +20,15 @@ aports_update: aports
 	GIT_DIR=aports/.git git pull origin master
 
 # Mounts release into /work of the builder container to build all
-build: packages distfiles aports_update
+build: packages distfiles aports_update work
 	podman run -ti --rm \
 		-v ${PWD}/distfiles:/var/cache/distfiles \
 		-v ${PWD}/packages:/home/alpine/packages \
-		-v ${HOME}/.gitconfig/:/home/alpine/.gitconfig \
-		-v ${HOME}/.abuild/:/home/alpine/.abuild \
-		-v ${PWD}/$(RELEASE)/:/home/alpine/work \
-		public.ecr.aws/zero-downtime/alpine-builder:${BUILDER}
+		-v ${PWD}/work/:/home/alpine/work \
+		-v ${PWD}/$(RELEASE)/:/home/alpine/src:ro \
+		-v ${HOME}/.gitconfig/:/home/alpine/.gitconfig:ro \
+		-v ${HOME}/.abuild/:/home/alpine/.abuild:ro \
+		public.ecr.aws/zero-downtime/alpine-builder:${BUILDER} $(PKG)
 
 upload:
 	aws s3 cp --recursive packages/work/x86_64/ s3://zero-downtime-web/cdn/alpine/$(RELEASE)/kubezero/x86_64/ --exclude APKINDEX.tar.gz