diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 230db1f7..8133c42b 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -340,15 +340,14 @@ BOARD_VNDK_VERSION := current
 BOARD_EXYNOS_S10B_FORMAT_ALIGN := 64
 
 # NeuralNetworks
-#GPU_SOURCE_PRESENT := $(wildcard vendor/arm/mali/valhall)
-#GPU_PREBUILD_PRESENT := $(wildcard vendor/google_devices/zebu/prebuilts/libs)
+GPU_SOURCE_PRESENT := $(wildcard vendor/arm/mali/valhall)
+GPU_PREBUILD_PRESENT := $(wildcard vendor/google_devices/zuma/prebuilts/gpu)
 ifneq (,$(strip $(GPU_SOURCE_PRESENT) $(GPU_PREBUILD_PRESENT)))
 ARMNN_COMPUTE_CL_ENABLE := 1
 else
 ARMNN_COMPUTE_CL_ENABLE := 0
 endif
 ARMNN_COMPUTE_NEON_ENABLE := 1
-ARMNN_COMPUTE_CL_ENABLE := 0
 
 # Boot.img
 BOARD_RAMDISK_USE_LZ4     := true