diff --git a/Makefile b/Makefile
index b963629..e47780c 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ STEP := publish
 all: build
 
 build:
-	cd alpine-cloud-images && ./build $(STEP) --clean --revise $(FILTER) --custom $(OVERLAY)/zdt --vars $(OVERLAY)/zdt/zdt.hcl
+	cd alpine-cloud-images && ./build $(STEP) --clean --no-pad-uefi-bins --revise $(FILTER) --custom $(OVERLAY)/zdt --vars $(OVERLAY)/zdt/zdt.hcl
 
 clean:
 	rm -rf alpine-cloud-images/work
@@ -38,3 +38,6 @@ scan-image:
 	qemu-nbd -c /dev/nbd0 --read-only alpine-cloud-images/work/images/aws/3.15.4-x86_64-bios-cloudinit-aws-kubezero/image.qcow2
 	mount /dev/nbd0 /mnt/temp/
 	trivy rootfs /mnt/temp
+
+pull-upstream: ## pull latest shared alpine-cloud-images
+	git stash && git subtree pull --prefix alpine-cloud-images git@gitlab.alpinelinux.org:alpine/cloud/alpine-cloud-images.git main --squash && git stash pop
diff --git a/overlay/zdt/configs/access.conf.age b/overlay/zdt/configs/access.conf.age
index e7591ef..680b234 100644
Binary files a/overlay/zdt/configs/access.conf.age and b/overlay/zdt/configs/access.conf.age differ
diff --git a/overlay/zdt/configs/common-packages.conf b/overlay/zdt/configs/edition/common-packages.conf
similarity index 100%
rename from overlay/zdt/configs/common-packages.conf
rename to overlay/zdt/configs/edition/common-packages.conf
diff --git a/overlay/zdt/configs/common-services.conf b/overlay/zdt/configs/edition/common-services.conf
similarity index 100%
rename from overlay/zdt/configs/common-services.conf
rename to overlay/zdt/configs/edition/common-services.conf
diff --git a/overlay/zdt/configs/common.conf b/overlay/zdt/configs/edition/common.conf
similarity index 100%
rename from overlay/zdt/configs/common.conf
rename to overlay/zdt/configs/edition/common.conf
diff --git a/overlay/zdt/configs/kubezero-packages.conf b/overlay/zdt/configs/edition/kubezero-packages.conf
similarity index 100%
rename from overlay/zdt/configs/kubezero-packages.conf
rename to overlay/zdt/configs/edition/kubezero-packages.conf
diff --git a/overlay/zdt/configs/kubezero.conf b/overlay/zdt/configs/edition/kubezero.conf
similarity index 100%
rename from overlay/zdt/configs/kubezero.conf
rename to overlay/zdt/configs/edition/kubezero.conf
diff --git a/overlay/zdt/configs/minimal.conf b/overlay/zdt/configs/edition/minimal.conf
similarity index 100%
rename from overlay/zdt/configs/minimal.conf
rename to overlay/zdt/configs/edition/minimal.conf
diff --git a/overlay/zdt/configs/machine/metal.conf b/overlay/zdt/configs/machine/metal.conf
new file mode 100644
index 0000000..637f211
--- /dev/null
+++ b/overlay/zdt/configs/machine/metal.conf
@@ -0,0 +1,14 @@
+# bare metal
+
+name         = ["metal"]
+machine_name = "Bare Metal"
+
+# Kernel and firmware are 900M !
+size  = 2G
+
+EXCLUDE = ["aws"]
+
+packages.linux-virt = null
+packages.linux-lts  = true
+
+# TODO: other kernel_modules, kernel_options, or initfs_features?
diff --git a/overlay/zdt/configs/machine/vm.conf b/overlay/zdt/configs/machine/vm.conf
new file mode 100644
index 0000000..6f1690c
--- /dev/null
+++ b/overlay/zdt/configs/machine/vm.conf
@@ -0,0 +1,4 @@
+name           = [vm]      # we need a name to be able to skip
+machine_name    = "Virtual"
+
+# all image defaults are for virutal machines
diff --git a/overlay/zdt/configs/zdt.conf b/overlay/zdt/configs/zdt.conf
index d5ec723..c8392a1 100644
--- a/overlay/zdt/configs/zdt.conf
+++ b/overlay/zdt/configs/zdt.conf
@@ -45,6 +45,10 @@ Dimensions {
     #cloudinit { include required("bootstrap/cloudinit.conf") }
     tiny { include required("bootstrap/tiny.conf") }
   }
+  machine {
+    vm      { include required("machine/vm.conf") }
+    metal   { include required("machine/metal.conf") }
+  }
   cloud {
     aws { include required("cloud/aws.conf") }
     aws.regions {
@@ -57,9 +61,9 @@ Dimensions {
       us-west-2 = true
     }
   }
-  artifact {
-    minimal { include required("minimal.conf") }
-    kubezero { include required("kubezero.conf") }
+  edition {
+    minimal { include required("edition/minimal.conf") }
+    kubezero { include required("edition/kubezero.conf") }
   }
 }