diff --git a/Makefile b/Makefile
index 5e02f17..7f7d238 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,10 @@
-BUILDER ?= v3.15.0
-RELEASE := v1.21
+BUILDER ?= v3.15.1-4
+RELEASE := v3.15
 
 .PHONY: builder aports_update
 
+all: build
+
 packages:
 	mkdir -p packages
 distfiles:
@@ -15,7 +17,7 @@ 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
+build: packages distfiles aports_update
 	podman run -ti --rm \
 		-v ${PWD}/distfiles:/var/cache/distfiles \
 		-v ${PWD}/packages:/home/alpine/packages \
diff --git a/v1.21/cri-tools/APKBUILD b/v3.15/cri-tools/APKBUILD
similarity index 100%
rename from v1.21/cri-tools/APKBUILD
rename to v3.15/cri-tools/APKBUILD
diff --git a/v1.21/kubernetes/APKBUILD b/v3.15/kubernetes/APKBUILD
similarity index 100%
rename from v1.21/kubernetes/APKBUILD
rename to v3.15/kubernetes/APKBUILD
diff --git a/v1.21/kubernetes/ensure-cgo-usage.patch b/v3.15/kubernetes/ensure-cgo-usage.patch
similarity index 100%
rename from v1.21/kubernetes/ensure-cgo-usage.patch
rename to v3.15/kubernetes/ensure-cgo-usage.patch
diff --git a/v1.21/kubernetes/kube-apiserver.confd b/v3.15/kubernetes/kube-apiserver.confd
similarity index 100%
rename from v1.21/kubernetes/kube-apiserver.confd
rename to v3.15/kubernetes/kube-apiserver.confd
diff --git a/v1.21/kubernetes/kube-apiserver.initd b/v3.15/kubernetes/kube-apiserver.initd
similarity index 100%
rename from v1.21/kubernetes/kube-apiserver.initd
rename to v3.15/kubernetes/kube-apiserver.initd
diff --git a/v1.21/kubernetes/kube-apiserver.logrotated b/v3.15/kubernetes/kube-apiserver.logrotated
similarity index 100%
rename from v1.21/kubernetes/kube-apiserver.logrotated
rename to v3.15/kubernetes/kube-apiserver.logrotated
diff --git a/v1.21/kubernetes/kube-controller-manager.confd b/v3.15/kubernetes/kube-controller-manager.confd
similarity index 100%
rename from v1.21/kubernetes/kube-controller-manager.confd
rename to v3.15/kubernetes/kube-controller-manager.confd
diff --git a/v1.21/kubernetes/kube-controller-manager.initd b/v3.15/kubernetes/kube-controller-manager.initd
similarity index 100%
rename from v1.21/kubernetes/kube-controller-manager.initd
rename to v3.15/kubernetes/kube-controller-manager.initd
diff --git a/v1.21/kubernetes/kube-controller-manager.logrotated b/v3.15/kubernetes/kube-controller-manager.logrotated
similarity index 100%
rename from v1.21/kubernetes/kube-controller-manager.logrotated
rename to v3.15/kubernetes/kube-controller-manager.logrotated
diff --git a/v1.21/kubernetes/kube-proxy.confd b/v3.15/kubernetes/kube-proxy.confd
similarity index 100%
rename from v1.21/kubernetes/kube-proxy.confd
rename to v3.15/kubernetes/kube-proxy.confd
diff --git a/v1.21/kubernetes/kube-proxy.initd b/v3.15/kubernetes/kube-proxy.initd
similarity index 100%
rename from v1.21/kubernetes/kube-proxy.initd
rename to v3.15/kubernetes/kube-proxy.initd
diff --git a/v1.21/kubernetes/kube-proxy.logrotated b/v3.15/kubernetes/kube-proxy.logrotated
similarity index 100%
rename from v1.21/kubernetes/kube-proxy.logrotated
rename to v3.15/kubernetes/kube-proxy.logrotated
diff --git a/v1.21/kubernetes/kube-scheduler.confd b/v3.15/kubernetes/kube-scheduler.confd
similarity index 100%
rename from v1.21/kubernetes/kube-scheduler.confd
rename to v3.15/kubernetes/kube-scheduler.confd
diff --git a/v1.21/kubernetes/kube-scheduler.initd b/v3.15/kubernetes/kube-scheduler.initd
similarity index 100%
rename from v1.21/kubernetes/kube-scheduler.initd
rename to v3.15/kubernetes/kube-scheduler.initd
diff --git a/v1.21/kubernetes/kube-scheduler.logrotated b/v3.15/kubernetes/kube-scheduler.logrotated
similarity index 100%
rename from v1.21/kubernetes/kube-scheduler.logrotated
rename to v3.15/kubernetes/kube-scheduler.logrotated
diff --git a/v1.21/kubernetes/kubelet.confd b/v3.15/kubernetes/kubelet.confd
similarity index 100%
rename from v1.21/kubernetes/kubelet.confd
rename to v3.15/kubernetes/kubelet.confd
diff --git a/v1.21/kubernetes/kubelet.initd b/v3.15/kubernetes/kubelet.initd
similarity index 100%
rename from v1.21/kubernetes/kubelet.initd
rename to v3.15/kubernetes/kubelet.initd
diff --git a/v1.21/kubernetes/kubelet.logrotated b/v3.15/kubernetes/kubelet.logrotated
similarity index 100%
rename from v1.21/kubernetes/kubelet.logrotated
rename to v3.15/kubernetes/kubelet.logrotated
diff --git a/v1.21/kubernetes/make-e2e_node-run-over-distro-bins.patch b/v3.15/kubernetes/make-e2e_node-run-over-distro-bins.patch
similarity index 100%
rename from v1.21/kubernetes/make-e2e_node-run-over-distro-bins.patch
rename to v3.15/kubernetes/make-e2e_node-run-over-distro-bins.patch
diff --git a/v1.21/kubernetes/make-test-cmd-run-over-hyperkube-based-kubectl.patch b/v3.15/kubernetes/make-test-cmd-run-over-hyperkube-based-kubectl.patch
similarity index 100%
rename from v1.21/kubernetes/make-test-cmd-run-over-hyperkube-based-kubectl.patch
rename to v3.15/kubernetes/make-test-cmd-run-over-hyperkube-based-kubectl.patch