diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-kernel/calculate-sources/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/calculate-sources/.calculate_directory
index 4582b7495..637ef8656 100644
--- a/profiles/templates/3.6/2_ac_install_merge/sys-kernel/calculate-sources/.calculate_directory
+++ b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/calculate-sources/.calculate_directory
@@ -1,2 +1,2 @@
-# Calculate mergepkg()!= path=/etc name=local.d
+# Calculate mergepkg()!= name=etc
 
diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-kernel/calculate-sources/amdgpu.conf b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/calculate-sources/amdgpu.conf
deleted file mode 100644
index 0e0a9b478..000000000
--- a/profiles/templates/3.6/2_ac_install_merge/sys-kernel/calculate-sources/amdgpu.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate path=/etc/modprobe.d comment=#
-
-options amdgpu cik_support=1 si_support=1
diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-kernel/calculate-sources/cron.daily/fstrim b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/calculate-sources/cron.daily/fstrim
new file mode 100644
index 000000000..8231bba2d
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/calculate-sources/cron.daily/fstrim
@@ -0,0 +1,4 @@
+# Calculate chmod=755
+#!/bin/sh
+# trim all mounted file systems which support it
+/sbin/fstrim --all || true
diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-kernel/calculate-sources/modprobe.d/amdgpu.conf b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/calculate-sources/modprobe.d/amdgpu.conf
new file mode 100644
index 000000000..30cb9b29b
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/calculate-sources/modprobe.d/amdgpu.conf
@@ -0,0 +1,2 @@
+# Calculate comment=#
+options amdgpu cik_support=1 si_support=1
diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-kernel/calculate-sources/modprobe.d/vboxvideo.conf b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/calculate-sources/modprobe.d/vboxvideo.conf
new file mode 100644
index 000000000..c100da724
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/calculate-sources/modprobe.d/vboxvideo.conf
@@ -0,0 +1,2 @@
+# Calculate comment=#
+options vboxvideo modeset=0
diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-kernel/calculate-sources/vboxvideo.conf b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/calculate-sources/vboxvideo.conf
deleted file mode 100644
index 253f7cbc2..000000000
--- a/profiles/templates/3.6/2_ac_install_merge/sys-kernel/calculate-sources/vboxvideo.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate path=/etc/modprobe.d
-
-options vboxvideo modeset=0
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 123d2e34f..175643e3a 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 = 20211018
+remerge = 20211018.1
diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20211018 b/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20211018
index 4f2b148d2..8167a26be 100644
--- a/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20211018
+++ b/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20211018
@@ -1,4 +1,4 @@
-# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-kernel/calculate-sources,x11-drivers/nvidia-drivers
+# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=x11-drivers/nvidia-drivers
 
 [overlay-calculate]
 remerge = #-cl_pass_file-#
diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20211018.1 b/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20211018.1
new file mode 100644
index 000000000..5befd138c
--- /dev/null
+++ b/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20211018.1
@@ -0,0 +1,4 @@
+# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-kernel/calculate-sources
+
+[overlay-calculate]
+remerge = #-cl_pass_file-#
diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2021/20211019-remove_discard b/profiles/templates/3.6/6_ac_update_sync/revision/2021/20211019-remove_discard
new file mode 100644
index 000000000..138cfe0d9
--- /dev/null
+++ b/profiles/templates/3.6/6_ac_update_sync/revision/2021/20211019-remove_discard
@@ -0,0 +1,9 @@
+# Calculate exec=/bin/bash ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-#
+
+#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-#
+
+sed -i 's/,discard,//' /etc/fstab &>/dev/null
+sed -i 's/,discard//' /etc/fstab &>/dev/null
+sed -i 's/discard,//' /etc/fstab &>/dev/null
+
+exit 0