diff --git a/.github/workflows/build-kata-static-tarball-amd64.yaml b/.github/workflows/build-kata-static-tarball-amd64.yaml
index 09ddfd05d0..1ef136ff1c 100644
--- a/.github/workflows/build-kata-static-tarball-amd64.yaml
+++ b/.github/workflows/build-kata-static-tarball-amd64.yaml
@@ -2,6 +2,10 @@ name: CI | Build kata-static tarball for amd64
 on:
   workflow_call:
     inputs:
+      stage:
+        required: false
+        type: string
+        default: test
       tarball-suffix:
         required: false
         type: string
@@ -15,8 +19,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
+        stage: ${{ inputs.stage }}
         asset:
           - cloud-hypervisor
+          - cloud-hypervisor-glibc
           - firecracker
           - kernel
           - kernel-sev
@@ -34,10 +40,14 @@ jobs:
           - rootfs-image
           - rootfs-image-tdx
           - rootfs-initrd
+          - rootfs-initrd-mariner
           - rootfs-initrd-sev
           - shim-v2
           - tdvf
           - virtiofsd
+        exclude:
+          - stage: release
+            asset: cloud-hypervisor-glibc
     steps:
       - name: Login to Kata Containers quay.io
         if: ${{ inputs.push-to-registry == 'yes' }}
diff --git a/.github/workflows/release-amd64.yaml b/.github/workflows/release-amd64.yaml
index 8d48b956b3..6ff9906969 100644
--- a/.github/workflows/release-amd64.yaml
+++ b/.github/workflows/release-amd64.yaml
@@ -9,6 +9,8 @@ on:
 jobs:
   build-kata-static-tarball-amd64:
     uses: ./.github/workflows/build-kata-static-tarball-amd64.yaml
+    with:
+      stage: release
 
   kata-deploy:
     needs: build-kata-static-tarball-amd64
diff --git a/.github/workflows/release-arm64.yaml b/.github/workflows/release-arm64.yaml
index 2b5e810a3b..cd7db8fdfb 100644
--- a/.github/workflows/release-arm64.yaml
+++ b/.github/workflows/release-arm64.yaml
@@ -9,6 +9,8 @@ on:
 jobs:
   build-kata-static-tarball-arm64:
     uses: ./.github/workflows/build-kata-static-tarball-arm64.yaml
+    with:
+      stage: release
 
   kata-deploy:
     needs: build-kata-static-tarball-arm64
diff --git a/.github/workflows/release-s390x.yaml b/.github/workflows/release-s390x.yaml
index ef436b7b83..5f3aaf05fb 100644
--- a/.github/workflows/release-s390x.yaml
+++ b/.github/workflows/release-s390x.yaml
@@ -9,6 +9,8 @@ on:
 jobs:
   build-kata-static-tarball-s390x:
     uses: ./.github/workflows/build-kata-static-tarball-s390x.yaml
+    with:
+      stage: release
 
   kata-deploy:
     needs: build-kata-static-tarball-s390x
diff --git a/tools/packaging/kata-deploy/local-build/Makefile b/tools/packaging/kata-deploy/local-build/Makefile
index eb161e82b8..c23f6b04ea 100644
--- a/tools/packaging/kata-deploy/local-build/Makefile
+++ b/tools/packaging/kata-deploy/local-build/Makefile
@@ -43,9 +43,11 @@ serial-targets:
 	${MAKE} -f $(MK_PATH) -j 1 V= \
 	rootfs-image-tarball \
 	rootfs-image-tdx-tarball \
+	rootfs-initrd-mariner-tarball \
 	rootfs-initrd-sev-tarball \
 	rootfs-initrd-tarball \
-	cloud-hypervisor-tarball
+	cloud-hypervisor-tarball \
+	cloud-hypervisor-glibc-tarball
 
 %-tarball-build: $(MK_DIR)/dockerbuild/install_yq.sh
 	$(call BUILD,$*)
@@ -53,6 +55,9 @@ serial-targets:
 cloud-hypervisor-tarball:
 	${MAKE} $@-build
 
+cloud-hypervisor-glibc-tarball:
+	exit 0
+
 firecracker-tarball:
 	${MAKE} $@-build
 
@@ -104,6 +109,9 @@ rootfs-image-tarball:
 rootfs-image-tdx-tarball: kernel-tdx-experimental-tarball
 	${MAKE} $@-build
 
+rootfs-initrd-mariner-tarball:
+	exit 0
+
 rootfs-initrd-sev-tarball: kernel-sev-tarball
 	${MAKE} $@-build