diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index b595f87f36..33f527d1e3 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude --exclude-limit 1400 --no-auto-gen-timestamp`
-# using RuboCop version 1.56.1.
+# using RuboCop version 1.56.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -186,7 +186,7 @@ Metrics/BlockNesting:
   Exclude:
     - 'app/models/spree/payment/processing.rb'
 
-# Offense count: 43
+# Offense count: 44
 # Configuration parameters: CountComments, Max, CountAsOne.
 Metrics/ClassLength:
   Exclude:
@@ -226,7 +226,6 @@ Metrics/ClassLength:
     - 'app/services/cart_service.rb'
     - 'app/services/order_cycle_form.rb'
     - 'app/services/order_syncer.rb'
-    - 'app/services/sets/product_set.rb'
     - 'engines/order_management/app/services/order_management/order/updater.rb'
     - 'lib/open_food_network/enterprise_fee_calculator.rb'
     - 'lib/open_food_network/order_cycle_form_applicator.rb'
@@ -290,7 +289,7 @@ Metrics/MethodLength:
     - 'lib/spree/localized_number.rb'
     - 'lib/tasks/sample_data/product_factory.rb'
 
-# Offense count: 49
+# Offense count: 48
 # Configuration parameters: CountComments, Max, CountAsOne.
 Metrics/ModuleLength:
   Exclude:
@@ -341,7 +340,6 @@ Metrics/ModuleLength:
     - 'spec/models/spree/tax_rate_spec.rb'
     - 'spec/services/permissions/order_spec.rb'
     - 'spec/services/variant_units/option_value_namer_spec.rb'
-    - 'spec/support/request/shop_workflow.rb'
     - 'spec/support/request/stripe_stubs.rb'
 
 # Offense count: 7
@@ -440,11 +438,14 @@ Rails/HasManyOrHasOneDependent:
     - 'app/models/spree/user.rb'
     - 'app/models/spree/variant.rb'
 
-# Offense count: 59
+# Offense count: 26
 # Configuration parameters: Include.
 # Include: app/helpers/**/*.rb
 Rails/HelperInstanceVariable:
   Exclude:
+    - 'app/helpers/injection_helper.rb'
+    - 'app/helpers/shared_helper.rb'
+    - 'app/helpers/shop_helper.rb'
     - 'app/helpers/spree/admin/orders_helper.rb'
     - 'app/helpers/spree/orders_helper.rb'
 
@@ -518,7 +519,7 @@ Rails/NegateInclude:
     - 'lib/spree/localized_number.rb'
     - 'spec/support/matchers/table_matchers.rb'
 
-# Offense count: 17
+# Offense count: 16
 Rails/OutputSafety:
   Exclude:
     - 'app/helpers/angular_form_helper.rb'
@@ -528,19 +529,16 @@ Rails/OutputSafety:
     - 'app/helpers/spree/admin/navigation_helper.rb'
     - 'app/helpers/spree/admin/orders_helper.rb'
     - 'app/helpers/spree/admin/zones_helper.rb'
-    - 'app/serializers/api/product_serializer.rb'
     - 'lib/reporting/queries/query_builder.rb'
     - 'lib/reporting/queries/query_interface.rb'
     - 'lib/spree/money.rb'
 
-# Offense count: 29
+# Offense count: 31
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Rails/Pluck:
   Exclude:
     - 'app/controllers/admin/variant_overrides_controller.rb'
-    - 'app/helpers/shop_helper.rb'
     - 'app/services/cart_service.rb'
-    - 'app/services/sets/product_set.rb'
     - 'lib/reporting/report_headers_builder.rb'
     - 'spec/controllers/admin/bulk_line_items_controller_spec.rb'
     - 'spec/controllers/admin/subscriptions_controller_spec.rb'
@@ -825,7 +823,7 @@ Style/HashLikeCase:
   Exclude:
     - 'app/models/enterprise.rb'
 
-# Offense count: 1767
+# Offense count: 1769
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, EnforcedShorthandSyntax, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
 # SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys