diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile
index 8a720620f..63d3bf086 100644
--- a/test/pkg/containerd/Dockerfile
+++ b/test/pkg/containerd/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:24fe1b6bbf1fc95b484741587acb10da6dbc9211 AS mirror
+FROM linuxkit/alpine:34af9cb1990debd17fae6d4198c62ce3910d9908 AS mirror
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 # btrfs-progfs is required for btrfs test (mkfs.btrfs)
 # util-linux is required for btrfs test (losetup)
diff --git a/test/pkg/containerd/Makefile b/test/pkg/containerd/Makefile
index 675a4a515..390109916 100644
--- a/test/pkg/containerd/Makefile
+++ b/test/pkg/containerd/Makefile
@@ -1,15 +1,5 @@
-.PHONY: tag push
-default: push
-
-ORG?=linuxkit
 IMAGE=test-containerd
-DEPS=Dockerfile Makefile run.sh
+DEPS=run.sh
+NETWORK=1
 
-HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
-
-tag: $(DEPS)
-	docker build --squash --no-cache -t $(ORG)/$(IMAGE):$(HASH) .
-
-push: tag
-	DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \
-	DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)
+include ../../../pkg/package.mk
diff --git a/test/pkg/docker-bench/Dockerfile b/test/pkg/docker-bench/Dockerfile
index ec4a674be..91d2b15e9 100644
--- a/test/pkg/docker-bench/Dockerfile
+++ b/test/pkg/docker-bench/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:9bcf61f605ef0ce36cc94d59b8eac307862de6e1 AS mirror
+FROM linuxkit/alpine:34af9cb1990debd17fae6d4198c62ce3910d9908 AS mirror
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk add --no-cache --initdb -p /out \
     alpine-baselayout \
diff --git a/test/pkg/docker-bench/Makefile b/test/pkg/docker-bench/Makefile
index 4e2524dda..9caf7aaf6 100644
--- a/test/pkg/docker-bench/Makefile
+++ b/test/pkg/docker-bench/Makefile
@@ -1,15 +1,6 @@
-.PHONY: tag push
-default: push
-
-ORG?=linuxkit
 IMAGE=test-docker-bench
-DEPS=Dockerfile Makefile bench_runner.sh
+DEPS=bench_runner.sh
+NETWORK=1
 
-HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
+include ../../../pkg/package.mk
 
-tag: $(DEPS)
-	docker build --squash --no-cache -t $(ORG)/$(IMAGE):$(HASH) .
-
-push: tag
-	DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \
-	DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)
diff --git a/test/pkg/ltp/Makefile b/test/pkg/ltp/Makefile
index 8b7dba55d..09abffbc5 100644
--- a/test/pkg/ltp/Makefile
+++ b/test/pkg/ltp/Makefile
@@ -1,15 +1,5 @@
-.PHONY: tag push
-default: push
-
-ORG?=linuxkit
 IMAGE=test-ltp
-DEPS=Dockerfile Makefile check.sh
+DEPS=check.sh
+NETWORK=1
 
-HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
-
-tag: $(DEPS)
-	docker build --no-cache -t $(ORG)/$(IMAGE):$(HASH) .
-
-push: tag
-	DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \
-	DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)
+include ../../../pkg/package.mk
diff --git a/test/pkg/poweroff/Dockerfile b/test/pkg/poweroff/Dockerfile
index 5daedb6f3..9cbe1a82c 100644
--- a/test/pkg/poweroff/Dockerfile
+++ b/test/pkg/poweroff/Dockerfile
@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:9bcf61f605ef0ce36cc94d59b8eac307862de6e1 AS mirror
+FROM linuxkit/alpine:34af9cb1990debd17fae6d4198c62ce3910d9908 AS mirror
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk add --no-cache --initdb -p /out alpine-baselayout busybox musl
 RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
diff --git a/test/pkg/poweroff/Makefile b/test/pkg/poweroff/Makefile
index 05e38c2ab..b41a45b5d 100644
--- a/test/pkg/poweroff/Makefile
+++ b/test/pkg/poweroff/Makefile
@@ -1,15 +1,5 @@
-.PHONY: tag push
-default: push
-
-ORG?=linuxkit
 IMAGE=poweroff
-DEPS=Dockerfile Makefile poweroff.sh
+DEPS=poweroff.sh
 
-HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
+include ../../../pkg/package.mk
 
-tag: $(DEPS)
-	docker build --no-cache --network=none -t $(ORG)/$(IMAGE):$(HASH) .
-
-push: tag
-	DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \
-	DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)
diff --git a/test/pkg/virtsock/Dockerfile b/test/pkg/virtsock/Dockerfile
index 4641b3372..aa96e7c98 100644
--- a/test/pkg/virtsock/Dockerfile
+++ b/test/pkg/virtsock/Dockerfile
@@ -1,10 +1,10 @@
-FROM linuxkit/alpine:9bcf61f605ef0ce36cc94d59b8eac307862de6e1 AS mirror
+FROM linuxkit/alpine:34af9cb1990debd17fae6d4198c62ce3910d9908 AS mirror
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk add --no-cache --initdb -p /out \
     tini
 RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
 
-FROM linuxkit/alpine:9bcf61f605ef0ce36cc94d59b8eac307862de6e1 AS build
+FROM linuxkit/alpine:34af9cb1990debd17fae6d4198c62ce3910d9908 AS build
 
 RUN apk add --no-cache go musl-dev git make
 ENV GOPATH=/go PATH=$PATH:/go/bin
diff --git a/test/pkg/virtsock/Makefile b/test/pkg/virtsock/Makefile
index 8e5d71545..336e0c224 100644
--- a/test/pkg/virtsock/Makefile
+++ b/test/pkg/virtsock/Makefile
@@ -1,15 +1,6 @@
-.PHONY: tag push
-default: push
-
-ORG?=linuxkit
 IMAGE=test-virtsock
-DEPS=Dockerfile Makefile
+DEPS=
+NETWORK=1
 
-HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
+include ../../../pkg/package.mk
 
-tag: $(DEPS)
-	docker build --squash --no-cache -t $(ORG)/$(IMAGE):$(HASH) .
-
-push: tag
-	DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \
-	DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)