diff --git a/config/BoardConfigKernel.mk b/config/BoardConfigKernel.mk
index 97e6e86..105fe6b 100644
--- a/config/BoardConfigKernel.mk
+++ b/config/BoardConfigKernel.mk
@@ -82,9 +82,13 @@
 KERNEL_TOOLCHAIN_PATH_gcc := $(KERNEL_TOOLCHAIN_$(KERNEL_ARCH))/$(KERNEL_TOOLCHAIN_PREFIX_$(KERNEL_ARCH))
 
 ifneq ($(USE_CCACHE),)
-    ifneq ($(CCACHE_EXEC),)
-        # Android 10+ deprecates use of a build ccache. Only system installed ones are now allowed
-        CCACHE_BIN := $(CCACHE_EXEC)
+    ifeq ($(USE_SYSTEM_CCACHE),)
+        CCACHE_BIN := $(BUILD_TOP)/prebuilts/tools-extras/$(HOST_PREBUILT_TAG)/bin/ccache
+        # Check that the executable is here.
+        CCACHE_BIN := $(strip $(wildcard $(ccache)))
+    else
+        # Detect if the system already has ccache installed to use instead of the prebuilt
+        CCACHE_BIN := $(shell which ccache)
     endif
 endif