diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 5b58d28b91..8ab09cda6d 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,11 +1,43 @@
 # 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.3.
+# using RuboCop version 1.57.1.
 # 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
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: with_first_argument, with_fixed_indentation
+Layout/ArgumentAlignment:
+  Exclude:
+    - 'app/reflexes/white_label_reflex.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EmptyLineBetweenMethodDefs, EmptyLineBetweenClassDefs, EmptyLineBetweenModuleDefs, DefLikeMacros, AllowAdjacentOneLineDefs, NumberOfEmptyLines.
+Layout/EmptyLineBetweenDefs:
+  Exclude:
+    - 'app/models/spree/order.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
+# SupportedHashRocketStyles: key, separator, table
+# SupportedColonStyles: key, separator, table
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
+Layout/HashAlignment:
+  Exclude:
+    - 'app/reflexes/white_label_reflex.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Width, AllowedPatterns.
+Layout/IndentationWidth:
+  Exclude:
+    - 'app/models/spree/order.rb'
+
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
@@ -99,12 +131,6 @@ Lint/NoReturnInBeginEndBlocks:
   Exclude:
     - 'app/controllers/payment_gateways/stripe_controller.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Lint/RedundantCopDisableDirective:
-  Exclude:
-    - 'lib/reporting/reports/list.rb'
-
 # Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Lint/RedundantDirGlobSort:
@@ -192,7 +218,7 @@ Metrics/BlockNesting:
   Exclude:
     - 'app/models/spree/payment/processing.rb'
 
-# Offense count: 45
+# Offense count: 46
 # Configuration parameters: CountComments, Max, CountAsOne.
 Metrics/ClassLength:
   Exclude:
@@ -568,15 +594,16 @@ Rails/PluckInWhere:
   Exclude:
     - 'app/models/spree/variant.rb'
 
-# Offense count: 5
+# Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AllowedReceivers.
+# AllowedReceivers: ActionMailer::Preview, ActiveSupport::TimeZone
 Rails/RedundantActiveRecordAllMethod:
   Exclude:
     - 'app/models/spree/tax_rate.rb'
     - 'app/models/spree/user.rb'
     - 'app/models/spree/variant.rb'
     - 'spec/system/admin/product_import_spec.rb'
-    - 'spec/system/admin/tag_rules_spec.rb'
 
 # Offense count: 22
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -692,7 +719,6 @@ Rails/UnknownEnv:
     - 'app/models/spree/app_configuration.rb'
 
 # Offense count: 7
-# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Severity.
 Rails/UnusedRenderContent:
   Exclude:
@@ -854,42 +880,6 @@ Style/HashLikeCase:
   Exclude:
     - 'app/models/enterprise.rb'
 
-# Offense count: 184
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, EnforcedShorthandSyntax, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
-# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
-# SupportedShorthandSyntax: always, never, either, consistent
-Style/HashSyntax:
-  Exclude:
-    - 'spec/services/voucher_adjustments_service_spec.rb'
-    - 'spec/system/admin/reports_spec.rb'
-    - 'spec/system/admin/tag_rules_spec.rb'
-    - 'spec/system/admin/variant_overrides_spec.rb'
-    - 'spec/system/admin/vouchers_spec.rb'
-    - 'spec/system/consumer/account/cards_spec.rb'
-    - 'spec/system/consumer/account/developer_settings_spec.rb'
-    - 'spec/system/consumer/account/payments_spec.rb'
-    - 'spec/system/consumer/account_spec.rb'
-    - 'spec/system/consumer/authentication_spec.rb'
-    - 'spec/system/consumer/checkout/tax_incl_spec.rb'
-    - 'spec/system/consumer/checkout/tax_not_incl_spec.rb'
-    - 'spec/system/consumer/multilingual_spec.rb'
-    - 'spec/system/consumer/shopping/cart_spec.rb'
-    - 'spec/system/consumer/shopping/checkout_auth_spec.rb'
-    - 'spec/system/consumer/shopping/checkout_paypal_spec.rb'
-    - 'spec/system/consumer/shopping/checkout_spec.rb'
-    - 'spec/system/consumer/shopping/checkout_stripe_spec.rb'
-    - 'spec/system/consumer/shopping/orders_spec.rb'
-    - 'spec/system/consumer/shopping/products_spec.rb'
-    - 'spec/system/consumer/shopping/shopping_spec.rb'
-    - 'spec/system/consumer/shopping/unit_price_spec.rb'
-    - 'spec/system/consumer/shopping/variant_overrides_spec.rb'
-    - 'spec/system/consumer/user_password_spec.rb'
-    - 'spec/system/consumer/white_label_spec.rb'
-    - 'spec/system/support/cuprite_setup.rb'
-    - 'spec/views/spree/orders/edit.html.haml_spec.rb'
-    - 'spec/views/spree/shared/_order_details.html.haml_spec.rb'
-
 # Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/MapToHash:
@@ -1045,6 +1035,12 @@ Style/RedundantReturn:
     - 'lib/stripe/authorize_response_patcher.rb'
     - 'lib/tasks/data.rake'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantSelf:
+  Exclude:
+    - 'app/models/spree/order.rb'
+
 # Offense count: 4
 # This cop supports safe autocorrection (--autocorrect).
 Style/RedundantStringEscape: