diff --git a/device-oriole.mk b/device-oriole.mk
index 6044ec6..bba4d97 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -308,3 +308,6 @@ PRODUCT_VENDOR_PROPERTIES += \
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.quick_start.oem_id=00e0 \
     ro.quick_start.device_id=oriole
+
+# Disable AVF Remote Attestation
+PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true
diff --git a/device-raven.mk b/device-raven.mk
index 1549d07..815da0a 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -318,3 +318,6 @@ PRODUCT_VENDOR_PROPERTIES += \
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.quick_start.oem_id=00e0 \
     ro.quick_start.device_id=raven
+
+# Disable AVF Remote Attestation
+PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true
diff --git a/device-slider.mk b/device-slider.mk
index 75287bc..100a715 100644
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -137,3 +137,5 @@ else
 		device/google/raviole/location/gps_user.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
 endif
 
+# Disable AVF Remote Attestation
+PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true
diff --git a/device-whitefin.mk b/device-whitefin.mk
index 0e03ece..41197dd 100644
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -120,3 +120,5 @@ else
 		device/google/raviole/location/gps_user.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
 endif
 
+# Disable AVF Remote Attestation
+PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true