diff --git a/gki_arm64.mk b/gki_arm64.mk
index 9597d84..ede3001 100644
--- a/gki_arm64.mk
+++ b/gki_arm64.mk
@@ -26,6 +26,7 @@
 include device/generic/common/gki_common.mk
 $(call output-kernel,kernel/prebuilts/4.19/arm64,kernel/4.19)
 $(call output-kernel,kernel/prebuilts/5.10/arm64,kernel/5.10)
+$(call output-kernel,kernel/prebuilts/5.15/arm64,kernel/5.15)
 
 
 PRODUCT_NAME := gki_arm64
diff --git a/gki_arm64/BoardConfig.mk b/gki_arm64/BoardConfig.mk
index c5d81b0..0263549 100644
--- a/gki_arm64/BoardConfig.mk
+++ b/gki_arm64/BoardConfig.mk
@@ -35,14 +35,22 @@
 BOARD_KERNEL-5.10-GZ-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 47185920
 BOARD_KERNEL-5.10-LZ4_BOOTIMAGE_PARTITION_SIZE := 53477376
 BOARD_KERNEL-5.10-LZ4-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 53477376
+BOARD_KERNEL-5.15_BOOTIMAGE_PARTITION_SIZE := 67108864
+BOARD_KERNEL-5.15-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 67108864
+BOARD_KERNEL-5.15-GZ_BOOTIMAGE_PARTITION_SIZE := 47185920
+BOARD_KERNEL-5.15-GZ-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 47185920
+BOARD_KERNEL-5.15-LZ4_BOOTIMAGE_PARTITION_SIZE := 53477376
+BOARD_KERNEL-5.15-LZ4-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 53477376
 
 BOARD_KERNEL_BINARIES := \
     kernel-4.19-gz \
     kernel-5.10 kernel-5.10-gz kernel-5.10-lz4 \
+    kernel-5.15 kernel-5.15-gz kernel-5.15-lz4 \
 
 ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
 BOARD_KERNEL_BINARIES += \
     kernel-4.19-gz-allsyms \
     kernel-5.10-allsyms kernel-5.10-gz-allsyms kernel-5.10-lz4-allsyms \
+    kernel-5.15-allsyms kernel-5.15-gz-allsyms kernel-5.15-lz4-allsyms \
 
 endif
diff --git a/gki_x86_64.mk b/gki_x86_64.mk
index d01767b..75f5ff7 100644
--- a/gki_x86_64.mk
+++ b/gki_x86_64.mk
@@ -24,7 +24,8 @@
 # Build GKI boot images
 #
 include device/generic/common/gki_common.mk
-$(call output-kernel,kernel/prebuilts/5.10/arm64,kernel/5.10)
+$(call output-kernel,kernel/prebuilts/5.10/x86_64,kernel/5.10)
+$(call output-kernel,kernel/prebuilts/5.15/x86_64,kernel/5.15)
 
 
 PRODUCT_NAME := gki_x86_64
diff --git a/gki_x86_64/BoardConfig.mk b/gki_x86_64/BoardConfig.mk
index 48a1499..6321edc 100755
--- a/gki_x86_64/BoardConfig.mk
+++ b/gki_x86_64/BoardConfig.mk
@@ -26,13 +26,17 @@
 BOARD_KERNEL-5.4_BOOTIMAGE_PARTITION_SIZE := 67108864
 BOARD_KERNEL-5.10_BOOTIMAGE_PARTITION_SIZE := 67108864
 BOARD_KERNEL-5.10-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 67108864
+BOARD_KERNEL-5.15_BOOTIMAGE_PARTITION_SIZE := 67108864
+BOARD_KERNEL-5.15-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 67108864
 
 # Boot images
 BOARD_KERNEL_BINARIES := \
     kernel-5.10 \
+    kernel-5.15 \
 
 ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
 BOARD_KERNEL_BINARIES += \
     kernel-5.10-allsyms \
+    kernel-5.15-allsyms \
 
 endif