diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini b/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini
index 84f41c756..8e5d78b25 100644
--- a/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini
+++ b/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini
@@ -2,4 +2,4 @@
 
 [overlay-calculate]
 # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system
-remerge = 20210923
+remerge = 20211007
diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20211007 b/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20211007
new file mode 100644
index 000000000..5964efab3
--- /dev/null
+++ b/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20211007
@@ -0,0 +1,4 @@
+# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=kde-apps/kmix,kde-plasma/plasma-pa,media-libs/libsdl,media-plugins/alsa-plugins,media-sound/alsa-utils,media-sound/pavucontrol,media-sound/pulseaudio,media-sound/qastools,media-sound/volumeicon,media-video/pipewire,net-wireless/bluez
+
+[overlay-calculate]
+remerge = #-cl_pass_file-#
diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2021/20210927-remove_xl2tpd b/profiles/templates/3.6/6_ac_update_sync/revision/2021/20210927-remove_xl2tpd
index b3bd36477..272cdc25f 100644
--- a/profiles/templates/3.6/6_ac_update_sync/revision/2021/20210927-remove_xl2tpd
+++ b/profiles/templates/3.6/6_ac_update_sync/revision/2021/20210927-remove_xl2tpd
@@ -1,4 +1,6 @@
 # Calculate exec=/bin/bash ini(overlay-calculate.revision)=>20191116.3,#-cut(0,-,#-cl_pass_file-#)-#
 
+#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-#
+
 rm -rf /xl2tpd
 exit 0
diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2021/20211007-migrate_to_pipewire b/profiles/templates/3.6/6_ac_update_sync/revision/2021/20211007-migrate_to_pipewire
new file mode 100644
index 000000000..356518590
--- /dev/null
+++ b/profiles/templates/3.6/6_ac_update_sync/revision/2021/20211007-migrate_to_pipewire
@@ -0,0 +1,9 @@
+# Calculate exec=/bin/bash ini(overlay-calculate.revision)=>20211007,#-cut(0,-,#-cl_pass_file-#)-#
+
+#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-#
+
+#?os_audio!=alsa#
+sed -i "s/os_audio = pulseaudio/os_audio = pipewire/" /var/lib/calculate/calculate.env
+#os_audio#
+
+exit 0