diff --git a/device.mk b/device.mk
index a0c4d0cf..78980854 100644
--- a/device.mk
+++ b/device.mk
@@ -259,8 +259,15 @@ endif
 
 PRODUCT_VENDOR_PROPERTIES += \
 	ro.opengles.version=196610 \
-	graphics.gpu.profiler.support=true \
-	debug.renderengine.backend=skiaglthreaded \
+	graphics.gpu.profiler.support=true
+# Enable SkiaVk for RenderEngine on Cheetah
+ifneq (,$(filter %cheetah, $(TARGET_PRODUCT)))
+PRODUCT_VENDOR_PROPERTIES += \
+	debug.renderengine.backend=skiavkthreaded
+else
+PRODUCT_VENDOR_PROPERTIES += \
+	debug.renderengine.backend=skiaglthreaded
+endif
 
 # GRAPHICS - GPU (end)
 # ####################