diff --git a/kernel/Makefile b/kernel/Makefile
index 9c595139d..1d7a8de49 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -217,16 +217,23 @@ endef
 # Build Targets
 # Debug targets only for latest stable and LTS stable
 #
+ifeq ($(ARCH),x86_64)
 $(eval $(call kernel,4.15.7,4.15.x,$(EXTRA),$(DEBUG)))
 $(eval $(call kernel,4.14.23,4.14.x,$(EXTRA),$(DEBUG)))
-
-ifneq ($(ARCH),s390x)
 $(eval $(call kernel,4.14.23,4.14.x,,-dbg))
 $(eval $(call kernel,4.14.18,4.14.x,-rt,))
 $(eval $(call kernel,4.9.85,4.9.x,$(EXTRA),$(DEBUG)))
-endif
-ifeq ($(ARCH),x86_64)
 $(eval $(call kernel,4.4.119,4.4.x,$(EXTRA),$(DEBUG)))
+
+else ifeq ($(ARCH),aarch64)
+$(eval $(call kernel,4.15.7,4.15.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,4.14.23,4.14.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,4.14.18,4.14.x,-rt,))
+$(eval $(call kernel,4.9.85,4.9.x,$(EXTRA),$(DEBUG)))
+
+else ifneq ($(ARCH),s390x)
+$(eval $(call kernel,4.15.7,4.15.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,4.14.23,4.14.x,$(EXTRA),$(DEBUG)))
 endif
 
 # Target for kernel config