diff --git a/device.mk b/device.mk
index 9cb81a9a..9b51d6ca 100644
--- a/device.mk
+++ b/device.mk
@@ -269,8 +269,15 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 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)
 # ####################