diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index c7dfadde..1cfcb83e 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -110,11 +110,10 @@ 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 := true
+BOARD_USES_SWIFTSHADER := false
 
 # Gralloc4
 ifeq ($(BOARD_USES_EXYNOS_GRALLOC_VERSION),4)
-
 ifeq ($(BOARD_USES_SWIFTSHADER),true)
 $(call soong_config_set,arm_gralloc,gralloc_arm_no_external_afbc,true)
 $(call soong_config_set,arm_gralloc,mali_gpu_support_afbc_basic,false)
diff --git a/device.mk b/device.mk
index 87c5c5c7..05e67dcb 100644
--- a/device.mk
+++ b/device.mk
@@ -173,8 +173,7 @@ endif
 # GRAPHICS - GPU (begin)
 
 # Must match BOARD_USES_SWIFTSHADER in BoardConfig.mk
-#USE_SWIFTSHADER := false
-USE_SWIFTSHADER := true
+USE_SWIFTSHADER := false
 
 # HWUI
 TARGET_USES_VULKAN = true
@@ -195,17 +194,17 @@ PRODUCT_PACKAGES += \
 
 ifeq ($(USE_SWIFTSHADER),true)
 PRODUCT_PACKAGES += \
-        libEGL_angle \
-        libGLESv1_CM_angle \
-        libGLESv2_angle \
-        vulkan.pastel
+	libEGL_angle \
+	libGLESv1_CM_angle \
+	libGLESv2_angle \
+	vulkan.pastel
 
 PRODUCT_VENDOR_PROPERTIES += \
-        ro.hardware.egl=angle \
-        ro.hardware.vulkan=pastel
+	ro.hardware.egl=angle \
+	ro.hardware.vulkan=pastel
 else
 PRODUCT_VENDOR_PROPERTIES += \
-        ro.hardware.vulkan=mali
+	ro.hardware.vulkan=mali
 endif
 
 
@@ -217,14 +216,6 @@ 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
 
 PRODUCT_VENDOR_PROPERTIES += \