diff --git a/build b/build
index 90666cc..2dbdf44 100755
--- a/build
+++ b/build
@@ -109,9 +109,11 @@ case "$arch" in
   ;;
   arm)
     defconfig=qemu_arm_vexpress_defconfig
+    linux_kernel_custom_config_file="${root_dir}/linux/arch/arm/configs/gem5_defconfig"
   ;;
   aarch64)
     defconfig=qemu_aarch64_virt_defconfig
+    linux_kernel_custom_config_file="${root_dir}/linux/arch/arm64/configs/gem5_defconfig"
   ;;
   mips64)
     defconfig=qemu_mips64r6_malta_defconfig
diff --git a/linux b/linux
index 29dcea8..7dbffef 160000
--- a/linux
+++ b/linux
@@ -1 +1 @@
-Subproject commit 29dcea88779c856c7dc92040a0c01233263101d4
+Subproject commit 7dbffefaa22766b14f9b481753023219adae13e5