diff --git a/system_files/deck/shared/usr/etc/wireplumber/bluetooth.lua.d/60-bluez-jupiter.lua b/system_files/deck/shared/usr/etc/wireplumber/bluetooth.lua.d/60-bluez-jupiter.lua
deleted file mode 100644
index b1e81200..00000000
--- a/system_files/deck/shared/usr/etc/wireplumber/bluetooth.lua.d/60-bluez-jupiter.lua
+++ /dev/null
@@ -1,25 +0,0 @@
-bluez_monitor.properties = {
-  -- we only want these audio profiles:
-  -- 0000110a-0000-1000-8000-00805f9b34fb Audio Source
-  -- 0000110b-0000-1000-8000-00805f9b34fb Audio Sink
-  -- 0000110d-0000-1000-8000-00805f9b34fb Advanced Audio Distribution
-  ["bluez5.roles"] = "[ a2dp_sink a2dp_source ]",
-
-  -- And only this one headset related profile:
-  -- 00001112-0000-1000-8000-00805f9b34fb Headset
-  -- disabled: 00001108-0000-1000-8000-00805f9b34fb hsp_hs
-  -- disabled: 0000111e-0000-1000-8000-00805f9b34fb hfp_hs
-  -- disabled: 0000111f-0000-1000-8000-00805f9b34fb hfp_ag
-  -- >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> * <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-  -- NOTE: check hfphsp-backend below as that also affects hs/hf profiles
-  -- >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> * <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-  ["bluez5.headset-roles"] = "[ hsp_ag ]",
-
-  -- HFP/HSP backend (default: native).
-  -- Available values: any, none, hsphfpd, ofono, native
-  -- setting this to "none" disables all headset roles
-  ["bluez5.hfphsp-backend"] = "none",
-
-  -- Disable dummy AVRCP player
-  ["bluez5.dummy-avrcp-player"] = false
-}
diff --git a/system_files/deck/shared/usr/etc/wireplumber/main.lua.d/60-alsa-acp5x-config.lua b/system_files/deck/shared/usr/etc/wireplumber/main.lua.d/60-alsa-acp5x-config.lua
deleted file mode 100644
index c710c9bf..00000000
--- a/system_files/deck/shared/usr/etc/wireplumber/main.lua.d/60-alsa-acp5x-config.lua
+++ /dev/null
@@ -1,48 +0,0 @@
---ACP5X card hardware never hibernates, so remove the pops and lags.
-
-table.insert (alsa_monitor.rules, {
-  matches = {
-    {
-      -- Matches all sources from card acp5x
-      { "node.name", "matches", "alsa_input.*" },
-      { "alsa.card_name", "matches", "acp5x" },
-    },
-
-    {
-      -- Matches all sources from card acp6x
-      { "node.name", "matches", "alsa_input.*" },
-      { "alsa.card_name", "matches", "acp6x" },
-    },
-
-    {
-      -- Matches all sources from SOF drivers
-      { "node.name", "matches", "alsa_input.*" },
-      { "alsa.card_name", "matches", "sof-nau8821-max" },
-    },
-
-    {
-      -- Matches all sinks from card acp5x
-      { "node.name", "matches", "alsa_output.*" },
-      { "alsa.card_name", "matches", "acp5x" },
-    },
-
-    {
-      -- Matches all sinks from card acp6x
-      { "node.name", "matches", "alsa_output.*" },
-      { "alsa.card_name", "matches", "acp6x" },
-    },
-
-    {
-      -- Matches all sinks from card acp6x
-      { "node.name", "matches", "alsa_output.*" },
-      { "alsa.card_name", "matches", "sof-nau8821-max" },
-    },
-
-
-  },
-  apply_properties = {
-    ["session.suspend-timeout-seconds"] = 0,
-    ["api.alsa.headroom"]      = 1024,
-
-  }
-})
diff --git a/system_files/deck/shared/usr/etc/wireplumber/main.lua.d/60-alsa-card0-config.lua b/system_files/deck/shared/usr/etc/wireplumber/main.lua.d/60-alsa-card0-config.lua
deleted file mode 100644
index 6a887c98..00000000
--- a/system_files/deck/shared/usr/etc/wireplumber/main.lua.d/60-alsa-card0-config.lua
+++ /dev/null
@@ -1,25 +0,0 @@
--- HDMI output is always plugged in card 0 (HD_Audio Generic)
--- We always give higher priority to nodes from that card
--- Disable suspend timeout for HDMI to remove audio delay after idle
-
-table.insert (alsa_monitor.rules, {
-  matches = {
-    {
-      -- Matches all sources from card HD-Audio Generic
-      { "node.name", "matches", "alsa_input.*" },
-      { "alsa.card_name", "matches", "HD-Audio Generic" },
-    },
-    {
-      -- Matches all sinks from card HD-Audio Generic
-      { "node.name", "matches", "alsa_output.*" },
-      { "alsa.card_name", "matches", "HD-Audio Generic" },
-    },
-  },
-  apply_properties = {
-    ["priority.driver"]        = 900,
-    ["priority.session"]       = 900,
-    ["api.alsa.period-size"]   = 256,
-    ["api.alsa.headroom"]      = 1024,
-    ["session.suspend-timeout-seconds"] = 0
-  }
-})
diff --git a/system_files/deck/shared/usr/etc/wireplumber/main.lua.d/60-alsa-ps-controller-config.lua b/system_files/deck/shared/usr/etc/wireplumber/main.lua.d/60-alsa-ps-controller-config.lua
deleted file mode 100644
index 6ae8fae0..00000000
--- a/system_files/deck/shared/usr/etc/wireplumber/main.lua.d/60-alsa-ps-controller-config.lua
+++ /dev/null
@@ -1,21 +0,0 @@
--- PS4/PS5 Controller output is always referenced as Wireless Controller
--- We always give the lowest priority to nodes from that card
-
-table.insert (alsa_monitor.rules, {
-  matches = {
-    {
-      -- Matches all sources from card Controller
-      { "node.name", "matches", "alsa_input.*" },
-      { "alsa.card_name", "matches", "Wireless Controller" },
-    },
-    {
-      -- Matches all sinks from card Wireless Controller
-      { "node.name", "matches", "alsa_output.*" },
-      { "alsa.card_name", "matches", "Wireless Controller" },
-    },
-  },
-  apply_properties = {
-    ["priority.driver"]        = 99,
-    ["priority.session"]       = 99,
-  }
-})
diff --git a/system_files/deck/shared/usr/etc/wireplumber/wireplumber.conf.d/alsa-card0.conf b/system_files/deck/shared/usr/etc/wireplumber/wireplumber.conf.d/alsa-card0.conf
new file mode 100644
index 00000000..73255fb9
--- /dev/null
+++ b/system_files/deck/shared/usr/etc/wireplumber/wireplumber.conf.d/alsa-card0.conf
@@ -0,0 +1,23 @@
+monitor.alsa.rules = [
+  {
+    matches = [
+      {
+        node.name = "~alsa_input.*"
+        alsa.card_name = "HD-Audio Generic"
+      }
+      {
+        node.name = "~alsa_output.*"
+        alsa.card_name = "HD-Audio Generic"
+      }
+    ]
+    actions = {
+      update-props = {
+        priority.driver        = 900
+        priority.session       = 900
+        api.alsa.period-size   = 256
+        api.alsa.headroom      = 1024
+        session.suspend-timeout-seconds = 0
+      }
+    }
+  }
+]
diff --git a/system_files/deck/shared/usr/etc/wireplumber/wireplumber.conf.d/alsa-card1.conf b/system_files/deck/shared/usr/etc/wireplumber/wireplumber.conf.d/alsa-card1.conf
new file mode 100644
index 00000000..4f2e57a2
--- /dev/null
+++ b/system_files/deck/shared/usr/etc/wireplumber/wireplumber.conf.d/alsa-card1.conf
@@ -0,0 +1,36 @@
+monitor.alsa.rules = [
+  {
+    matches = [
+      {
+        node.name = "~alsa_input.*"
+        alsa.card_name = "acp5x"
+      }
+      {
+        node.name = "~alsa_input.*"
+        alsa.card_name = "acp6x"
+      }
+      {
+        node.name = "~alsa_input.*"
+        alsa.card_name = "sof-nau8821-max"
+      }
+      {
+        node.name = "~alsa_output.*"
+        alsa.card_name = "acp5x"
+      }
+      {
+        node.name = "~alsa_output.*"
+        alsa.card_name = "acp6x"
+      }
+      {
+        node.name = "~alsa_output.*"
+        alsa.card_name = "sof-nau8821-max"
+      }
+    ]
+    actions = {
+      update-props = {
+        session.suspend-timeout-seconds   = 0
+        api.alsa.headroom      = 1024
+      }
+    }
+  }
+]
diff --git a/system_files/deck/shared/usr/etc/wireplumber/wireplumber.conf.d/alsa-ps-controller.conf b/system_files/deck/shared/usr/etc/wireplumber/wireplumber.conf.d/alsa-ps-controller.conf
new file mode 100644
index 00000000..e0c2a5ff
--- /dev/null
+++ b/system_files/deck/shared/usr/etc/wireplumber/wireplumber.conf.d/alsa-ps-controller.conf
@@ -0,0 +1,20 @@
+monitor.alsa.rules = [
+  {
+    matches = [
+      {
+        node.name = "~alsa_input.*"
+        alsa.card_name = "Wireless Controller"
+      }
+      {
+        node.name = "~alsa_output.*"
+        alsa.card_name = "Wireless Controller"
+      }
+    ]
+    actions = {
+      update-props = {
+        priority.driver        = 90
+        priority.session       = 90
+      }
+    }
+  }
+]
diff --git a/system_files/deck/shared/usr/etc/wireplumber/wireplumber.conf.d/bluez.conf b/system_files/deck/shared/usr/etc/wireplumber/wireplumber.conf.d/bluez.conf
new file mode 100644
index 00000000..75e8f21a
--- /dev/null
+++ b/system_files/deck/shared/usr/etc/wireplumber/wireplumber.conf.d/bluez.conf
@@ -0,0 +1,25 @@
+monitor.bluez.properties = {
+  ## we only want these audio profiles:
+  ## 0000110a-0000-1000-8000-00805f9b34fb Audio Source
+  ## 0000110b-0000-1000-8000-00805f9b34fb Audio Sink
+  ## 0000110d-0000-1000-8000-00805f9b34fb Advanced Audio Distribution
+
+  ## And only this one headset related profile:
+  ## disabled: 00001112-0000-1000-8000-00805f9b34fb hsp_ag
+  ## disabled: 00001108-0000-1000-8000-00805f9b34fb hsp_hs
+  ## disabled: 0000111e-0000-1000-8000-00805f9b34fb hfp_hf
+  ## enabled : 0000111f-0000-1000-8000-00805f9b34fb hfp_ag
+  ## >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> * <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+  ## NOTE: This used to be in .headset-roles, which was merged into .roles
+  ## NOTE: check hfphsp-backend below as that also affects hs/hf profiles
+  ## >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> * <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+  bluez5.roles = "[ a2dp_sink a2dp_source hfp_ag ]"
+
+  ## HFP/HSP backend (default: native).
+  ## Available values: any, none, hsphfpd, ofono, native
+  ## setting this to "none" disables all headset roles
+  bluez5.hfphsp-backend = "native"
+
+  ## Disable dummy AVRCP player
+  bluez5.dummy-avrcp-player = false
+}