diff --git a/build.config.common b/build.config.common
index 11bc10251142..fa16af7ea08e 100644
--- a/build.config.common
+++ b/build.config.common
@@ -1,5 +1,4 @@
 BRANCH=android-4.14
-KERNEL_DIR=common
 
 CC=clang
 LD=ld.lld
diff --git a/build.config.cuttlefish.aarch64 b/build.config.cuttlefish.aarch64
index 02b48a171329..c395c61c7686 100644
--- a/build.config.cuttlefish.aarch64
+++ b/build.config.cuttlefish.aarch64
@@ -1,5 +1,5 @@
-. ${ROOT_DIR}/common/build.config.common
-. ${ROOT_DIR}/common/build.config.aarch64
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
 
 LZ4_RAMDISK=1
 DEFCONFIG=cuttlefish_defconfig
diff --git a/build.config.cuttlefish.x86_64 b/build.config.cuttlefish.x86_64
index 3248353e35e0..bc6a9f2ffbb6 100644
--- a/build.config.cuttlefish.x86_64
+++ b/build.config.cuttlefish.x86_64
@@ -1,5 +1,5 @@
-. ${ROOT_DIR}/common/build.config.common
-. ${ROOT_DIR}/common/build.config.x86_64
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
+. ${ROOT_DIR}/${KERNEL_DIR}/build.config.x86_64
 
 LZ4_RAMDISK=1
 DEFCONFIG=x86_64_cuttlefish_defconfig