diff --git a/.rubocop.yml b/.rubocop.yml
index 5180d598..5e3a9290 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -3,6 +3,8 @@
 require:
 - rubocop-rake
 - rubocop-rspec
+- rubocop-factory_bot
+- rubocop-capybara
 
 AllCops:
   TargetRubyVersion: 2.3
@@ -395,13 +397,13 @@ RSpec/DuplicatedMetadata:
 RSpec/ExcessiveDocstringSpacing:
   Enabled: true
 
-RSpec/FactoryBot/ConsistentParenthesesStyle:
+FactoryBot/ConsistentParenthesesStyle:
   Enabled: true
 
-RSpec/FactoryBot/FactoryNameStyle:
+FactoryBot/FactoryNameStyle:
   Enabled: true
 
-RSpec/FactoryBot/SyntaxMethods:
+FactoryBot/SyntaxMethods:
   Enabled: true
 
 RSpec/IdenticalEqualityAssertion:
@@ -416,19 +418,19 @@ RSpec/NoExpectationExample:
 RSpec/PendingWithoutReason:
   Enabled: true
 
-RSpec/Rails/AvoidSetupHook:
+RSpecRails/AvoidSetupHook:
   Enabled: true
 
-RSpec/Rails/HaveHttpStatus:
+RSpecRails/HaveHttpStatus:
   Enabled: true
 
-RSpec/Rails/InferredSpecType:
+RSpecRails/InferredSpecType:
   Enabled: true
 
-RSpec/Rails/MinitestAssertions:
+RSpecRails/MinitestAssertions:
   Enabled: true
 
-RSpec/Rails/TravelAround:
+RSpecRails/TravelAround:
   Enabled: true
 
 RSpec/RedundantAround:
@@ -446,16 +448,16 @@ RSpec/SubjectDeclaration:
 RSpec/VerifiedDoubleReference:
   Enabled: true
 
-Rspec/BeforeAfterAll:
+RSpec/BeforeAfterAll:
   Enabled: false
 
-Rspec/ExampleLength:
+RSpec/ExampleLength:
   Enabled: false
 
-Rspec/HookArgument:
+RSpec/HookArgument:
   Enabled: false
 
-Rspec/MultipleMemoizedHelpers:
+RSpec/MultipleMemoizedHelpers:
   Enabled: false
 
 Security/CompoundHash:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9cfeafe5..ea12a413 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](https://semver.org).
 This changelog adheres to [Keep a CHANGELOG](https://keepachangelog.com).
 
 ## [Unreleased]
+- (VANAGON-257) Enable windowsfips-2016 to use '-fips' candle and heat flags.
 
 ## [0.52.0] - 2024-06-03
 ### Added
diff --git a/Gemfile b/Gemfile
index e4909480..e3b17ed1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,6 +29,8 @@ group(:development, :test) do
   gem 'rake', require: false
   gem 'rspec', '~> 3.0', require: false
   gem 'rubocop', '~> 1.0', require: false
+  gem 'rubocop-capybara', require: false
+  gem 'rubocop-factory_bot', require: false
   gem 'rubocop-rake', require: false
   gem 'rubocop-rspec', require: false
   gem 'simplecov', require: false
diff --git a/lib/vanagon/platform/windows.rb b/lib/vanagon/platform/windows.rb
index 66699c94..ae297784 100644
--- a/lib/vanagon/platform/windows.rb
+++ b/lib/vanagon/platform/windows.rb
@@ -192,14 +192,14 @@ def generate_msi_package(project) # rubocop:disable Metrics/AbcSize
         #   -dr             - Root DirectoryRef to point all components to
         #   -var            - Replace "SourceDir" in the @source attributes of all components with a preprocessor variable
         app_heat_flags = " -dr INSTALLDIR -v -ke -indent 2 -cg AppComponentGroup -gg -srd -t wix/filter.xslt -sreg -var var.AppSourcePath "
-        app_heat_flags += " -fips" if project.platform.name =~ /windowsfips-2012r2/
+        app_heat_flags += " -fips" if project.platform.name =~ /windowsfips-(2012r2|2016)/
 
         app_source_path = "SourceDir/#{project.settings[:base_dir]}/#{project.settings[:company_id]}/#{project.settings[:product_id]}"
         # Candle.exe preprocessor vars are required due to the above double run of heat.exe, both runs of heat use
         # preprocessor variables
         candle_preprocessor = "-dAppSourcePath=\"#{app_source_path}\" "
         candle_flags = "-arch #{@architecture} #{wix_extensions}"
-        candle_flags += " -fips" if project.platform.name =~ /windowsfips-2012r2/
+        candle_flags += " -fips" if project.platform.name =~ /windowsfips-(2012r2|2016)/
 
         # Enable verbose mode for the moment (will be removed for production)
         # localisation flags to be added