diff --git a/roles/desktop/defaults/main.yml b/roles/desktop/defaults/main.yml
index 0ff8bb5..233dd10 100644
--- a/roles/desktop/defaults/main.yml
+++ b/roles/desktop/defaults/main.yml
@@ -55,6 +55,7 @@ desktop_apt_packages:
   - cmake                               # Also useful for building from source
   - fastboot                            # Also used for phone debugging
   - ffmpeg                              # Fantastic tool, used on the daily
+  - flatpak                             # YAPM
   - git                                 # Just ensuring it's installed, probably already in build-essential
   - helm                                # It Just Works
   - imagemagick                         # I use it from time to time to do scripted image editing
@@ -123,7 +124,6 @@ desktop_apt_packages:
   - mpv                                 # Video player of choice
   - mupen64plus-qt                      # For when I don't want to fight libretro
   - nextcloud-desktop                   # Desktop sync client for probably another box in this repo
-  - obs-studio                          # Useful for replay functionality every now and again
   - piper                               # Peripheral LED management, only available on Focal or higher
   - plymouth-theme-spinner              # Gives us the sweet UEFI boot logo splash
   - pulseeffects                        # ECHO... Echo... echo... echo...
@@ -145,10 +145,21 @@ desktop_apt_packages:
   - "mesa-vulkan-drivers:i386"
 desktop_apt_packages_extra: []
 
-desktop_apt_packages_remove: []
+desktop_apt_packages_remove:
+  # Previously installed, but obsoleted by Flatpak
+  - obs-studio
 desktop_apt_packages_remove_extra: []
 
 desktop_apt_debs:
   - "https://dl.discordapp.net/apps/linux/0.0.15/discord-0.0.15.deb" # Discord
   - "https://github.com/MultiMC/MultiMC5/releases/download/0.6.8/multimc_1.4-1.deb" # MultiMC
 desktop_apt_debs_extra: []
+
+desktop_flatpak_remotes:
+  - name: flathub
+    url: "https://dl.flathub.org/repo/flathub.flatpakrepo"
+desktop_flatpak_remotes_extra: []
+
+desktop_flatpak_packages:
+  - com.obsproject.Studio
+desktop_flatpak_packages_extra: []
diff --git a/roles/desktop/tasks/packages.yml b/roles/desktop/tasks/packages.yml
index cbeed7e..6330a4a 100644
--- a/roles/desktop/tasks/packages.yml
+++ b/roles/desktop/tasks/packages.yml
@@ -29,6 +29,13 @@
       # Ignoring errors here is important because this task fails on package backdates
       ignore_errors: yes
   when: ansible_pkg_mgr == "apt"
+- name: configure flatpak
+  block:
+    - name: configure flatpak remotes
+      flatpak_remote: name="{{ item.name }}" state=present flatpakrepo_url="{{ item.url }}"
+      with_items: "{{ desktop_flatpak_remotes + desktop_flatpak_remotes_extra }}"
+    - name: configure installed flatpaks
+      flatpak: name="{{ desktop_flatpak_packages + desktop_flatpak_packages_extra }}"
 - name: configure portage
   block:
       # Portage is very complex, so we sync an entire known good configuration tree