diff --git a/aosp_caiman.mk b/aosp_caiman.mk
index d30b5f7e..44d9a523 100644
--- a/aosp_caiman.mk
+++ b/aosp_caiman.mk
@@ -16,8 +16,8 @@
 
 TARGET_LINUX_KERNEL_VERSION := 6.1
 
-USE_SWIFTSHADER := true
-BOARD_USES_SWIFTSHADER := true
+USE_SWIFTSHADER := false
+BOARD_USES_SWIFTSHADER := false
 
 $(call inherit-product, device/google/zumapro/aosp_common.mk)
 $(call inherit-product, device/google/caimito/device-caiman.mk)
diff --git a/aosp_komodo.mk b/aosp_komodo.mk
index ce7ea781..5bd8baf4 100644
--- a/aosp_komodo.mk
+++ b/aosp_komodo.mk
@@ -16,8 +16,8 @@
 
 TARGET_LINUX_KERNEL_VERSION := 6.1
 
-USE_SWIFTSHADER := true
-BOARD_USES_SWIFTSHADER := true
+USE_SWIFTSHADER := false
+BOARD_USES_SWIFTSHADER := false
 
 $(call inherit-product, device/google/zumapro/aosp_common.mk)
 $(call inherit-product, device/google/caimito/device-komodo.mk)
diff --git a/aosp_ripcurrent24.mk b/aosp_ripcurrent24.mk
index cac9fdb0..f7ba284c 100644
--- a/aosp_ripcurrent24.mk
+++ b/aosp_ripcurrent24.mk
@@ -16,8 +16,8 @@
 
 TARGET_LINUX_KERNEL_VERSION := 6.1
 
-USE_SWIFTSHADER := true
-BOARD_USES_SWIFTSHADER := true
+USE_SWIFTSHADER := false
+BOARD_USES_SWIFTSHADER := false
 
 $(call inherit-product, device/google/zumapro/aosp_common.mk)
 $(call inherit-product, device/google/caimito/device-ripcurrent24.mk)
diff --git a/aosp_tokay.mk b/aosp_tokay.mk
index 34bcda3a..4be83a02 100644
--- a/aosp_tokay.mk
+++ b/aosp_tokay.mk
@@ -16,8 +16,8 @@
 
 TARGET_LINUX_KERNEL_VERSION := 6.1
 
-USE_SWIFTSHADER := true
-BOARD_USES_SWIFTSHADER := true
+USE_SWIFTSHADER := false
+BOARD_USES_SWIFTSHADER := false
 
 $(call inherit-product, device/google/zumapro/aosp_common.mk)
 $(call inherit-product, device/google/caimito/device-tokay.mk)