diff --git a/vars/bluejay b/vars/bluejay
index fc71f769..52c35818 100644
--- a/vars/bluejay
+++ b/vars/bluejay
@@ -18,8 +18,7 @@ device_repos=(
   device/google/bluejay
 )
 
-# Need OTA zip for firmware, not supported by image_unpacker yet
-readonly needs_ota=true
+readonly fbpk_version="v2"
 
 # Updated semi-manually via pixel/update-any-var.sh
 
diff --git a/vars/cheetah b/vars/cheetah
index 99c91835..d76b3352 100644
--- a/vars/cheetah
+++ b/vars/cheetah
@@ -19,8 +19,7 @@ device_repos=(
   device/google/pantah
 )
 
-# Need OTA zip for firmware, not supported by image_unpacker yet
-readonly needs_ota=true
+readonly fbpk_version="v2"
 
 # Updated semi-manually via pixel/update-any-var.sh
 
diff --git a/vars/lynx b/vars/lynx
index 9b3616c5..ae6a055e 100644
--- a/vars/lynx
+++ b/vars/lynx
@@ -18,8 +18,7 @@ device_repos=(
   device/google/lynx
 )
 
-# Need OTA zip for firmware, not supported by image_unpacker yet
-readonly needs_ota=true
+readonly fbpk_version="v2"
 
 # Updated semi-manually via pixel/update-any-var.sh
 
diff --git a/vars/oriole b/vars/oriole
index 4e26cbe8..cc053331 100644
--- a/vars/oriole
+++ b/vars/oriole
@@ -18,8 +18,7 @@ device_repos=(
   # common repos in raven
 )
 
-# Need OTA zip for firmware, not supported by image_unpacker yet
-readonly needs_ota=true
+readonly fbpk_version="v2"
 
 # Updated semi-manually via pixel/update-any-var.sh
 
diff --git a/vars/panther b/vars/panther
index 9dd56021..0b3b3cdc 100644
--- a/vars/panther
+++ b/vars/panther
@@ -18,8 +18,7 @@ device_repos=(
   # common repos in cheetah
 )
 
-# Need OTA zip for firmware, not supported by image_unpacker yet
-readonly needs_ota=true
+readonly fbpk_version="v2"
 
 # Updated semi-manually via pixel/update-any-var.sh
 
diff --git a/vars/raven b/vars/raven
index fcf87183..0bfd7137 100644
--- a/vars/raven
+++ b/vars/raven
@@ -19,8 +19,7 @@ device_repos=(
   device/google/raviole
 )
 
-# Need OTA zip for firmware, not supported by image_unpacker yet
-readonly needs_ota=true
+readonly fbpk_version="v2"
 
 # Updated semi-manually via pixel/update-any-var.sh