diff --git a/gsi/build_with_kernel/repack_kernels.sh b/gsi/build_with_kernel/repack_kernels.sh
index cb03a7502..8dd0ed771 100755
--- a/gsi/build_with_kernel/repack_kernels.sh
+++ b/gsi/build_with_kernel/repack_kernels.sh
@@ -18,6 +18,9 @@ source development/gsi/build_with_kernel/repack_kernels_common.sh
 
 set -e
 
+ARCH=$1
+BUILD_VARIANT=$2
+
 prepare_lz4
 
 prepare_kernel_image \
@@ -25,27 +28,32 @@ prepare_kernel_image \
   "5.10" \
   "arm64"
 
-prepare_kernel_image \
-  "artifacts/common-android13-5_10-kernel_debug_aarch64" \
-  "5.10" \
-  "arm64" \
-  "debug"
+if [[ "$BUILD_VARIANT" == "debug" ]]; then
+  prepare_kernel_image \
+    "artifacts/common-android13-5_10-kernel_debug_aarch64" \
+    "5.10" \
+    "arm64" \
+    "debug"
+fi
 
 prepare_kernel_modules \
   "artifacts/common-android13-5_10-kernel_virt_aarch64" \
   "5.10" \
   "arm64"
 
+
 prepare_kernel_image \
   "artifacts/common-android13-5_15-kernel_aarch64" \
   "5.15" \
   "arm64"
 
-prepare_kernel_image \
-  "artifacts/common-android13-5_15-kernel_debug_aarch64" \
-  "5.15" \
-  "arm64" \
-  "debug"
+if [[ "$BUILD_VARIANT" == "debug" ]]; then
+  prepare_kernel_image \
+    "artifacts/common-android13-5_15-kernel_debug_aarch64" \
+    "5.15" \
+    "arm64" \
+    "debug"
+fi
 
 prepare_kernel_modules \
   "artifacts/common-android13-5_15-kernel_virt_aarch64" \