diff --git a/kernel/Makefile b/kernel/Makefile
index a5524a77d..726fbeddc 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -36,19 +36,14 @@ endif
 
 REPO_ROOT:=$(shell git rev-parse --show-toplevel)
 
-# Path to push-manifest.sh
-PUSH_MANIFEST:=$(REPO_ROOT)/scripts/push-manifest.sh
-
 # determine our architecture
 BUILDERARCH=
 ifneq ($(ARCH),)
 ifeq ($(ARCH),$(filter $(ARCH),x86_64 amd64))
-SUFFIX=-amd64
 override ARCH=x86_64
 BUILDERARCH=amd64
 endif
 ifeq ($(ARCH),$(filter $(ARCH),aarch64 arm64))
-SUFFIX=-arm64
 override ARCH=aarch64
 BUILDERARCH=arm64
 endif
@@ -143,9 +138,7 @@ push-%: notdirty build-% pushkernel-% tagbuilder-% pushtools-%;
 # we cannot assume that IMAGE_BUILDER is available locally, whether in docker image cache or limuxkit cache
 tagbuilder-%: notdirty
 	$(eval BUILDER_IMAGE=$(call baseimage,$*)-builder)
-	docker tag $(IMAGE_BUILDER) $(BUILDER_IMAGE)$(SUFFIX) && \
-	docker push $(BUILDER_IMAGE)$(SUFFIX) && \
-	$(PUSH_MANIFEST) $(BUILDER_IMAGE)
+	linuxkit pkg remote-tag $(IMAGE_BUILDER) $(BUILDER_IMAGE)
 
 pushkernel-%: pushplainkernel-% pushdebugkernel-%;
 
diff --git a/test/cases/020_kernel/019_config_6.6.x/test.yml b/test/cases/020_kernel/019_config_6.6.x/test.yml
index df9a7ba47..8ab559173 100644
--- a/test/cases/020_kernel/019_config_6.6.x/test.yml
+++ b/test/cases/020_kernel/019_config_6.6.x/test.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:6.6.13-ad4d0da9e582d714cf61c8d99468cc7c1109bce5
+  image: linuxkit/kernel:6.6.13-e274bc71d6552570c922d2fca6c6481d1f9f045a
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:07d37c3ae7fad5ddcb54c8dc65774ae050851f04
diff --git a/test/cases/020_kernel/119_kmod_6.6.x/Dockerfile b/test/cases/020_kernel/119_kmod_6.6.x/Dockerfile
index bc1cc6982..cc48b0679 100644
--- a/test/cases/020_kernel/119_kmod_6.6.x/Dockerfile
+++ b/test/cases/020_kernel/119_kmod_6.6.x/Dockerfile
@@ -3,7 +3,7 @@
 # In the last stage, it creates a package, which can be used for
 # testing.
 
-FROM linuxkit/kernel:6.6.13-ad4d0da9e582d714cf61c8d99468cc7c1109bce5 AS ksrc
+FROM linuxkit/kernel:6.6.13-e274bc71d6552570c922d2fca6c6481d1f9f045a AS ksrc
 
 # Extract headers and compile module
 FROM linuxkit/kernel:6.6.13-builder AS build
diff --git a/test/cases/020_kernel/119_kmod_6.6.x/test.yml b/test/cases/020_kernel/119_kmod_6.6.x/test.yml
index 8616dfffa..1e97d6583 100644
--- a/test/cases/020_kernel/119_kmod_6.6.x/test.yml
+++ b/test/cases/020_kernel/119_kmod_6.6.x/test.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:6.6.13-ad4d0da9e582d714cf61c8d99468cc7c1109bce5
+  image: linuxkit/kernel:6.6.13-e274bc71d6552570c922d2fca6c6481d1f9f045a
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:07d37c3ae7fad5ddcb54c8dc65774ae050851f04