diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-kernel/calculate-sources/nvidia_i2c.conf b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/calculate-sources/nvidia_i2c.conf
deleted file mode 100644
index 47d4f4fcd..000000000
--- a/profiles/templates/3.6/2_ac_install_merge/sys-kernel/calculate-sources/nvidia_i2c.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# Calculate mergepkg()<=5.11,5.10 comment=#
-
-blacklist i2c_nvidia_gpu
diff --git a/profiles/templates/3.6/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia_i2c.conf b/profiles/templates/3.6/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia_i2c.conf
new file mode 100644
index 000000000..d31fb1535
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/x11-drivers/nvidia-drivers/nvidia_i2c.conf
@@ -0,0 +1,3 @@
+# Calculate pkg(sys-kernel/calculate-sources)=>5.10,5.11 path=/etc/modprobe.d
+# Fix run Nvidia drivers with kernel 5.10.x on some cards
+blacklist i2c_nvidia_gpu
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 67b2d753a..123d2e34f 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 = 20211017
+remerge = 20211018
diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20211017 b/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20211018
similarity index 57%
rename from profiles/templates/3.6/6_ac_update_sync/remerge/2021/20211017
rename to profiles/templates/3.6/6_ac_update_sync/remerge/2021/20211018
index 5befd138c..4f2b148d2 100644
--- a/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20211017
+++ 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
+# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-kernel/calculate-sources,x11-drivers/nvidia-drivers
 
 [overlay-calculate]
 remerge = #-cl_pass_file-#
diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2021/20211018-fix_nvidia_conf b/profiles/templates/3.6/6_ac_update_sync/revision/2021/20211018-fix_nvidia_conf
new file mode 100644
index 000000000..858ac2117
--- /dev/null
+++ b/profiles/templates/3.6/6_ac_update_sync/revision/2021/20211018-fix_nvidia_conf
@@ -0,0 +1,6 @@
+# Calculate exec=/bin/bash ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-#
+
+#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-#
+
+rm -f /etc/local.d/nvidia_i2c.conf
+exit 0