diff --git a/device-caiman.mk b/device-caiman.mk
index 56b02b80..4b833252 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -69,8 +69,15 @@ include device/google/gs-common/modem/radio_ext/radio_ext.mk
 include device/google/gs-common/pixelsupport/pixelsupport.mk
 
 # Increment the SVN for any official public releases
+ifdef RELEASE_SVN_CAIMAN
+TARGET_SVN ?= $(RELEASE_SVN_CAIMAN)
+else
+# Set this for older releases that don't use build flag
+TARGET_SVN ?= 04
+endif
+
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=1
+    ro.vendor.build.svn=$(TARGET_SVN)
 
 # go/lyric-soong-variables
 $(call soong_config_set,lyric,camera_hardware,caiman)
diff --git a/device-komodo.mk b/device-komodo.mk
index 0084c88b..30d54d61 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -69,8 +69,15 @@ include device/google/gs-common/modem/radio_ext/radio_ext.mk
 include device/google/gs-common/pixelsupport/pixelsupport.mk
 
 # Increment the SVN for any official public releases
+ifdef RELEASE_SVN_KOMODO
+TARGET_SVN ?= $(RELEASE_SVN_KOMODO)
+else
+# Set this for older releases that don't use build flag
+TARGET_SVN ?= 04
+endif
+
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=1
+    ro.vendor.build.svn=$(TARGET_SVN)
 
 # go/lyric-soong-variables
 $(call soong_config_set,lyric,camera_hardware,komodo)
diff --git a/device-tokay.mk b/device-tokay.mk
index 1b91969b..c65bc593 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -59,8 +59,15 @@ include device/google/gs-common/modem/radio_ext/radio_ext.mk
 include device/google/gs-common/pixelsupport/pixelsupport.mk
 
 # Increment the SVN for any official public releases
+ifdef RELEASE_SVN_TOKAY
+TARGET_SVN ?= $(RELEASE_SVN_TOKAY)
+else
+# Set this for older releases that don't use build flag
+TARGET_SVN ?= 04
+endif
+
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=1
+    ro.vendor.build.svn=$(TARGET_SVN)
 
 # go/lyric-soong-variables
 $(call soong_config_set,lyric,camera_hardware,tokay)