diff --git a/static/faq.html b/static/faq.html
index e7f9ddc5..5bcc98d4 100644
--- a/static/faq.html
+++ b/static/faq.html
@@ -149,14 +149,14 @@
                         <li>Pixel 4a (sunfish)</li>
                         <li>Pixel 4 XL (coral)</li>
                         <li>Pixel 4 (flame)</li>
-                        <li>Pixel 3a XL (bonito)</li>
-                        <li>Pixel 3a (sargo)</li>
                     </ul>
 
                     <p>The following devices are end-of-life, no longer receive full security
                     updates and are supported via extended support releases of GrapheneOS:</p>
 
                     <ul>
+                        <li>Pixel 3a XL (bonito)</li>
+                        <li>Pixel 3a (sargo)</li>
                         <li>Pixel 3 XL (crosshatch)</li>
                         <li>Pixel 3 (blueline)</li>
                     </ul>
diff --git a/static/releases.html b/static/releases.html
index 7cd2faf2..487d75df 100644
--- a/static/releases.html
+++ b/static/releases.html
@@ -69,8 +69,8 @@
                             <li><a href="#sunfish-stable">Pixel 4a</a></li>
                             <li><a href="#coral-stable">Pixel 4 XL</a></li>
                             <li><a href="#flame-stable">Pixel 4</a></li>
-                            <li><a href="#bonito-stable">Pixel 3a XL</a></li>
-                            <li><a href="#sargo-stable">Pixel 3a</a></li>
+                            <li><a href="#bonito-stable">Pixel 3a XL (legacy)</a></li>
+                            <li><a href="#sargo-stable">Pixel 3a (legacy)</a></li>
                             <li><a href="#crosshatch-stable">Pixel 3 XL (legacy)</a></li>
                             <li><a href="#blueline-stable">Pixel 3 (legacy)</a></li>
                         </ul>
@@ -86,8 +86,8 @@
                             <li><a href="#sunfish-beta">Pixel 4a</a></li>
                             <li><a href="#coral-beta">Pixel 4 XL</a></li>
                             <li><a href="#flame-beta">Pixel 4</a></li>
-                            <li><a href="#bonito-beta">Pixel 3a XL</a></li>
-                            <li><a href="#sargo-beta">Pixel 3a</a></li>
+                            <li><a href="#bonito-beta">Pixel 3a XL (legacy)</a></li>
+                            <li><a href="#sargo-beta">Pixel 3a (legacy)</a></li>
                             <li><a href="#crosshatch-beta">Pixel 3 XL (legacy)</a></li>
                             <li><a href="#blueline-beta">Pixel 3 (legacy)</a></li>
                         </ul>
@@ -359,7 +359,7 @@
                     </ul>
                 </section>
                 <section id="bonito-stable">
-                    <h3><a href="#bonito-stable">Pixel 3a XL</a></h3>
+                    <h3><a href="#bonito-stable">Pixel 3a XL (legacy)</a></h3>
                     <p>Version: <a href="https://github.com/GrapheneOS/platform_manifest/releases/tag/{{bonito-stable-BUILD_ID}}.{{bonito-stable-BUILD_NUMBER}}">{{bonito-stable-BUILD_ID}}.{{bonito-stable-BUILD_NUMBER}}</a></p>
                     <ul>
                         <li><a href="https://releases.grapheneos.org/bonito-factory-{{bonito-stable-BUILD_NUMBER}}.zip">bonito-factory-{{bonito-stable-BUILD_NUMBER}}.zip</a></li>
@@ -368,7 +368,7 @@
                     </ul>
                 </section>
                 <section id="sargo-stable">
-                    <h3><a href="#sargo-stable">Pixel 3a</a></h3>
+                    <h3><a href="#sargo-stable">Pixel 3a (legacy)</a></h3>
                     <p>Version: <a href="https://github.com/GrapheneOS/platform_manifest/releases/tag/{{sargo-stable-BUILD_ID}}.{{sargo-stable-BUILD_NUMBER}}">{{sargo-stable-BUILD_ID}}.{{sargo-stable-BUILD_NUMBER}}</a></p>
                     <ul>
                         <li><a href="https://releases.grapheneos.org/sargo-factory-{{sargo-stable-BUILD_NUMBER}}.zip">sargo-factory-{{sargo-stable-BUILD_NUMBER}}.zip</a></li>
@@ -472,7 +472,7 @@
                     </ul>
                 </section>
                 <section id="bonito-beta">
-                    <h3><a href="#bonito-beta">Pixel 3a XL</a></h3>
+                    <h3><a href="#bonito-beta">Pixel 3a XL (legacy)</a></h3>
                     <p>Version: <a href="https://github.com/GrapheneOS/platform_manifest/releases/tag/{{bonito-beta-BUILD_ID}}.{{bonito-beta-BUILD_NUMBER}}">{{bonito-beta-BUILD_ID}}.{{bonito-beta-BUILD_NUMBER}}</a></p>
                     <ul>
                         <li><a href="https://releases.grapheneos.org/bonito-factory-{{bonito-beta-BUILD_NUMBER}}.zip">bonito-factory-{{bonito-beta-BUILD_NUMBER}}.zip</a></li>
@@ -481,7 +481,7 @@
                     </ul>
                 </section>
                 <section id="sargo-beta">
-                    <h3><a href="#sargo-beta">Pixel 3a</a></h3>
+                    <h3><a href="#sargo-beta">Pixel 3a (legacy)</a></h3>
                     <p>Version: <a href="https://github.com/GrapheneOS/platform_manifest/releases/tag/{{sargo-beta-BUILD_ID}}.{{sargo-beta-BUILD_NUMBER}}">{{sargo-beta-BUILD_ID}}.{{sargo-beta-BUILD_NUMBER}}</a></p>
                     <ul>
                         <li><a href="https://releases.grapheneos.org/sargo-factory-{{sargo-beta-BUILD_NUMBER}}.zip">sargo-factory-{{sargo-beta-BUILD_NUMBER}}.zip</a></li>
@@ -528,7 +528,8 @@
                     <p>Tags:</p>
                     <ul>
                         <li><a href="https://github.com/GrapheneOS/platform_manifest/releases/tag/SP1A.210812.016.C1.2022053100">SP1A.210812.016.C1.2022053100</a> (Pixel 3, Pixel 3 XL) — extended support release for legacy devices with frozen 2021-11-01 patch level</li>
-                        <li><a href="https://github.com/GrapheneOS/platform_manifest/releases/tag/SP2A.220505.002.2022053100">SP2A.220505.002.2022053100</a> (Pixel 3a, Pixel 3a XL, Pixel 4, Pixel 4 XL, Pixel 4a, Pixel 4a (5G), Pixel 5, Pixel 5a, Pixel 6, Pixel 6 Pro, emulator, generic, other targets)</li>
+                        <li><a href="https://github.com/GrapheneOS/platform_manifest/releases/tag/SP2A.220505.006.2022053100">SP2A.220505.006.2022053100</a> (Pixel 3a, Pixel 3a XL) — extended support release for legacy devices with frozen 2022-05-05 patch level</li>
+                        <li><a href="https://github.com/GrapheneOS/platform_manifest/releases/tag/SP2A.220505.002.2022053100">SP2A.220505.002.2022053100</a> (Pixel 4, Pixel 4 XL, Pixel 4a, Pixel 4a (5G), Pixel 5, Pixel 5a, Pixel 6, Pixel 6 Pro, emulator, generic, other targets)</li>
                     </ul>
 
                     <p>Changes since the 2022053100 release:</p>