diff --git a/build_files/base/05-override-install.sh b/build_files/base/05-override-install.sh
index 2ba223664ac..4ba898396d3 100755
--- a/build_files/base/05-override-install.sh
+++ b/build_files/base/05-override-install.sh
@@ -46,15 +46,9 @@ echo 'eval "$(starship init bash)"' >> /etc/bashrc
 # Topgrade Install
 pip install --prefix=/usr topgrade
 
-# Install ublue-update -- breaks with packages.json due to missing topgrade
-rpm-ostree install ublue-update
-
 # Consolidate Just Files
 find /tmp/just -iname '*.just' -exec printf "\n\n" \; -exec cat {} \; >> /usr/share/ublue-os/just/60-custom.just
 
-# Move over ublue-update config
-mv -f /tmp/ublue-update.toml /usr/etc/ublue-update/ublue-update.toml
-
 # Register Fonts
 fc-cache -f /usr/share/fonts/ubuntu
 fc-cache -f /usr/share/fonts/inter
diff --git a/build_files/base/17-cleanup.sh b/build_files/base/17-cleanup.sh
index ec43fce1f45..3418fba3a60 100755
--- a/build_files/base/17-cleanup.sh
+++ b/build_files/base/17-cleanup.sh
@@ -9,7 +9,7 @@ systemctl enable rpm-ostree-countme.service
 systemctl enable tailscaled.service
 systemctl enable dconf-update.service
 systemctl --global enable ublue-flatpak-manager.service
-systemctl enable ublue-update.timer
+systemctl enable uupd.timer
 systemctl enable ublue-system-setup.service
 systemctl enable ublue-guest-user.service
 systemctl enable brew-setup.service
diff --git a/build_files/shared/build-base.sh b/build_files/shared/build-base.sh
index d364cd7727d..3f7e13634ba 100755
--- a/build_files/shared/build-base.sh
+++ b/build_files/shared/build-base.sh
@@ -9,7 +9,6 @@ mkdir -p /var/lib/alternatives
 # Copy Files to Container
 cp -r /ctx/just /tmp/just
 cp /ctx/packages.json /tmp/packages.json
-cp /ctx/system_files/shared/etc/ublue-update/ublue-update.toml /tmp/ublue-update.toml
 rsync -rvK /ctx/system_files/shared/ /
 rsync -rvK /ctx/system_files/"${BASE_IMAGE_NAME}"/ /
 echo "::endgroup::"
diff --git a/packages.json b/packages.json
index 9ab39988f5a..0758109a3c6 100644
--- a/packages.json
+++ b/packages.json
@@ -56,6 +56,7 @@
 				"tailscale",
 				"tmux",
 				"usbmuxd",
+				"uupd",
 				"wireguard-tools",
 				"xprop",
 				"wl-clipboard",
diff --git a/system_files/shared/etc/ublue-update/ublue-update.toml b/system_files/shared/etc/ublue-update/ublue-update.toml
deleted file mode 100644
index 32cd415bba4..00000000000
--- a/system_files/shared/etc/ublue-update/ublue-update.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-[checks]
-    min_battery_percent = 20.0
-    max_cpu_load_percent = 50.0
-    max_mem_percent = 90.0
-    network_not_metered = true  # Abort if network connection is metered
-[notify]
-    dbus_notify = false
diff --git a/system_files/shared/usr/share/ublue-os/just/10-update.just b/system_files/shared/usr/share/ublue-os/just/10-update.just
index 459d29f5b27..ac3c1527377 100644
--- a/system_files/shared/usr/share/ublue-os/just/10-update.just
+++ b/system_files/shared/usr/share/ublue-os/just/10-update.just
@@ -5,9 +5,7 @@ alias upgrade := update
 # Update system, flatpaks, and containers all at once
 update:
     #!/usr/bin/bash
-    TOPGRADE_CONFIG="/usr/share/ublue-os/topgrade"
-    /usr/bin/grep "^LockLayering=true" /etc/rpm-ostreed.conf &>/dev/null && TOPGRADE_CONFIG="${TOPGRADE_CONFIG}-bootc"
-    /usr/bin/topgrade --config "${TOPGRADE_CONFIG}.toml" --keep
+    pkexec uupd --log-level debug
 
 alias auto-update := toggle-updates
 
@@ -16,7 +14,7 @@ toggle-updates ACTION="prompt":
     #!/usr/bin/bash
     source /usr/lib/ujust/ujust.sh
     CURRENT_STATE="Disabled"
-    if systemctl is-enabled ublue-update.timer | grep -q enabled; then
+    if systemctl is-enabled uupd.timer | grep -q enabled; then
         CURRENT_STATE="Enabled"
     fi
     OPTION={{ ACTION }}
@@ -32,9 +30,9 @@ toggle-updates ACTION="prompt":
         exit 0
     fi
     if [ "${OPTION,,}" == "enable" ]; then
-        sudo systemctl enable ublue-update.timer
+        sudo systemctl enable uupd.timer
     elif [ "${OPTION,,}" == "disable" ]; then
-        sudo systemctl disable ublue-update.timer
+        sudo systemctl disable uupd.timer
     fi
 
 alias changelog := changelogs
diff --git a/system_files/shared/usr/share/ublue-os/topgrade-bootc.toml b/system_files/shared/usr/share/ublue-os/topgrade-bootc.toml
deleted file mode 100644
index 2f7cfcbadd9..00000000000
--- a/system_files/shared/usr/share/ublue-os/topgrade-bootc.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-[misc]
-no_self_update = true
-only = ["custom_commands", "flatpak", "distrobox", "firmware"]
-disable = ["self_update", "toolbx", "containers", "helm", "system"]
-ignore_failures = ["distrobox", "flatpak", "brew_cask", "brew_formula", "nix", "node", "pip3", "home_manager", "firmware"]
-assume_yes = true
-no_retry = false
-
-[commands]
-"System Upgrade" = "sudo bootc upgrade"
diff --git a/system_files/shared/usr/share/ublue-os/topgrade.toml b/system_files/shared/usr/share/ublue-os/topgrade.toml
deleted file mode 100644
index 1498c0c8439..00000000000
--- a/system_files/shared/usr/share/ublue-os/topgrade.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-[misc]
-no_self_update = true
-only = ["system", "flatpak", "distrobox", "firmware"]
-disable = ["self_update", "toolbx", "containers", "helm"]
-ignore_failures = ["distrobox", "flatpak", "brew_cask", "brew_formula", "nix", "node", "pip3", "home_manager", "firmware"]
-assume_yes = true
-no_retry = false
-
-[linux]
-rpm_ostree = true