diff --git a/vars/akita b/vars/akita
index b58203c2..2a770af3 100644
--- a/vars/akita
+++ b/vars/akita
@@ -12,7 +12,7 @@ readonly build_id="BP2A.250605.031.A2"
 # Updated automatically via pixel/update-device-vars.sh
 
 readonly prev_aosp_tag="android-15.0.0_r34"
-readonly aosp_tag="unknown"
+readonly aosp_tag="aml_tz6_351400020"
 
 readonly build_number="13578606"
 
diff --git a/vars/bluejay b/vars/bluejay
index 1fe9751d..88d2f4a8 100644
--- a/vars/bluejay
+++ b/vars/bluejay
@@ -12,7 +12,7 @@ readonly build_id="BP2A.250605.031.A2"
 # Updated automatically via pixel/update-device-vars.sh
 
 readonly prev_aosp_tag="android-15.0.0_r32"
-readonly aosp_tag="unknown"
+readonly aosp_tag="aml_tz6_351400020"
 
 readonly build_number="13578606"
 
diff --git a/vars/caiman b/vars/caiman
index 225b4453..f07762bb 100644
--- a/vars/caiman
+++ b/vars/caiman
@@ -12,7 +12,7 @@ readonly build_id="BP2A.250605.031.A2"
 # Updated automatically via pixel/update-device-vars.sh
 
 readonly prev_aosp_tag="android-15.0.0_r32"
-readonly aosp_tag="unknown"
+readonly aosp_tag="aml_tz6_351400020"
 
 readonly build_number="13578606"
 
diff --git a/vars/cheetah b/vars/cheetah
index f9f199fa..3e6d5b4c 100644
--- a/vars/cheetah
+++ b/vars/cheetah
@@ -13,7 +13,7 @@ readonly build_id="BP2A.250605.031.A2"
 # Updated automatically via pixel/update-device-vars.sh
 
 readonly prev_aosp_tag="android-15.0.0_r34"
-readonly aosp_tag="unknown"
+readonly aosp_tag="aml_tz6_351400020"
 
 readonly build_number="13578606"
 
diff --git a/vars/comet b/vars/comet
index 4b79fbb1..1925c650 100644
--- a/vars/comet
+++ b/vars/comet
@@ -12,7 +12,7 @@ readonly build_id="BP2A.250605.031.A3"
 # Updated automatically via pixel/update-device-vars.sh
 
 readonly prev_aosp_tag="android-15.0.0_r32"
-readonly aosp_tag="unknown"
+readonly aosp_tag="aml_tz6_351400020"
 
 readonly build_number="13578795"
 
diff --git a/vars/felix b/vars/felix
index a5d8af0b..c0e7300b 100644
--- a/vars/felix
+++ b/vars/felix
@@ -12,7 +12,7 @@ readonly build_id="BP2A.250605.031.A2"
 # Updated automatically via pixel/update-device-vars.sh
 
 readonly prev_aosp_tag="android-15.0.0_r34"
-readonly aosp_tag="unknown"
+readonly aosp_tag="aml_tz6_351400020"
 
 readonly build_number="13578606"
 
diff --git a/vars/husky b/vars/husky
index 6036c5df..2c35b867 100644
--- a/vars/husky
+++ b/vars/husky
@@ -13,7 +13,7 @@ readonly build_id="BP2A.250605.031.A2"
 # Updated automatically via pixel/update-device-vars.sh
 
 readonly prev_aosp_tag="android-15.0.0_r34"
-readonly aosp_tag="unknown"
+readonly aosp_tag="aml_tz6_351400020"
 
 readonly build_number="13578606"
 
diff --git a/vars/komodo b/vars/komodo
index b19244fd..b61a9885 100644
--- a/vars/komodo
+++ b/vars/komodo
@@ -14,7 +14,7 @@ readonly build_id="BP2A.250605.031.A2"
 # Updated automatically via pixel/update-device-vars.sh
 
 readonly prev_aosp_tag="android-15.0.0_r32"
-readonly aosp_tag="unknown"
+readonly aosp_tag="aml_tz6_351400020"
 
 readonly build_number="13578606"
 
diff --git a/vars/lynx b/vars/lynx
index b0d0991b..2864d991 100644
--- a/vars/lynx
+++ b/vars/lynx
@@ -12,7 +12,7 @@ readonly build_id="BP2A.250605.031.A2"
 # Updated automatically via pixel/update-device-vars.sh
 
 readonly prev_aosp_tag="android-15.0.0_r34"
-readonly aosp_tag="unknown"
+readonly aosp_tag="aml_tz6_351400020"
 
 readonly build_number="13578606"
 
diff --git a/vars/oriole b/vars/oriole
index 30990afa..0b19988b 100644
--- a/vars/oriole
+++ b/vars/oriole
@@ -12,7 +12,7 @@ readonly build_id="BP2A.250605.031.A2"
 # Updated automatically via pixel/update-device-vars.sh
 
 readonly prev_aosp_tag="android-15.0.0_r32"
-readonly aosp_tag="unknown"
+readonly aosp_tag="aml_tz6_351400020"
 
 readonly build_number="13578606"
 
diff --git a/vars/panther b/vars/panther
index 3ebc5a0e..3a9eba75 100644
--- a/vars/panther
+++ b/vars/panther
@@ -12,7 +12,7 @@ readonly build_id="BP2A.250605.031.A2"
 # Updated automatically via pixel/update-device-vars.sh
 
 readonly prev_aosp_tag="android-15.0.0_r34"
-readonly aosp_tag="unknown"
+readonly aosp_tag="aml_tz6_351400020"
 
 readonly build_number="13578606"
 
diff --git a/vars/raven b/vars/raven
index af392622..033ddaba 100644
--- a/vars/raven
+++ b/vars/raven
@@ -13,7 +13,7 @@ readonly build_id="BP2A.250605.031.A2"
 # Updated automatically via pixel/update-device-vars.sh
 
 readonly prev_aosp_tag="android-15.0.0_r32"
-readonly aosp_tag="unknown"
+readonly aosp_tag="aml_tz6_351400020"
 
 readonly build_number="13578606"
 
diff --git a/vars/shiba b/vars/shiba
index 2cba5aa6..11ca277c 100644
--- a/vars/shiba
+++ b/vars/shiba
@@ -12,7 +12,7 @@ readonly build_id="BP2A.250605.031.A2"
 # Updated automatically via pixel/update-device-vars.sh
 
 readonly prev_aosp_tag="android-15.0.0_r34"
-readonly aosp_tag="unknown"
+readonly aosp_tag="aml_tz6_351400020"
 
 readonly build_number="13578606"
 
diff --git a/vars/tangorpro b/vars/tangorpro
index 9390eb33..035271f5 100644
--- a/vars/tangorpro
+++ b/vars/tangorpro
@@ -12,7 +12,7 @@ readonly build_id="BP2A.250605.031.A2"
 # Updated automatically via pixel/update-device-vars.sh
 
 readonly prev_aosp_tag="android-15.0.0_r32"
-readonly aosp_tag="unknown"
+readonly aosp_tag="aml_tz6_351400020"
 
 readonly build_number="13578606"
 
diff --git a/vars/tokay b/vars/tokay
index 63afd688..9d5a4028 100644
--- a/vars/tokay
+++ b/vars/tokay
@@ -12,7 +12,7 @@ readonly build_id="BP2A.250605.031.A2"
 # Updated automatically via pixel/update-device-vars.sh
 
 readonly prev_aosp_tag="android-15.0.0_r32"
-readonly aosp_tag="unknown"
+readonly aosp_tag="aml_tz6_351400020"
 
 readonly build_number="13578606"