diff --git a/rules/linux-kernel.mk b/rules/linux-kernel.mk
index 05caf384bcc6..705b22b7bc49 100644
--- a/rules/linux-kernel.mk
+++ b/rules/linux-kernel.mk
@@ -4,15 +4,16 @@ KVERSION_SHORT = 4.9.0-7
 KVERSION = $(KVERSION_SHORT)-amd64
 KERNEL_VERSION = 4.9.110
 KERNEL_SUBVERSION = 3+deb9u2
+KERNEL_EXTRA_TAG =
 
-export KVERSION_SHORT KVERSION KERNEL_VERSION KERNEL_SUBVERSION
+export KVERSION_SHORT KVERSION KERNEL_VERSION KERNEL_SUBVERSION KERNEL_EXTRA_TAG
 
-LINUX_HEADERS_COMMON = linux-headers-$(KVERSION_SHORT)-common_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_all.deb
+LINUX_HEADERS_COMMON = linux-headers-$(KVERSION_SHORT)-common_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)$(KERNEL_EXTRA_TAG)_all.deb
 $(LINUX_HEADERS_COMMON)_SRC_PATH = $(SRC_PATH)/sonic-linux-kernel
 SONIC_MAKE_DEBS += $(LINUX_HEADERS_COMMON)
 
-LINUX_HEADERS = linux-headers-$(KVERSION)_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_amd64.deb
+LINUX_HEADERS = linux-headers-$(KVERSION)_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)$(KERNEL_EXTRA_TAG)_amd64.deb
 $(eval $(call add_derived_package,$(LINUX_HEADERS_COMMON),$(LINUX_HEADERS)))
 
-LINUX_KERNEL = linux-image-$(KVERSION)_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)_amd64.deb
+LINUX_KERNEL = linux-image-$(KVERSION)_$(KERNEL_VERSION)-$(KERNEL_SUBVERSION)$(KERNEL_EXTRA_TAG)_amd64.deb
 $(eval $(call add_derived_package,$(LINUX_HEADERS_COMMON),$(LINUX_KERNEL)))