diff --git a/test/pkg/Makefile b/test/pkg/Makefile
index 3fe596255..ad8d69aaf 100644
--- a/test/pkg/Makefile
+++ b/test/pkg/Makefile
@@ -1,19 +1,19 @@
-DIRS = $(shell find . -maxdepth 1 -mindepth 1 -type d)
+DIRS = $(dir $(shell find . -maxdepth 2 -mindepth 2 -type f -name build.yml))
 .PHONY: push forcepush tag forcetag show-tag clean
 
 push:
-	@set -e; for d in $(DIRS); do make -C "$$d" push; done
+	@set -e; for d in $(DIRS); do linuxkit pkg push "$$d"; done
 
 forcepush:
-	@set -e; for d in $(DIRS); do make -C "$$d" forcepush; done
+	@set -e; for d in $(DIRS); do linuxkit pkg push --force "$$d"; done
 
 tag:
-	@set -e; for d in $(DIRS); do make -C "$$d" tag; done
+	@set -e; for d in $(DIRS); do linuxkit pkg build "$$d"; done
 
 forcetag:
-	@set -e; for d in $(DIRS); do make -C "$$d" forcetag; done
+	@set -e; for d in $(DIRS); do linuxkit pkg build --force "$$d"; done
 
 show-tag:
-	@set -e; for d in $(DIRS); do make -C "$$d" show-tag; done
+	@set -e; for d in $(DIRS); do linuxkit pkg show-tag "$$d"; done
 
 clean:
diff --git a/test/pkg/containerd/Makefile b/test/pkg/containerd/Makefile
deleted file mode 100644
index 8bf87eb18..000000000
--- a/test/pkg/containerd/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-IMAGE=test-containerd
-DEPS=run.sh
-
-include ../../../pkg/package.mk
diff --git a/test/pkg/containerd/build.yml b/test/pkg/containerd/build.yml
new file mode 100644
index 000000000..fb2956359
--- /dev/null
+++ b/test/pkg/containerd/build.yml
@@ -0,0 +1 @@
+image: test-containerd
diff --git a/test/pkg/docker-bench/Makefile b/test/pkg/docker-bench/Makefile
deleted file mode 100644
index a2d8ba568..000000000
--- a/test/pkg/docker-bench/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-IMAGE=test-docker-bench
-DEPS=bench_runner.sh
-NETWORK=1
-ARCHES=x86_64
-
-include ../../../pkg/package.mk
-
diff --git a/test/pkg/docker-bench/build.yml b/test/pkg/docker-bench/build.yml
new file mode 100644
index 000000000..997a50fcf
--- /dev/null
+++ b/test/pkg/docker-bench/build.yml
@@ -0,0 +1,4 @@
+image: test-docker-bench
+network: true
+arches:
+  - amd64
diff --git a/test/pkg/kernel-config/Makefile b/test/pkg/kernel-config/Makefile
deleted file mode 100644
index 72f1ad11b..000000000
--- a/test/pkg/kernel-config/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-IMAGE=test-kernel-config
-DEPS=$(wildcard *.sh)
-NETWORK=1
-
-include ../../../pkg/package.mk
diff --git a/test/pkg/kernel-config/build.yml b/test/pkg/kernel-config/build.yml
new file mode 100644
index 000000000..cb24486a5
--- /dev/null
+++ b/test/pkg/kernel-config/build.yml
@@ -0,0 +1,2 @@
+image: test-kernel-config
+network: true
diff --git a/test/pkg/ltp/Makefile b/test/pkg/ltp/Makefile
deleted file mode 100644
index 94ea313e9..000000000
--- a/test/pkg/ltp/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-IMAGE=test-ltp
-DEPS=check.sh
-NETWORK=1
-ARCHES=x86_64
-
-include ../../../pkg/package.mk
diff --git a/test/pkg/ltp/build.yml b/test/pkg/ltp/build.yml
new file mode 100644
index 000000000..26459fd15
--- /dev/null
+++ b/test/pkg/ltp/build.yml
@@ -0,0 +1,4 @@
+image: test-ltp
+network: true
+arches:
+  - amd64
diff --git a/test/pkg/ns/Makefile b/test/pkg/ns/Makefile
deleted file mode 100644
index 11a74a37c..000000000
--- a/test/pkg/ns/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-IMAGE=test-ns
-NETWORK=1
-DEPS=config.template.json $(wildcard *.sh)
-ARCHES=x86_64
-
-include ../../../pkg/package.mk
diff --git a/test/pkg/ns/build.yml b/test/pkg/ns/build.yml
new file mode 100644
index 000000000..7da69976a
--- /dev/null
+++ b/test/pkg/ns/build.yml
@@ -0,0 +1,4 @@
+image: test-ns
+network: true
+arches:
+  - amd64
diff --git a/test/pkg/poweroff/Makefile b/test/pkg/poweroff/Makefile
deleted file mode 100644
index b41a45b5d..000000000
--- a/test/pkg/poweroff/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-IMAGE=poweroff
-DEPS=poweroff.sh
-
-include ../../../pkg/package.mk
-
diff --git a/test/pkg/poweroff/build.yml b/test/pkg/poweroff/build.yml
new file mode 100644
index 000000000..b83188aa2
--- /dev/null
+++ b/test/pkg/poweroff/build.yml
@@ -0,0 +1 @@
+image: poweroff
diff --git a/test/pkg/virtsock/Makefile b/test/pkg/virtsock/Makefile
deleted file mode 100644
index d1e5c5baf..000000000
--- a/test/pkg/virtsock/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-IMAGE=test-virtsock
-DEPS=
-NETWORK=1
-ARCHES=x86_64
-
-include ../../../pkg/package.mk
-
diff --git a/test/pkg/virtsock/build.yml b/test/pkg/virtsock/build.yml
new file mode 100644
index 000000000..c717c6495
--- /dev/null
+++ b/test/pkg/virtsock/build.yml
@@ -0,0 +1,4 @@
+image: test-virtsock
+network: true
+arches:
+  - amd64