diff --git a/audio.yaml b/audio.yaml
index ec8fbf4..1f0bc4b 100644
--- a/audio.yaml
+++ b/audio.yaml
@@ -16,34 +16,24 @@
       ansible.builtin.lineinfile:
         path: /etc/environment
         search_string: 'PIPEWIRE_LATENCY=256/48000'
-        line: PIPEWIRE_LATENCY=256/48000
+        line: PIPEWIRE_LATENCY=128/48000
   tasks:
-    - name: Install music packages
-      ansible.builtin.package:
+    - name: Install music flatpaks
+      community.general.flatpak:
+        state: present
+        remote: flathub
         name:
-          - ardour8
-          - qpwgraph
-          - guitarix
-          - hydrogen
-          - lv2-avldrums-x42-plugin
-          - lv2-guitarix-plugins
-          - mod-gxpitchshifter.x86_64
-          - qsynth
-          - tuxguitar
-          - lv2-sfizz-ui
-          - carla
-          - lv2-carla
-          - drumgizmo
-    - name: Install Hydrogen drumkits
-      ansible.builtin.package:
-        name:
-          - hydrogen-drumkit-Roland_TB909
-          - hydrogen-drumkit-Roland_Tr-808_full
-          - AVLDrumkits-BlackPearl-H2-repack
-          - AVLDrumkits-BlondeBop-HotRod.h2d
-          - AVLDrumkits-BlondeBop.h2d
-          - AVLDrumkits-BuskmansHoliday
-          - AVLDrumkits-RedZeppelin-H2-repack.h2d
+          - org.ardour.Ardour
+          - org.rncbc.qpwgraph
+          - org.guitarix.Guitarix
+          - org.hydrogenmusic.Hydrogen
+          - org.rncbc.qsynth
+          - ar.com.tuxguitar.TuxGuitar
+          - studio.kx.carla
+          - org.freedesktop.LinuxAudio.Plugins.sfizz//24.08
+          - org.freedesktop.LinuxAudio.Plugins.Guitarix//24.08
+          - org.freedesktop.LinuxAudio.Plugins.DrumGizmo//24.08
+          - org.freedesktop.LinuxAudio.Plugins.AVLDrums//24.08
 
   post_tasks:
     - name: Make sure a realtime services unit enabled
diff --git a/office.yaml b/office.yaml
index 5bfb835..6712c98 100644
--- a/office.yaml
+++ b/office.yaml
@@ -10,4 +10,3 @@
         remote: flathub
         name:
           - eu.betterbird.Betterbird
-          - org.gimp.GIMP