diff --git a/vars/barbet b/vars/barbet
index b8e0ee1..c1210ed 100644
--- a/vars/barbet
+++ b/vars/barbet
@@ -8,21 +8,21 @@
 
 # Updated semi-manually via pixel/update-any-var.sh
 
-readonly build_id="AP1A.240305.019.A1"
+readonly build_id="AP1A.240405.002"
 
 # Updated automatically via pixel/update-device-vars.sh
 
-readonly prev_aosp_tag="android-14.0.0_r22"
-readonly aosp_tag="android-14.0.0_r29"
+readonly prev_aosp_tag="android-14.0.0_r29"
+readonly aosp_tag="android-14.0.0_r30"
 
-readonly build_number="11445699"
+readonly build_number="11480754"
 
-readonly image_url="https://dl.google.com/dl/android/aosp/barbet-ap1a.240305.019.a1-factory-2bda2618.zip"
-readonly image_sha256="2bda2618437e41744f88c19ae177050f941d4894d3456b40a4995dea90171dc0"
+readonly image_url="https://dl.google.com/dl/android/aosp/barbet-ap1a.240405.002-factory-79849e07.zip"
+readonly image_sha256="79849e074fcb87d3cb707d3b6aab26d04eb4078c859bf15f373fa5834a338a04"
 
-readonly flash_url="https://flash.android.com/build/11445699?target=barbet-user&signed"
+readonly flash_url="https://flash.android.com/build/11480754?target=barbet-user&signed"
 
-readonly ota_url="https://dl.google.com/dl/android/aosp/barbet-ota-ap1a.240305.019.a1-dc19d50f.zip"
-readonly ota_sha256="dc19d50f4cb2f10c4e80d7bf10e1655eb8ecca41b4e63d32fb8294def224bfdc"
+readonly ota_url="https://dl.google.com/dl/android/aosp/barbet-ota-ap1a.240405.002-0865416f.zip"
+readonly ota_sha256="0865416f44af26e3c2080054823c445bd44aca84f4306fc91741b43ceec8279e"
 
-readonly security_patch="2024-03-05"
+readonly security_patch="2024-04-05"
diff --git a/vars/bluejay b/vars/bluejay
index 083c0fb..2839e6b 100644
--- a/vars/bluejay
+++ b/vars/bluejay
@@ -9,21 +9,21 @@
 
 # Updated semi-manually via pixel/update-any-var.sh
 
-readonly build_id="AP1A.240305.019.A1"
+readonly build_id="AP1A.240405.002"
 
 # Updated automatically via pixel/update-device-vars.sh
 
-readonly prev_aosp_tag="android-14.0.0_r22"
-readonly aosp_tag="android-14.0.0_r29"
+readonly prev_aosp_tag="android-14.0.0_r29"
+readonly aosp_tag="android-14.0.0_r30"
 
-readonly build_number="11445699"
+readonly build_number="11480754"
 
-readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-ap1a.240305.019.a1-factory-60e97f8c.zip"
-readonly image_sha256="60e97f8c300cd236dd7fd0ddba95173b0bf03a4ceb1c07e5fea1ded11257faf3"
+readonly image_url="https://dl.google.com/dl/android/aosp/bluejay-ap1a.240405.002-factory-5132dfa4.zip"
+readonly image_sha256="5132dfa47ab0dee84a770c71a2afb7c4234a798c735ab307634a2dc8f75aa5c9"
 
-readonly flash_url="https://flash.android.com/build/11445699?target=bluejay-user&signed"
+readonly flash_url="https://flash.android.com/build/11480754?target=bluejay-user&signed"
 
-readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-ap1a.240305.019.a1-fd58dc50.zip"
-readonly ota_sha256="fd58dc50aa0ab8c992e211fd161fe1490938c952ea312b37f86a9d2eff2522c0"
+readonly ota_url="https://dl.google.com/dl/android/aosp/bluejay-ota-ap1a.240405.002-6114363c.zip"
+readonly ota_sha256="6114363cea4102798bd7d27f3ec59ed04f45eec1901ce0c5247777a0e7b5912c"
 
-readonly security_patch="2024-03-05"
+readonly security_patch="2024-04-05"
diff --git a/vars/cheetah b/vars/cheetah
index 9251b1f..7be4c31 100644
--- a/vars/cheetah
+++ b/vars/cheetah
@@ -10,21 +10,21 @@
 
 # Updated semi-manually via pixel/update-any-var.sh
 
-readonly build_id="AP1A.240305.019.A1"
+readonly build_id="AP1A.240405.002"
 
 # Updated automatically via pixel/update-device-vars.sh
 
-readonly prev_aosp_tag="android-14.0.0_r22"
-readonly aosp_tag="android-14.0.0_r29"
+readonly prev_aosp_tag="android-14.0.0_r29"
+readonly aosp_tag="android-14.0.0_r30"
 
-readonly build_number="11445699"
+readonly build_number="11480754"
 
-readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-ap1a.240305.019.a1-factory-1c90a7b4.zip"
-readonly image_sha256="1c90a7b44635208a9aaab4d53e1382304f584f92933ef556e8a7a279912242c0"
+readonly image_url="https://dl.google.com/dl/android/aosp/cheetah-ap1a.240405.002-factory-9def9997.zip"
+readonly image_sha256="9def9997c45e76178c37bfc22ccd9b4ed8d15cd010af305f59df7e5c834ce12a"
 
-readonly flash_url="https://flash.android.com/build/11445699?target=cheetah-user&signed"
+readonly flash_url="https://flash.android.com/build/11480754?target=cheetah-user&signed"
 
-readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-ap1a.240305.019.a1-fc692c4f.zip"
-readonly ota_sha256="fc692c4f88fe35fcc62946429234b3d55e8c7b3de348fcc7979822acd96cad51"
+readonly ota_url="https://dl.google.com/dl/android/aosp/cheetah-ota-ap1a.240405.002-e690266f.zip"
+readonly ota_sha256="e690266f6bbdbfd802b5708365568d53b2e30c6e21aecfb86a707f3ae5805a1c"
 
-readonly security_patch="2024-03-05"
+readonly security_patch="2024-04-05"
diff --git a/vars/common b/vars/common
index 1c35a4d..169e86b 100644
--- a/vars/common
+++ b/vars/common
@@ -5,11 +5,11 @@
 readonly os_branch=udc-p
 readonly device_branch=udc
 
-readonly prev_common_aosp_tag=android-14.0.0_r25 # Feb 2024, Pixel 8
-readonly common_aosp_tag=android-14.0.0_r29 # Mar 2024, Pixel 5a - 8
+readonly prev_common_aosp_tag=android-14.0.0_r29 # Mar 2024, Pixel 5a - 8
+readonly common_aosp_tag=android-14.0.0_r31 # Apr 2024, Pixel Fold
 
-readonly common_aosp_build_id=AP1A.240305.019.A1 # Mar 2024, Pixel 5a - 8
+readonly common_aosp_build_id=AP1A.240405.002.A1 # Apr 2024, Pixel Fold
 
-readonly topic=U_asb_2024-03
+readonly topic=U_asb_2024-04
 
 readonly merge_method="merge"
diff --git a/vars/felix b/vars/felix
index 8dc19fc..896df76 100644
--- a/vars/felix
+++ b/vars/felix
@@ -9,21 +9,21 @@
 
 # Updated semi-manually via pixel/update-any-var.sh
 
-readonly build_id="AP1A.240305.019.A1"
+readonly build_id="AP1A.240405.002.A1"
 
 # Updated automatically via pixel/update-device-vars.sh
 
-readonly prev_aosp_tag="android-14.0.0_r22"
-readonly aosp_tag="android-14.0.0_r29"
+readonly prev_aosp_tag="android-14.0.0_r29"
+readonly aosp_tag="android-14.0.0_r31"
 
-readonly build_number="11445699"
+readonly build_number="11583385"
 
-readonly image_url="https://dl.google.com/dl/android/aosp/felix-ap1a.240305.019.a1-factory-a6d25dca.zip"
-readonly image_sha256="a6d25dcaefea66e1c392722855f3f62140e5f2753ce214ece3e9ef55232d8f87"
+readonly image_url="https://dl.google.com/dl/android/aosp/felix-ap1a.240405.002.a1-factory-6e108421.zip"
+readonly image_sha256="6e108421d554799acc0796a875bf053a8e99b9ddfdb2e68b069b0196246b4d25"
 
-readonly flash_url="https://flash.android.com/build/11445699?target=felix-user&signed"
+readonly flash_url="https://flash.android.com/build/11583385?target=felix-user&signed"
 
-readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-ap1a.240305.019.a1-f7c8e5ba.zip"
-readonly ota_sha256="f7c8e5baa63eb320963ee07d75e1b6d9457f78bfaeb71d366d373f53f7f44666"
+readonly ota_url="https://dl.google.com/dl/android/aosp/felix-ota-ap1a.240405.002.a1-6f4658f5.zip"
+readonly ota_sha256="6f4658f55493ede530444b7fecb6b7ec143da8174e283c5cf601852d761ef779"
 
-readonly security_patch="2024-03-05"
+readonly security_patch="2024-04-05"
diff --git a/vars/husky b/vars/husky
index fa42310..6468452 100644
--- a/vars/husky
+++ b/vars/husky
@@ -11,21 +11,21 @@
 
 # Updated semi-manually via pixel/update-any-var.sh
 
-readonly build_id="AP1A.240305.019.A1"
+readonly build_id="AP1A.240405.002"
 
 # Updated automatically via pixel/update-device-vars.sh
 
-readonly prev_aosp_tag="android-14.0.0_r25"
-readonly aosp_tag="android-14.0.0_r29"
+readonly prev_aosp_tag="android-14.0.0_r29"
+readonly aosp_tag="android-14.0.0_r30"
 
-readonly build_number="11445699"
+readonly build_number="11480754"
 
-readonly image_url="https://dl.google.com/dl/android/aosp/husky-ap1a.240305.019.a1-factory-1091bcb2.zip"
-readonly image_sha256="1091bcb2bfa130d53d225bd133b1ea2e3186683bb621785af61777a386aed6b0"
+readonly image_url="https://dl.google.com/dl/android/aosp/husky-ap1a.240405.002-factory-e2ea86d4.zip"
+readonly image_sha256="e2ea86d45a89e38e0f5e7b638896b63636beac40173d743622951abd53e15dad"
 
-readonly flash_url="https://flash.android.com/build/11445699?target=husky-user&signed"
+readonly flash_url="https://flash.android.com/build/11480754?target=husky-user&signed"
 
-readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-ap1a.240305.019.a1-f1130be5.zip"
-readonly ota_sha256="f1130be5f8ff4f2a2a8c9984d244b47898eaaea924ae9065a4f4ab1bed075442"
+readonly ota_url="https://dl.google.com/dl/android/aosp/husky-ota-ap1a.240405.002-2c9cdda5.zip"
+readonly ota_sha256="2c9cdda587b42d6e3bcac32feb4d0afd2ebd143a10511d5c3649c0b6240e31a2"
 
-readonly security_patch="2024-03-05"
+readonly security_patch="2024-04-05"
diff --git a/vars/lynx b/vars/lynx
index eae19c7..98e91d7 100644
--- a/vars/lynx
+++ b/vars/lynx
@@ -9,21 +9,21 @@
 
 # Updated semi-manually via pixel/update-any-var.sh
 
-readonly build_id="AP1A.240305.019.A1"
+readonly build_id="AP1A.240405.002"
 
 # Updated automatically via pixel/update-device-vars.sh
 
-readonly prev_aosp_tag="android-14.0.0_r22"
-readonly aosp_tag="android-14.0.0_r29"
+readonly prev_aosp_tag="android-14.0.0_r29"
+readonly aosp_tag="android-14.0.0_r30"
 
-readonly build_number="11445699"
+readonly build_number="11480754"
 
-readonly image_url="https://dl.google.com/dl/android/aosp/lynx-ap1a.240305.019.a1-factory-7f7dfec6.zip"
-readonly image_sha256="7f7dfec66260001381a4b039327a1658564f3384f805b34e9f4c68be912bbe72"
+readonly image_url="https://dl.google.com/dl/android/aosp/lynx-ap1a.240405.002-factory-e7fe1bdf.zip"
+readonly image_sha256="e7fe1bdf04fb049d1fdc5425e751dc89106b931a212134243a8ffb59c36b386d"
 
-readonly flash_url="https://flash.android.com/build/11445699?target=lynx-user&signed"
+readonly flash_url="https://flash.android.com/build/11480754?target=lynx-user&signed"
 
-readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-ap1a.240305.019.a1-0127dde0.zip"
-readonly ota_sha256="0127dde0f341cdc48be835d551ed545c41a5df1bf70104b1cf830e474240d57e"
+readonly ota_url="https://dl.google.com/dl/android/aosp/lynx-ota-ap1a.240405.002-934b655b.zip"
+readonly ota_sha256="934b655b87036f2aa6c7edf0d8769be9b9ffd1d659f97b0c17ea14da9ff0b72e"
 
-readonly security_patch="2024-03-05"
+readonly security_patch="2024-04-05"
diff --git a/vars/oriole b/vars/oriole
index bcec40b..804d9b0 100644
--- a/vars/oriole
+++ b/vars/oriole
@@ -9,21 +9,21 @@
 
 # Updated semi-manually via pixel/update-any-var.sh
 
-readonly build_id="AP1A.240305.019.A1"
+readonly build_id="AP1A.240405.002"
 
 # Updated automatically via pixel/update-device-vars.sh
 
-readonly prev_aosp_tag="android-14.0.0_r22"
-readonly aosp_tag="android-14.0.0_r29"
+readonly prev_aosp_tag="android-14.0.0_r29"
+readonly aosp_tag="android-14.0.0_r30"
 
-readonly build_number="11445699"
+readonly build_number="11480754"
 
-readonly image_url="https://dl.google.com/dl/android/aosp/oriole-ap1a.240305.019.a1-factory-0eee36d2.zip"
-readonly image_sha256="0eee36d2b694758d00a85d999bafc67b050bb78b253dac2f2f14f9b491b90d5a"
+readonly image_url="https://dl.google.com/dl/android/aosp/oriole-ap1a.240405.002-factory-537b4123.zip"
+readonly image_sha256="537b41232421841af442cd819911bfbae6cc3ed99b25289b713f1668f27c23af"
 
-readonly flash_url="https://flash.android.com/build/11445699?target=oriole-user&signed"
+readonly flash_url="https://flash.android.com/build/11480754?target=oriole-user&signed"
 
-readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-ap1a.240305.019.a1-fdb8770a.zip"
-readonly ota_sha256="fdb8770a11010b5d90bab4caa2a580ab4c5999ee8ea2d54d96eb6c2b6d58d7ca"
+readonly ota_url="https://dl.google.com/dl/android/aosp/oriole-ota-ap1a.240405.002-bee2137c.zip"
+readonly ota_sha256="bee2137c171e42a703c45215e1fbe991610b043b5fea35e31d66750f7d53f1fd"
 
-readonly security_patch="2024-03-05"
+readonly security_patch="2024-04-05"
diff --git a/vars/panther b/vars/panther
index 35fb75f..d8879fa 100644
--- a/vars/panther
+++ b/vars/panther
@@ -9,21 +9,21 @@
 
 # Updated semi-manually via pixel/update-any-var.sh
 
-readonly build_id="AP1A.240305.019.A1"
+readonly build_id="AP1A.240405.002"
 
 # Updated automatically via pixel/update-device-vars.sh
 
-readonly prev_aosp_tag="android-14.0.0_r22"
-readonly aosp_tag="android-14.0.0_r29"
+readonly prev_aosp_tag="android-14.0.0_r29"
+readonly aosp_tag="android-14.0.0_r30"
 
-readonly build_number="11445699"
+readonly build_number="11480754"
 
-readonly image_url="https://dl.google.com/dl/android/aosp/panther-ap1a.240305.019.a1-factory-ae1ddec4.zip"
-readonly image_sha256="ae1ddec4b4a3f6204d81d21f3742276d3b8df98bdc1a97466e73b41f2ca164bb"
+readonly image_url="https://dl.google.com/dl/android/aosp/panther-ap1a.240405.002-factory-d2396073.zip"
+readonly image_sha256="d2396073823fec55c7aba44ba20c9ee9d83f5138be35a6ed45803772ecdb87d4"
 
-readonly flash_url="https://flash.android.com/build/11445699?target=panther-user&signed"
+readonly flash_url="https://flash.android.com/build/11480754?target=panther-user&signed"
 
-readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-ap1a.240305.019.a1-4eb706b7.zip"
-readonly ota_sha256="4eb706b778472cf359882665a745de6ebeed1835be7ba24d49e6aac825c85639"
+readonly ota_url="https://dl.google.com/dl/android/aosp/panther-ota-ap1a.240405.002-06b07234.zip"
+readonly ota_sha256="06b072341c6d1c8c1f9179e553afc13333396637ab329947a93a2594be881470"
 
-readonly security_patch="2024-03-05"
+readonly security_patch="2024-04-05"
diff --git a/vars/raven b/vars/raven
index 7bc2a06..84332d3 100644
--- a/vars/raven
+++ b/vars/raven
@@ -10,21 +10,21 @@
 
 # Updated semi-manually via pixel/update-any-var.sh
 
-readonly build_id="AP1A.240305.019.A1"
+readonly build_id="AP1A.240405.002"
 
 # Updated automatically via pixel/update-device-vars.sh
 
-readonly prev_aosp_tag="android-14.0.0_r22"
-readonly aosp_tag="android-14.0.0_r29"
+readonly prev_aosp_tag="android-14.0.0_r29"
+readonly aosp_tag="android-14.0.0_r30"
 
-readonly build_number="11445699"
+readonly build_number="11480754"
 
-readonly image_url="https://dl.google.com/dl/android/aosp/raven-ap1a.240305.019.a1-factory-de202961.zip"
-readonly image_sha256="de2029612d8531a111e5f4cb027cd24acacfe686a53f9f4b4c2524408c351115"
+readonly image_url="https://dl.google.com/dl/android/aosp/raven-ap1a.240405.002-factory-877e050e.zip"
+readonly image_sha256="877e050e15199667e97d7a07a42646f7871858b7a46d13db8dfcb74d06b419c8"
 
-readonly flash_url="https://flash.android.com/build/11445699?target=raven-user&signed"
+readonly flash_url="https://flash.android.com/build/11480754?target=raven-user&signed"
 
-readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-ap1a.240305.019.a1-090960f8.zip"
-readonly ota_sha256="090960f8b4618e3489f40d35c995351585c1b9787d58644b375e02a041ac29a2"
+readonly ota_url="https://dl.google.com/dl/android/aosp/raven-ota-ap1a.240405.002-4e278e46.zip"
+readonly ota_sha256="4e278e46897fe3e2439ab7496d2cdf1c6308221c33f2b63c254c085be5d7d2e4"
 
-readonly security_patch="2024-03-05"
+readonly security_patch="2024-04-05"
diff --git a/vars/redbull b/vars/redbull
index 6719fe4..aa74759 100644
--- a/vars/redbull
+++ b/vars/redbull
@@ -2,5 +2,5 @@
 
 # Updated semi-manually via pixel/update-any-var.sh
 
-readonly prev_kernel_tag=android-14.0.0_r0.20 # Dec 2023
-readonly kernel_tag=android-14.0.0_r0.32 # Jan 2024
+readonly prev_kernel_tag=android-14.0.0_r0.32 # Jan 2024
+readonly kernel_tag=android-14.0.0_r0.58 # Apr 2024
diff --git a/vars/shiba b/vars/shiba
index 361809e..0f509b3 100644
--- a/vars/shiba
+++ b/vars/shiba
@@ -9,21 +9,21 @@
 
 # Updated semi-manually via pixel/update-any-var.sh
 
-readonly build_id="AP1A.240305.019.A1"
+readonly build_id="AP1A.240405.002"
 
 # Updated automatically via pixel/update-device-vars.sh
 
-readonly prev_aosp_tag="android-14.0.0_r25"
-readonly aosp_tag="android-14.0.0_r29"
+readonly prev_aosp_tag="android-14.0.0_r29"
+readonly aosp_tag="android-14.0.0_r30"
 
-readonly build_number="11445699"
+readonly build_number="11480754"
 
-readonly image_url="https://dl.google.com/dl/android/aosp/shiba-ap1a.240305.019.a1-factory-41c6b5d5.zip"
-readonly image_sha256="41c6b5d589c706b7d401b3702ba80f53afd397db9e33496dcef575bd1cd35114"
+readonly image_url="https://dl.google.com/dl/android/aosp/shiba-ap1a.240405.002-factory-ed0ea957.zip"
+readonly image_sha256="ed0ea9571c072e10e0d9f2745309e90626c83eb9ab94c81c7e6f23b93348f4da"
 
-readonly flash_url="https://flash.android.com/build/11445699?target=shiba-user&signed"
+readonly flash_url="https://flash.android.com/build/11480754?target=shiba-user&signed"
 
-readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-ap1a.240305.019.a1-a6dc4599.zip"
-readonly ota_sha256="a6dc4599cb4242088d7c77348540107804788e7a9144b50845b753dd006ee065"
+readonly ota_url="https://dl.google.com/dl/android/aosp/shiba-ota-ap1a.240405.002-89147563.zip"
+readonly ota_sha256="891475630f0fef0166f5afccb29b5fbec36fd10ccec88a2a753cf8c50aa19f75"
 
-readonly security_patch="2024-03-05"
+readonly security_patch="2024-04-05"
diff --git a/vars/tangorpro b/vars/tangorpro
index 8e1e7e8..8f37b91 100644
--- a/vars/tangorpro
+++ b/vars/tangorpro
@@ -10,21 +10,21 @@
 
 # Updated semi-manually via pixel/update-any-var.sh
 
-readonly build_id="AP1A.240305.019.A1"
+readonly build_id="AP1A.240405.002"
 
 # Updated automatically via pixel/update-device-vars.sh
 
-readonly prev_aosp_tag="android-14.0.0_r22"
-readonly aosp_tag="android-14.0.0_r29"
+readonly prev_aosp_tag="android-14.0.0_r29"
+readonly aosp_tag="android-14.0.0_r30"
 
-readonly build_number="11445699"
+readonly build_number="11480754"
 
-readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-ap1a.240305.019.a1-factory-33122a5e.zip"
-readonly image_sha256="33122a5e5131f8d0492aad7d326a94aefed184d2d4c62581edb1812745b9f856"
+readonly image_url="https://dl.google.com/dl/android/aosp/tangorpro-ap1a.240405.002-factory-1ffdd4b2.zip"
+readonly image_sha256="1ffdd4b2dbf0fa9848da9377a2615a83e5404d75c3470cd5ed5aada91314b8ab"
 
-readonly flash_url="https://flash.android.com/build/11445699?target=tangorpro-user&signed"
+readonly flash_url="https://flash.android.com/build/11480754?target=tangorpro-user&signed"
 
-readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-ap1a.240305.019.a1-37ddba39.zip"
-readonly ota_sha256="37ddba39c6d70d74746551e5ea4fc00b5a3c5e5a18f69dfb59ea7e0759b51695"
+readonly ota_url="https://dl.google.com/dl/android/aosp/tangorpro-ota-ap1a.240405.002-210fffed.zip"
+readonly ota_sha256="210fffed45691aac7ad6a0bf2c8856c212e6c8bad8dbd9d7ac6c81cd56365aad"
 
-readonly security_patch="2024-03-05"
+readonly security_patch="2024-04-05"