diff --git a/README.md b/README.md
index 25f78e2..2f6beee 100644
--- a/README.md
+++ b/README.md
@@ -143,18 +143,6 @@ While it's recommended to use a Fedora Atomic iso to install and then rebase tha
 - `wayblue-sway-main-userns-hardened`
 - `wayblue-sway-nvidia-userns-hardened`
 ### Experimental <sup>[bluefin? aurora?](https://github.com/ublue-os/bluefin)</sup>
-- `aurora-main-hardened`
-- `aurora-nvidia-hardened`
-- `aurora-main-userns-hardened`
-- `aurora-nvidia-userns-hardened`
-- `aurora-dx-main-userns-hardened`
-- `aurora-dx-nvidia-userns-hardened`
-- `bluefin-main-hardened`
-- `bluefin-nvidia-hardened`
-- `bluefin-dx-main-userns-hardened`
-- `bluefin-dx-nvidia-userns-hardened`
-- `bluefin-main-userns-hardened`
-- `bluefin-nvidia-userns-hardened`
 - `cinnamon-main-hardened`
 - `cinnamon-nvidia-hardened`
 - `cinnamon-main-userns-hardened`
@@ -163,28 +151,6 @@ While it's recommended to use a Fedora Atomic iso to install and then rebase tha
 - `cosmic-nvidia-hardened`
 - `cosmic-main-userns-hardened`
 - `cosmic-nvidia-userns-hardened`
-### Asus <sup>[source](https://github.com/ublue-os/hwe/tree/main/asus)</sup>
-- `silverblue-asus-hardened`
-- `silverblue-asus-nvidia-hardened`
-- `silverblue-asus-userns-hardened`
-- `silverblue-asus-nvidia-userns-hardened`
-- `kinoite-asus-hardened`
-- `kinoite-asus-nvidia-hardened`
-- `kinoite-asus-userns-hardened`
-- `kinoite-asus-nvidia-userns-hardened`
-- `aurora-asus-hardened`
-- `aurora-asus-nvidia-hardened`
-- `aurora-asus-userns-hardened`
-- `aurora-asus-nvidia-userns-hardened`
-- `aurora-dx-asus-userns-hardened`
-- `aurora-dx-asus-nvidia-userns-hardened`
-### Surface <sup>[source](https://github.com/ublue-os/hwe/tree/main/surface)</sup>
-- `aurora-surface-hardened`
-- `aurora-surface-nvidia-hardened`
-- `aurora-surface-userns-hardened`
-- `aurora-surface-nvidia-userns-hardened`
-- `aurora-dx-surface-userns-hardened`
-- `aurora-dx-surface-nvidia-userns-hardened`
 ## Server
 - `securecore-main-hardened`
 - `securecore-nvidia-hardened`
@@ -194,7 +160,15 @@ While it's recommended to use a Fedora Atomic iso to install and then rebase tha
 - `securecore-zfs-nvidia-hardened`
 - `securecore-zfs-main-userns-hardened`
 - `securecore-zfs-nvidia-userns-hardened`
-  
+## Asus <sup>[source](https://github.com/ublue-os/hwe/tree/main/asus)</sup>
+- `silverblue-asus-hardened`
+- `silverblue-asus-nvidia-hardened`
+- `silverblue-asus-userns-hardened`
+- `silverblue-asus-nvidia-userns-hardened`
+- `kinoite-asus-hardened`
+- `kinoite-asus-nvidia-hardened`
+- `kinoite-asus-userns-hardened`
+- `kinoite-asus-nvidia-userns-hardened`
 # Post-install
 
 After installation, [yafti](https://github.com/ublue-os/yafti) will open. Make sure to follow the steps listed carefully and read the directions closely.
diff --git a/files/system/usr/libexec/deprecated-images.json b/files/system/usr/libexec/deprecated-images.json
index 77263b2..3f136cd 100644
--- a/files/system/usr/libexec/deprecated-images.json
+++ b/files/system/usr/libexec/deprecated-images.json
@@ -3,6 +3,8 @@
       "framework",
       "main-laptop",
       "nvidia-laptop",
-      "server"
+      "server",
+      "bluefin",
+      "aurora"
     ]
 }
\ No newline at end of file
diff --git a/files/system/usr/libexec/deprecated-images.json.md b/files/system/usr/libexec/deprecated-images.json.md
index 19a944b..f20c7f8 100644
--- a/files/system/usr/libexec/deprecated-images.json.md
+++ b/files/system/usr/libexec/deprecated-images.json.md
@@ -2,6 +2,12 @@
 
 The following image types have been deprecated:
 
+## bluefin/aurora
+
+Rationale: See https://github.com/secureblue/secureblue/releases/tag/v3.2.2
+
+Rebase to: The equivalent image replacing `bluefin` with `silverblue` or `aurora` with `kinoite`. For example, for `aurora-nvidia-hardened`, rebase to `kinoite-nvidia-hardened`.
+
 ## server
 
 Rationale: Upstream decisions have required us to [fork](https://github.com/secureblue/coreos/). This brings with it the following critical migration steps *before* rebasing: