diff --git a/aosp_bluejay.mk b/aosp_bluejay.mk
index cf64c38..80ae3dd 100644
--- a/aosp_bluejay.mk
+++ b/aosp_bluejay.mk
@@ -23,4 +23,8 @@ PRODUCT_MODEL := AOSP on Bluejay
 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