diff --git a/aosp_oriole.mk b/aosp_oriole.mk
index 113f679..568d14f 100644
--- a/aosp_oriole.mk
+++ b/aosp_oriole.mk
@@ -23,4 +23,8 @@ PRODUCT_MODEL := AOSP on Oriole
 PRODUCT_BRAND := Android
 PRODUCT_MANUFACTURER := Google
 
-PRODUCT_PACKAGES += com.android.vndk.current.on_vendor
+# Keep the VNDK APEX in /system partition for REL branches as these branches are
+# expected to have stable API/ABI surfaces.
+ifneq (REL,$(PLATFORM_VERSION_CODENAME))
+  PRODUCT_PACKAGES += com.android.vndk.current.on_vendor
+endif
diff --git a/aosp_raven.mk b/aosp_raven.mk
index f434886..18da783 100644
--- a/aosp_raven.mk
+++ b/aosp_raven.mk
@@ -26,4 +26,8 @@ PRODUCT_BRAND := Android
 PRODUCT_BRAND_FOR_ATTESTATION := google
 PRODUCT_MANUFACTURER := Google
 
-PRODUCT_PACKAGES += com.android.vndk.current.on_vendor
+# Keep the VNDK APEX in /system partition for REL branches as these branches are
+# expected to have stable API/ABI surfaces.
+ifneq (REL,$(PLATFORM_VERSION_CODENAME))
+  PRODUCT_PACKAGES += com.android.vndk.current.on_vendor
+endif