diff --git a/Makefile b/Makefile
index 8276239..c96f636 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 OVERLAY := $(shell pwd)/overlay
-# FILTER := --only 3.15 kubezero --skip aarch64
-FILTER := --only 3.15 --skip aarch64
+ONLY :=
+FILTER := --only 3.15 $(ONLY) --skip aarch64
 STEP := publish
 
 all: build
diff --git a/overlay/zdt/configs/access.conf.age b/overlay/zdt/configs/access.conf.age
index 63556ad..ea2c75b 100644
Binary files a/overlay/zdt/configs/access.conf.age and b/overlay/zdt/configs/access.conf.age differ
diff --git a/overlay/zdt/scripts/setup-common b/overlay/zdt/scripts/setup-common
index 7b88f64..17ca33e 100755
--- a/overlay/zdt/scripts/setup-common
+++ b/overlay/zdt/scripts/setup-common
@@ -37,4 +37,8 @@ sed -i -e 's,#!/usr/bin/env python,#!/usr/bin/env python3,' $TARGET/usr/local/bi
 chmod +x $TARGET/usr/local/bin/ps_mem.py
 echo 'Installed ps_mem.py'
 
+# QoL
+mv $TARGET/etc/profile.d/color_prompt.sh.disabled $TARGET/etc/profile.d/color_prompt.sh
+echo 'alias rs="doas bash --login"' > $TARGET/etc/profile.d/alias.sh
+
 printf '\n# Zero Down Time config applied'
diff --git a/overlay/zdt/scripts/setup-kubernetes b/overlay/zdt/scripts/setup-kubernetes
index e986905..dde4c8e 100755
--- a/overlay/zdt/scripts/setup-kubernetes
+++ b/overlay/zdt/scripts/setup-kubernetes
@@ -7,22 +7,20 @@ SETUP=/tmp/setup.d
 TARGET=/mnt
 
 KUBE_VERSION=1.22
-AWS_IAM_VERSION=0.5.6
+AWS_IAM_VERSION=0.5.7
 
 # Enable ZDT repo
 echo "@kubezero https://cdn.zero-downtime.net/alpine/v${VERSION}/kubezero" >> "$TARGET/etc/apk/repositories"
-install -o root -g root -Dm600 -t $TARGET/etc/apk/keys $SETUP/stefan@zero-downtime.net-61bb6bfb.rsa.pub
+wget -q -O $TARGET/etc/apk/keys/stefan@zero-downtime.net-61bb6bfb.rsa.pub https://cdn.zero-downtime.net/alpine/stefan@zero-downtime.net-61bb6bfb.rsa.pub
 
 apk -U --root "$TARGET" --no-cache add \
   cri-tools@kubezero \
   cri-o@kubezero=~$KUBE_VERSION \
   kubelet@kubezero=~$KUBE_VERSION \
-  kubectl@kubezero=~$KUBE_VERSION
-
-# aws-iam-authenticator
-wget -qO $TARGET/usr/local/bin/aws-iam-authenticator https://github.com/kubernetes-sigs/aws-iam-authenticator/releases/download/v${AWS_IAM_VERSION}/aws-iam-authenticator_${AWS_IAM_VERSION}_linux_amd64 
-chmod +x $TARGET/usr/local/bin/aws-iam-authenticator
-echo "Installed aws-iam-authenticator binary version $AWS_IAM_VERSION"
+  kubectl@kubezero=~$KUBE_VERSION \
+  ecr-credential-provider@kubezero=~$KUBE_VERSION \
+  aws-iam-authenticator@kubezero=~$AWS_IAM_VERSION \
+  aws-neuron-driver@kubezero
 
 # Pre-load container images
 # echo 'Pre-loaded Kubernetes control container images'
diff --git a/overlay/zdt/scripts/setup.d/stefan@zero-downtime.net-61bb6bfb.rsa.pub b/overlay/zdt/scripts/setup.d/stefan@zero-downtime.net-61bb6bfb.rsa.pub
deleted file mode 100644
index 74a7edb..0000000
--- a/overlay/zdt/scripts/setup.d/stefan@zero-downtime.net-61bb6bfb.rsa.pub
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6BP/2VTRKfWmGtcJKf10
-tHrjiOir0BUqxTlYRwOtRv2iSs2aNaxs89sH+ZCNGxao1n+zBijhI2UFbp/nxGO5
-ftCPZicirASBmFN0XMg94nCt/vz+KCYjU+ASqlM/4uRFk0zf+loknzLgyyGD3SUT
-tR9NCsOsZWN4sRTGDAAkseCqPOTsG/7c7bDWaEr1Gq2LQdV12KU1OqkSoR+aH9lk
-xBdKMIgXssHiTQZevgMo515Z5kqaMBsOojpNUNjq7sPHmpKFlJJ93Id0QfH9duPk
-0oWzT5XJdh6lrilYDAU4Bs4QNVGr1i27dQXRL57m5Gp1u705rwNjUmzwpZtCStwd
-YwIDAQAB
------END PUBLIC KEY-----