diff --git a/Containerfile b/Containerfile
index 42442d4..379aa1c 100644
--- a/Containerfile
+++ b/Containerfile
@@ -33,7 +33,7 @@ ARG SOURCE_IMAGE="base"
 # - stable-zfs
 # - stable-nvidia-zfs
 # - (and the above with testing rather than stable)
-ARG SOURCE_SUFFIX="-nvidia"
+ARG SOURCE_SUFFIX="-main"
 
 ## SOURCE_TAG arg must be a version built for the specific image: eg, 39, 40, gts, latest
 ARG SOURCE_TAG="latest"
diff --git a/build.sh b/build.sh
index 62f07d3..1b50a15 100755
--- a/build.sh
+++ b/build.sh
@@ -6,9 +6,6 @@ RELEASE="$(rpm -E %fedora)"
 
 ### Add repos
 
-# Add niri repo
-curl -Lo /etc/yum.repos.d/yalter-niri-fedora-"${RELEASE}".repo https://copr.fedorainfracloud.org/coprs/yalter/niri/repo/fedora-"${RELEASE}"/yalter-niri-fedora-"${RELEASE}".repo
-
 # Add Staging repo
 curl -Lo /etc/yum.repos.d/ublue-os-staging-fedora-"${RELEASE}".repo https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"${RELEASE}"/ublue-os-staging-fedora-"${RELEASE}".repo
 
@@ -63,23 +60,12 @@ WantedBy=default.target
 EOF
 done
 
-#### Setup niri deps
-
-mkdir /usr/lib/systemd/user/niri.service.wants
-ln -s /usr/lib/systemd/user/mako.service /usr/lib/systemd/user/niri.service.wants/
-ln -s /usr/lib/systemd/user/waybar.service /usr/lib/systemd/user/niri.service.wants/
-ln -s /usr/lib/systemd/user/swayidle.service /usr/lib/systemd/user/niri.service.wants/
-ln -s /usr/lib/systemd/user/kanshi.service /usr/lib/systemd/user/niri.service.wants/
-
 #### Services
 
 # systemctl enable docker.socket
 systemctl enable podman.socket
 systemctl enable podman-auto-update.timer
 # systemctl enable tailscaled.service
-
-systemctl enable -f --global niri.service
-
 systemctl enable -f --global flatpak-setup.service
 systemctl enable -f --global azure-topgrade.service
 systemctl enable -f --global azure-cli.target
diff --git a/files/usr/lib/systemd/user/swayidle.service b/files/usr/lib/systemd/user/swayidle.service
deleted file mode 100644
index dd74f93..0000000
--- a/files/usr/lib/systemd/user/swayidle.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-PartOf=graphical-session.target
-After=graphical-session.target
-Requisite=graphical-session.target
-
-[Service]
-ExecStart=/usr/bin/swayidle -w
-Restart=on-failure
diff --git a/packages b/packages
index 48b18ea..00e3dc2 100644
--- a/packages
+++ b/packages
@@ -1,6 +1,6 @@
 # Compositor
 xorg-x11-server-Xwayland
-niri
+river
 
 # apps
 foot
@@ -8,14 +8,17 @@ mako
 waybar
 kanshi
 fuzzel
-swaybg
-swayidle
-swaylock
+
+# Fingerprint
 
 # fonts
 nerd-fonts
 fontawesome-fonts-all
 
+# lock
+swayidle
+swaylock
+
 # utility
 slurp
 grimshot