diff --git a/profiles/templates/3.6/2_ac_install_merge/media-libs/libsdl/99sdl b/profiles/templates/3.6/2_ac_install_merge/media-libs/libsdl/99sdl
index b29bf6ae5..3347e68d1 100644
--- a/profiles/templates/3.6/2_ac_install_merge/media-libs/libsdl/99sdl
+++ b/profiles/templates/3.6/2_ac_install_merge/media-libs/libsdl/99sdl
@@ -1,3 +1,3 @@
 # Calculate format=procmail
-SDL_AUDIODRIVER=alsa
+SDL_AUDIODRIVER=#-os_audio-#
 AUDIODEV=default
diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/media-video/pipewire/99-pipewire-default.conf.remove b/profiles/templates/3.6/3_ac_install_live/1-merge/media-video/pipewire/99-pipewire-default.conf.remove
index e86de81c7..918d98018 100644
--- a/profiles/templates/3.6/3_ac_install_live/1-merge/media-video/pipewire/99-pipewire-default.conf.remove
+++ b/profiles/templates/3.6/3_ac_install_live/1-merge/media-video/pipewire/99-pipewire-default.conf.remove
@@ -1,2 +1,2 @@
-# Calculate path=/etc/alsa/conf.d name=99-pipewire-default.conf os_audio==alsa
+# Calculate path=/etc/alsa/conf.d name=99-pipewire-default.conf os_audio==alsa append=remove