diff --git a/Containerfile b/Containerfile
index b58a8bd6..5dceb20e 100644
--- a/Containerfile
+++ b/Containerfile
@@ -425,8 +425,6 @@ RUN rpm-ostree install \
     rm -rf /tmp/latencyflex && \
     curl -Lo /usr/bin/latencyflex https://raw.githubusercontent.com/KyleGospo/LatencyFleX-Installer/main/install.sh && \
     chmod +x /usr/bin/latencyflex && \
-    curl -Lo /usr/bin/zap https://github.com/srevinsaju/zap/releases/download/continuous/zap-amd64 && \
-    chmod +x /usr/bin/zap && \
     sed -i 's@/usr/lib/wine/@/usr/lib64/wine/@g' /usr/bin/latencyflex && \
     sed -i 's@"dxvk.conf"@"/usr/share/latencyflex/dxvk.conf"@g' /usr/bin/latencyflex && \
     chmod +x /usr/bin/latencyflex && \
diff --git a/system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml b/system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml
index fe64a9bb..227bcd5b 100644
--- a/system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml
+++ b/system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml
@@ -211,6 +211,7 @@ screens:
           description: Helpful tools
           default: false
           packages:
+          - AppImage Pool: io.github.prateekmedia.appimagepool
           - Barrier: com.github.debauchee.barrier
           - Bitwarden: com.bitwarden.desktop
           - Calibre: com.calibre_ebook.calibre
diff --git a/system_files/desktop/shared/usr/etc/ublue-os/topgrade.toml b/system_files/desktop/shared/usr/etc/ublue-os/topgrade.toml
index 10817b1c..490a32aa 100644
--- a/system_files/desktop/shared/usr/etc/ublue-os/topgrade.toml
+++ b/system_files/desktop/shared/usr/etc/ublue-os/topgrade.toml
@@ -1,5 +1,4 @@
 [commands]
-"Zap" = "/usr/libexec/topgrade/zap-update"
 "Linux AMDGPU Control Application" = "/usr/libexec/topgrade/lact-update"
 "Mozilla GNOME Themes" = "/usr/libexec/topgrade/mozilla-gnome-theme-update"
 "Third Party CSS Loader Themes" = "/usr/libexec/topgrade/third-party-css-loader-update"
diff --git a/system_files/desktop/shared/usr/libexec/topgrade/zap-update b/system_files/desktop/shared/usr/libexec/topgrade/zap-update
deleted file mode 100755
index 41be9d92..00000000
--- a/system_files/desktop/shared/usr/libexec/topgrade/zap-update
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/bash
-shopt -s nullglob
-
-/usr/bin/zap upgrade
-
-exit 0
diff --git a/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml b/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml
index 7fbb6343..1087a6dc 100644
--- a/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml
+++ b/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml
@@ -200,6 +200,7 @@ screens:
           description: Helpful tools
           default: false
           packages:
+          - AppImage Pool: io.github.prateekmedia.appimagepool
           - Barrier: com.github.debauchee.barrier
           - Bitwarden: com.bitwarden.desktop
           - Calibre: com.calibre_ebook.calibre