diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 7faac1dd..576d7c6f 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -109,7 +109,7 @@ BOARD_USES_ALIGN_RESTRICTION := false
 BOARD_USES_GRALLOC_ION_SYNC := true
 
 # This should be the same value as USE_SWIFTSHADER in device.mk
-BOARD_USES_SWIFTSHADER := false
+BOARD_USES_SWIFTSHADER := true
 
 # Gralloc4
 ifeq ($(BOARD_USES_EXYNOS_GRALLOC_VERSION),4)
diff --git a/device.mk b/device.mk
index 7152e676..267086bb 100644
--- a/device.mk
+++ b/device.mk
@@ -170,7 +170,8 @@ endif
 # GRAPHICS - GPU (begin)
 
 # Must match BOARD_USES_SWIFTSHADER in BoardConfig.mk
-USE_SWIFTSHADER := false
+#USE_SWIFTSHADER := false
+USE_SWIFTSHADER := true
 
 # HWUI
 TARGET_USES_VULKAN = true
@@ -191,11 +192,20 @@ PRODUCT_PACKAGES += \
 
 ifeq ($(USE_SWIFTSHADER),true)
 PRODUCT_PACKAGES += \
-   libGLESv1_CM_swiftshader \
-   libEGL_swiftshader \
-   libGLESv2_swiftshader
+        libEGL_angle \
+        libGLESv1_CM_angle \
+        libGLESv2_angle \
+        vulkan.pastel
+
+PRODUCT_VENDOR_PROPERTIES += \
+        ro.hardware.egl=angle \
+        ro.hardware.vulkan=pastel
+else
+PRODUCT_VENDOR_PROPERTIES += \
+        ro.hardware.vulkan=mali
 endif
 
+
 PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.hardware.opengles.aep.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.opengles.aep.xml \
 	frameworks/native/data/etc/android.hardware.vulkan.version-1_1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \
@@ -204,15 +214,15 @@ PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.software.vulkan.deqp.level-2021-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \
 	frameworks/native/data/etc/android.software.opengles.deqp.level-2021-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml
 
-ifeq ($(USE_SWIFTSHADER),true)
-PRODUCT_VENDOR_PROPERTIES += \
-	ro.hardware.egl = swiftshader \
-	ro.hardware.vulkan = pastel
-else
-PRODUCT_VENDOR_PROPERTIES += \
-	ro.hardware.egl = mali \
-	ro.hardware.vulkan = mali
-endif
+#ifeq ($(USE_SWIFTSHADER),true)
+#PRODUCT_VENDOR_PROPERTIES += \
+#	ro.hardware.egl = swiftshader \
+#	ro.hardware.vulkan = pastel
+#else
+#PRODUCT_VENDOR_PROPERTIES += \
+#	ro.hardware.egl = mali \
+#	ro.hardware.vulkan = mali
+#endif
 
 PRODUCT_VENDOR_PROPERTIES += \
 	ro.opengles.version=196610 \