diff --git a/repos/base-hw/lib/mk/spec/arm_v8/core-hw-imx8q_evk.mk b/repos/base-hw/lib/mk/spec/arm_v8/core-hw-imx8q_evk.mk
index 16f28bc74f..341584d81e 100644
--- a/repos/base-hw/lib/mk/spec/arm_v8/core-hw-imx8q_evk.mk
+++ b/repos/base-hw/lib/mk/spec/arm_v8/core-hw-imx8q_evk.mk
@@ -16,4 +16,4 @@ SRC_S += spec/arm_v8/virtualization/exception_vector.s
 NR_OF_CPUS = 4
 
 # include less specific configuration
-include $(REP_DIR)/lib/mk/spec/arm_v8/core-hw.inc
+include $(call select_from_repositories,lib/mk/spec/arm_v8/core-hw.inc)
diff --git a/repos/base-hw/lib/mk/spec/arm_v8/core-hw.inc b/repos/base-hw/lib/mk/spec/arm_v8/core-hw.inc
index 15a4563ce7..f9f9f2517f 100644
--- a/repos/base-hw/lib/mk/spec/arm_v8/core-hw.inc
+++ b/repos/base-hw/lib/mk/spec/arm_v8/core-hw.inc
@@ -15,8 +15,7 @@ SRC_S += spec/arm_v8/exception_vector.s
 SRC_S += spec/arm_v8/crt0.s
 
 vpath pd_session_support.cc    $(REP_DIR)/src/core/spec/arm_v8
-vpath spec/64bit/memory_map.cc $(REP_DIR)/src/lib/hw
+vpath spec/64bit/memory_map.cc $(call select_from_repositories,src/lib/hw)
 
 # include less specific configuration
-include $(REP_DIR)/lib/mk/core-hw.inc
-
+include $(call select_from_repositories,lib/mk/core-hw.inc)