diff --git a/alpine-cloud-images/clouds/aws.py b/alpine-cloud-images/clouds/aws.py
index 68728fa..d40f3d8 100644
--- a/alpine-cloud-images/clouds/aws.py
+++ b/alpine-cloud-images/clouds/aws.py
@@ -192,7 +192,7 @@ class AWSCloudAdapter(CloudAdapterInterface):
                 Architecture=self.ARCH[ic.arch],
                 BlockDeviceMappings=[{
                     'DeviceName': '/dev/xvda',
-                    'Ebs': {'SnapshotId': snapshot_id}
+                    'Ebs': {'SnapshotId': snapshot_id, 'VolumeType': 'gp3'}
                 }],
                 Description=description,
                 EnaSupport=True,
diff --git a/cleanup_amis.sh b/cleanup_amis.sh
index 672befd..d889d20 100755
--- a/cleanup_amis.sh
+++ b/cleanup_amis.sh
@@ -5,8 +5,8 @@ echo "Are you really sure as AMIs might be used by customers !!"
 read
 
 #TAG_FILTER="Name=tag:project,Values=zdt-alpine"
-TAG_FILTER="Name=tag:Name,Values=zdt-alpine-3.16.2-x86_64-bios-tiny-minimal-r1"
-#TAG_FILTER="Name=tag:Name,Values=zdt-alpine-3.16.2-x86_64-bios-tiny-kubezero-1.23.10-r0"
+#TAG_FILTER="Name=tag:Name,Values=zdt-alpine-3.16.0-x86_64-bios-tiny-minimal-r0"
+TAG_FILTER="Name=tag:Name,Values=zdt-alpine-3.16.2-x86_64-bios-tiny-kubezero-1.23.10-r1"
 
 #for r in $(aws ec2 describe-regions --query "Regions[].{Name:RegionName}" --output text); do
 for r in ap-southeast-2 ca-central-1 eu-central-1 us-east-1 us-west-1 us-west-2; do
diff --git a/overlay/zdt/configs/access.conf.age b/overlay/zdt/configs/access.conf.age
deleted file mode 100644
index 2598b05..0000000
Binary files a/overlay/zdt/configs/access.conf.age and /dev/null differ
diff --git a/overlay/zdt/configs/common-packages.conf b/overlay/zdt/configs/common-packages.conf
index e97146e..14b1323 100644
--- a/overlay/zdt/configs/common-packages.conf
+++ b/overlay/zdt/configs/common-packages.conf
@@ -1,4 +1,5 @@
 bash            = true
+eudev           = true
 jq              = true
 yq              = true
 logrotate       = true
@@ -13,10 +14,12 @@ nvme-cli        = true
 xfsprogs        = true
 dhclient        = true
 monit           = true
-tiny-cloud	  		 	= main-edge
-tiny-cloud-openrc		= main-edge
-tiny-cloud-network	= main-edge
-tiny-cloud-aws			= main-edge
-conmon							= community-edge
-prometheus-node-exporter				= true
-prometheus-wireguard-exporter		= true
+busybox-extras  = true
+tcpdump         = true
+tiny-cloud          = edge-main
+tiny-cloud-openrc   = edge-main
+tiny-cloud-network  = edge-main
+tiny-cloud-aws      = edge-main
+conmon              = edge-community
+prometheus-node-exporter       = true
+prometheus-wireguard-exporter  = true
diff --git a/overlay/zdt/configs/common-services.conf b/overlay/zdt/configs/common-services.conf
index 039c859..2e5bc23 100644
--- a/overlay/zdt/configs/common-services.conf
+++ b/overlay/zdt/configs/common-services.conf
@@ -1,5 +1,6 @@
 sysinit {
   cgroups = true
+  udev = true
 }
 
 boot {
diff --git a/overlay/zdt/configs/common.conf b/overlay/zdt/configs/common.conf
index 2315a42..c07581e 100644
--- a/overlay/zdt/configs/common.conf
+++ b/overlay/zdt/configs/common.conf
@@ -5,8 +5,8 @@ packages { include required("common-packages.conf") }
 services { include required("common-services.conf") }
 
 repos {
-  "https://dl-cdn.alpinelinux.org/alpine/edge/main" = main-edge
-  "https://dl-cdn.alpinelinux.org/alpine/edge/community" = community-edge
+  "https://dl-cdn.alpinelinux.org/alpine/edge/main" = edge-main
+  "https://dl-cdn.alpinelinux.org/alpine/edge/community" = edge-community
 }
 
 WHEN {
diff --git a/overlay/zdt/configs/kubezero-packages.conf b/overlay/zdt/configs/kubezero-packages.conf
new file mode 100644
index 0000000..e69de29
diff --git a/overlay/zdt/configs/kubezero.conf b/overlay/zdt/configs/kubezero.conf
index 3b06187..f3d5e56 100644
--- a/overlay/zdt/configs/kubezero.conf
+++ b/overlay/zdt/configs/kubezero.conf
@@ -2,9 +2,11 @@
 
 include required("common.conf")
 
+packages { include required("kubezero-packages.conf") }
+
 description = [ "- https://kubezero.com" ]
 name = [ kubezero-1.23.10 ]
-size = 2G
+# size = 2G
 
 WHEN {
   kubezero {
diff --git a/overlay/zdt/configs/minimal.conf b/overlay/zdt/configs/minimal.conf
index 105ee9b..b7f7c87 100644
--- a/overlay/zdt/configs/minimal.conf
+++ b/overlay/zdt/configs/minimal.conf
@@ -4,3 +4,7 @@ include required("common.conf")
 
 description = [ "- https://zero-downtime.net/cloud" ]
 name = [ minimal ]
+
+#kernel_options {
+#  "lsm=landlock,lockdown,yama,loadpin,safesetid,integrity,apparmor" = true
+#}