diff --git a/projects/kubernetes/Makefile b/projects/kubernetes/Makefile
index 70dff6d93..a34225572 100644
--- a/projects/kubernetes/Makefile
+++ b/projects/kubernetes/Makefile
@@ -7,13 +7,13 @@ INIT_YAML += network.yaml
 all: tag-container-images build-vm-images
 
 tag-container-images:
-	$(MAKE) -C kubernetes tag
+	linuxkit pkg build kubernetes
 
 tag-cache-images:
 	$(MAKE) -C image-cache tag
 
 push-container-images:
-	$(MAKE) -C kubernetes push
+	linuxkit pkg push kubernetes
 	$(MAKE) -C image-cache push
 
 build-vm-images: kube-master.iso kube-node.iso
diff --git a/projects/kubernetes/cri-containerd/Makefile b/projects/kubernetes/cri-containerd/Makefile
deleted file mode 100644
index fe0253576..000000000
--- a/projects/kubernetes/cri-containerd/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-ORG?=linuxkitprojects
-IMAGE=cri-containerd
-NETWORK=1
-NOTRUST=1
-ARCHES=x86_64
-
-include ../../../pkg/package.mk
diff --git a/projects/kubernetes/cri-containerd/build.yml b/projects/kubernetes/cri-containerd/build.yml
new file mode 100644
index 000000000..bd66969a4
--- /dev/null
+++ b/projects/kubernetes/cri-containerd/build.yml
@@ -0,0 +1,6 @@
+org: linuxkitprojects
+image: cri-containerd
+network: true
+disable-content-trust: true
+arches:
+  - amd64
diff --git a/projects/kubernetes/kubernetes/Makefile b/projects/kubernetes/kubernetes/Makefile
deleted file mode 100644
index f4fd3f8f8..000000000
--- a/projects/kubernetes/kubernetes/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-ORG?=linuxkitprojects
-IMAGE=kubernetes
-NETWORK=1
-NOTRUST=1
-ARCHES=x86_64
-
-include ../../../pkg/package.mk
diff --git a/projects/kubernetes/kubernetes/build.yml b/projects/kubernetes/kubernetes/build.yml
new file mode 100644
index 000000000..878b405d2
--- /dev/null
+++ b/projects/kubernetes/kubernetes/build.yml
@@ -0,0 +1,6 @@
+org: linuxkitprojects
+image: kubernetes
+network: true
+disable-content-trust: true
+arches:
+  - amd64
diff --git a/projects/swarmd/swarmd/Makefile b/projects/swarmd/swarmd/Makefile
deleted file mode 100644
index f57b5fc59..000000000
--- a/projects/swarmd/swarmd/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-ORG?=linuxkitprojects
-IMAGE=swarmd
-NETWORK=1
-NOTRUST=1
-
-include ../../../pkg/package.mk
diff --git a/projects/swarmd/swarmd/build.yml b/projects/swarmd/swarmd/build.yml
new file mode 100644
index 000000000..735f62d28
--- /dev/null
+++ b/projects/swarmd/swarmd/build.yml
@@ -0,0 +1,4 @@
+org: linuxkitprojects
+image: swarmd
+network: true
+disable-content-trust: true