diff --git a/cookbooks/fb_choco/resources/fb_choco_bootstrap.rb b/cookbooks/fb_choco/resources/fb_choco_bootstrap.rb
index 3d41db557..721ffbe1e 100644
--- a/cookbooks/fb_choco/resources/fb_choco_bootstrap.rb
+++ b/cookbooks/fb_choco/resources/fb_choco_bootstrap.rb
@@ -74,7 +74,7 @@ def run_bootstrap_script
         node['fb_choco']['bootstrap']['use_windows_compression'].to_s,
     }
 
-    cookbook_file 'chocolatey_install script' do # ~FB031
+    cookbook_file 'chocolatey_install script' do
       path choco_install_ps1
       source 'choco_install/install.ps1'
       owner 'Administrators'
diff --git a/cookbooks/fb_chrony/recipes/default.rb b/cookbooks/fb_chrony/recipes/default.rb
index 76901f056..d2d68ff11 100644
--- a/cookbooks/fb_chrony/recipes/default.rb
+++ b/cookbooks/fb_chrony/recipes/default.rb
@@ -41,7 +41,7 @@
   mode '0750'
 end
 
-template 'chrony.conf' do # ~FB031
+template 'chrony.conf' do
   path chrony_conf
   source 'chrony.conf.erb'
   owner 'root'
diff --git a/cookbooks/fb_fluentbit/recipes/fluent-bit_default.rb b/cookbooks/fb_fluentbit/recipes/fluent-bit_default.rb
index a501f6a43..eb1962752 100644
--- a/cookbooks/fb_fluentbit/recipes/fluent-bit_default.rb
+++ b/cookbooks/fb_fluentbit/recipes/fluent-bit_default.rb
@@ -74,7 +74,7 @@
 include_recipe 'fb_fluentbit::fluent-bit_rhel' if node.rhel_family?
 include_recipe 'fb_fluentbit::fluent-bit_windows' if node.windows?
 
-template 'plugins config' do # ~FB031
+template 'plugins config' do
   action :create
   source 'plugins.conf.erb'
   path plugins_file_path
@@ -89,7 +89,7 @@
   end
 end
 
-template 'parsers config' do # ~FB031
+template 'parsers config' do
   action :create
   source 'parsers.conf.erb'
   path parsers_file_path
@@ -120,7 +120,7 @@
   end
 end
 
-template 'local config' do # ~FB031
+template 'local config' do
   not_if { node['fb_fluentbit']['external_config_url'] }
   action :create
   source 'conf.erb'
diff --git a/cookbooks/fb_fluentbit/recipes/td-agent-bit_default.rb b/cookbooks/fb_fluentbit/recipes/td-agent-bit_default.rb
index e5f55a2cf..700642584 100644
--- a/cookbooks/fb_fluentbit/recipes/td-agent-bit_default.rb
+++ b/cookbooks/fb_fluentbit/recipes/td-agent-bit_default.rb
@@ -74,7 +74,7 @@
 include_recipe 'fb_fluentbit::td-agent-bit_rhel' if node.rhel_family?
 include_recipe 'fb_fluentbit::td-agent-bit_windows' if node.windows?
 
-template 'plugins config' do # ~FB031
+template 'plugins config' do
   action :create
   source 'plugins.conf.erb'
   path plugins_file_path
@@ -89,7 +89,7 @@
   end
 end
 
-template 'parsers config' do # ~FB031
+template 'parsers config' do
   action :create
   source 'parsers.conf.erb'
   path parsers_file_path
@@ -120,7 +120,7 @@
   end
 end
 
-template 'local config' do # ~FB031
+template 'local config' do
   not_if { node['fb_fluentbit']['external_config_url'] }
   action :create
   source 'conf.erb'
diff --git a/cookbooks/fb_grub/recipes/config.rb b/cookbooks/fb_grub/recipes/config.rb
index 8afed4815..f09c859ab 100644
--- a/cookbooks/fb_grub/recipes/config.rb
+++ b/cookbooks/fb_grub/recipes/config.rb
@@ -36,7 +36,7 @@
   mode '0755'
 end
 
-template 'grub_config' do # ~FB031
+template 'grub_config' do
   only_if do
     node['platform_family'] == 'rhel' && node['fb_grub']['kernels'] &&
       node['fb_grub']['version'] == 1
@@ -82,7 +82,7 @@
   # to x86_64.
   efi_command = type == 'efi' && node.x64?
 
-  template "grub2_config_#{type}" do # ~FB031
+  template "grub2_config_#{type}" do
     only_if do
       (node['fb_grub']['kernels'] && node['fb_grub']['version'] == 2) &&
       (our_type || node['fb_grub']['force_both_efi_and_bios'])
diff --git a/cookbooks/fb_kernel/resources/bls_entries.rb b/cookbooks/fb_kernel/resources/bls_entries.rb
index da3ad6bc8..db11b2daa 100644
--- a/cookbooks/fb_kernel/resources/bls_entries.rb
+++ b/cookbooks/fb_kernel/resources/bls_entries.rb
@@ -24,7 +24,7 @@
     bls_entry =
       ::File.join(bls_root, "#{node['machine_id']}-#{data['version']}.conf")
 
-    template bls_entry do # ~FB031
+    template bls_entry do
       source 'bls-entry.conf.erb'
       owner 'root'
       group 'root'
diff --git a/cookbooks/fb_networkd/resources/default.rb b/cookbooks/fb_networkd/resources/default.rb
index a1ca473c8..a1e41d1c0 100644
--- a/cookbooks/fb_networkd/resources/default.rb
+++ b/cookbooks/fb_networkd/resources/default.rb
@@ -102,7 +102,7 @@
     )
 
     # Set up the template for this interface
-    fb_helpers_gated_template conffile do # ~FB031
+    fb_helpers_gated_template conffile do
       allow_changes node.interface_change_allowed?(conf['name'])
       source 'networkd.conf.erb'
       owner node.root_user
@@ -180,7 +180,7 @@
     )
 
     # Set up the template for this interface
-    fb_helpers_gated_template conffile do # ~FB031
+    fb_helpers_gated_template conffile do
       allow_changes node.interface_change_allowed?(conf['name'])
       source 'networkd.conf.erb'
       owner node.root_user
@@ -263,7 +263,7 @@
     )
 
     # Set up the template for this interface
-    fb_helpers_gated_template conffile do # ~FB031
+    fb_helpers_gated_template conffile do
       allow_changes node.interface_change_allowed?(conf['name'])
       source 'networkd.conf.erb'
       owner node.root_user
diff --git a/cookbooks/fb_powershell/resources/fb_powershell_apply_config.rb b/cookbooks/fb_powershell/resources/fb_powershell_apply_config.rb
index 7d5f0ef09..4043183c6 100644
--- a/cookbooks/fb_powershell/resources/fb_powershell_apply_config.rb
+++ b/cookbooks/fb_powershell/resources/fb_powershell_apply_config.rb
@@ -26,7 +26,7 @@
   install_paths = install_pwsh_path_list(node)
   install_paths.each do |install_path|
     path = ::File.join(install_path, 'powershell.config.json')
-    template path do # ~FB031
+    template path do
       only_if { node['fb_powershell']['manage_config'] }
       source 'powershell.config.json.erb'
       if platform?('windows')
diff --git a/cookbooks/fb_stunnel/recipes/default.rb b/cookbooks/fb_stunnel/recipes/default.rb
index 1fbade98d..f51508b35 100644
--- a/cookbooks/fb_stunnel/recipes/default.rb
+++ b/cookbooks/fb_stunnel/recipes/default.rb
@@ -60,7 +60,7 @@
   end
 end
 
-template sysconfig do # ~FB031
+template sysconfig do
   source 'sysconfig.erb'
   owner 'root'
   group 'root'
diff --git a/cookbooks/fb_yum_repos/resources/default.rb b/cookbooks/fb_yum_repos/resources/default.rb
index 6a3ced84d..6c33cd35b 100644
--- a/cookbooks/fb_yum_repos/resources/default.rb
+++ b/cookbooks/fb_yum_repos/resources/default.rb
@@ -43,7 +43,7 @@
            group
     end
 
-    template ::File.join(YUM_REPOS_D, "#{group}.repo") do # ~FB031
+    template ::File.join(YUM_REPOS_D, "#{group}.repo") do
       source 'yum.repo.erb'
       owner 'root'
       group 'root'