diff --git a/roles/desktop-common/tasks/main.yml b/roles/desktop-common/tasks/main.yml
index 50bf19f..de9808e 100644
--- a/roles/desktop-common/tasks/main.yml
+++ b/roles/desktop-common/tasks/main.yml
@@ -23,6 +23,7 @@
         dest: "{{ item.dest }}"
         mode: "{{ item.mode }}"
       loop:
+        - { src: "pulse-client.conf", dest: "/etc/pulse/client.conf", mode: "0644" }
         - { src: "pulse-daemon.conf", dest: "/etc/pulse/daemon.conf", mode: "0644" }
         - { src: "pulse-default.pa", dest: "/etc/pulse/default.pa", mode: "0644" }
         - { src: "sshd_config", dest: "/etc/ssh/sshd_config", mode: "0644" }
diff --git a/roles/desktop-common/templates/pulse-client.conf b/roles/desktop-common/templates/pulse-client.conf
new file mode 100644
index 0000000..116187e
--- /dev/null
+++ b/roles/desktop-common/templates/pulse-client.conf
@@ -0,0 +1,3 @@
+# Managed via Ansible
+autospawn = no
+default-server = unix:/tmp/pulse-server
diff --git a/roles/desktop-common/templates/pulse-default.pa b/roles/desktop-common/templates/pulse-default.pa
index 46c13c2..464f143 100644
--- a/roles/desktop-common/templates/pulse-default.pa
+++ b/roles/desktop-common/templates/pulse-default.pa
@@ -1,10 +1,77 @@
 #!/usr/bin/pulseaudio -nF
-.include /etc/pulse/default.pa
+#!/usr/bin/pulseaudio -nF
+#
+.fail
 
-# Gets around a weird audio skipping bug on my desktop
+load-module module-device-restore
+load-module module-stream-restore
+load-module module-card-restore
+load-module module-augment-properties
+### Should be after module-*-restore but before module-*-detect
+load-module module-switch-on-port-available
+### Use hot-plugged devices like Bluetooth or USB automatically (LP: #1702794)
+.ifexists module-switch-on-connect.so
+load-module module-switch-on-connect
+.endif
+
+# Device detection
+.ifexists module-udev-detect.so
+load-module module-udev-detect
+.else
+load-module module-detect
+.endif
+
+# Bluetooth
+.ifexists module-bluetooth-policy.so
+load-module module-bluetooth-policy
+.endif
+.ifexists module-bluetooth-discover.so
+load-module module-bluetooth-discover
+.endif
+
+# Protocols
+.ifexists module-esound-protocol-unix.so
+load-module module-esound-protocol-unix
+.endif
+load-module module-native-protocol-unix auth-group=audio socket=/tmp/pulse-server
+
+# Load GSettings/paprefs modules
+.ifexists module-gsettings.so
+.nofail
+load-module module-gsettings
+.fail
+.endif
+
+load-module module-default-device-restore
+load-module module-always-sink
+load-module module-intended-roles
+load-module module-suspend-on-idle
+
+### If autoexit on idle is enabled we want to make sure we only quit
+### when no local session needs us anymore.
+.ifexists module-console-kit.so
+load-module module-console-kit
+.endif
+.ifexists module-systemd-login.so
+load-module module-systemd-login
+.endif
+
+# Enable positioned event sounds
+load-module module-position-event-sounds
+# Cork music/video streams when a phone stream is active
+load-module module-role-cork
+# Block audio recording for snap confined packages
+.ifexists module-snap-policy.so
+load-module module-snap-policy
+.endif
+
+load-module module-filter-heuristics
+load-module module-filter-apply
+
+## Gets around a weird audio skipping bug on my desktop
 .ifexists module-udev-detect.so
 load-module module-udev-detect tsched=0
 
-# My laptop gets sink suspension popping when using headphones
+## My laptop gets sink suspension popping when using headphones
 unload-module module-suspend-on-idle