diff --git a/conf/init.comet.rc b/conf/init.comet.rc
index 704f662..09d29dc 100644
--- a/conf/init.comet.rc
+++ b/conf/init.comet.rc
@@ -158,6 +158,4 @@ on boot && property:ro.boot.warranty.sku=UVZ
     setprop setupwizard.feature.provisioning_profile_mode true
 on boot && property:ro.boot.warranty.sku=UTM
     setprop setupwizard.feature.provisioning_profile_mode true
-# Enable bootstrap for DVT for convenient testing (b/343731008)
-on boot && property:ro.boot.hardware.revision=DVT1.0
-    setprop setupwizard.feature.provisioning_profile_mode true
+
diff --git a/device-comet.mk b/device-comet.mk
index 8a4c58c..1fdd01d 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -69,8 +69,15 @@ include device/google/gs-common/touch/gti/predump_gti_dual.mk
 include device/google/gs-common/display/dump_second_display.mk
 
 # Increment the SVN for any official public releases
+ifdef RELEASE_SVN_COMET
+TARGET_SVN ?= $(RELEASE_SVN_COMET)
+else
+# Set this for older releases that don't use build flag
+TARGET_SVN ?= 03
+endif
+
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=3
+    ro.vendor.build.svn=$(TARGET_SVN)
 
 # go/lyric-soong-variables
 $(call soong_config_set,lyric,camera_hardware,comet)