diff --git a/.rubocop.yml b/.rubocop.yml
index cd4c106..5681cd5 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -13,7 +13,7 @@ Style/StringLiteralsInInterpolation:
   EnforcedStyle: double_quotes
 
 # Is there any justification for "aligned" which is the default?
-Style/MultilineOperationIndentation:
+Layout/MultilineOperationIndentation:
   EnforcedStyle: indented
 
 # https://github.com/SUSE/style-guides/blob/master/Ruby.md#arrays
@@ -30,16 +30,16 @@ Style/SymbolArray:
 # and also colons:
 # foo:     true
 # foo_bar: false
-Style/AlignHash:
+Layout/HashAlignment:
   EnforcedHashRocketStyle: table
   EnforcedColonStyle: table
 
 # no extra indentation for multiline function calls
-Style/AlignParameters:
+Layout/ArgumentAlignment:
   EnforcedStyle: with_fixed_indentation
 
 # no extra indentation for case
-Style/CaseIndentation:
+Layout/CaseIndentation:
   EnforcedStyle: end
 
 # "unless" has a different connotation than "if not"
@@ -55,5 +55,5 @@ Style/RegexpLiteral:
   Enabled: false
 
 # Easier recognization if access modified used
-Style/AccessModifierIndentation:
+Layout/AccessModifierIndentation:
   EnforcedStyle: outdent
diff --git a/lib/cfa/grub2/default.rb b/lib/cfa/grub2/default.rb
index ef1b69c..ea77be7 100644
--- a/lib/cfa/grub2/default.rb
+++ b/lib/cfa/grub2/default.rb
@@ -101,7 +101,7 @@ def recovery_entry
 
       def cryptodisk
         @cryptodisk ||= BooleanValue.new("GRUB_ENABLE_CRYPTODISK", self,
-                                         true_value: "y", false_value: "n")
+          true_value: "y", false_value: "n")
       end
 
       VALID_TERMINAL_OPTIONS = [:serial, :console, :gfxterm].freeze
diff --git a/lib/cfa/grub2/grub_cfg.rb b/lib/cfa/grub2/grub_cfg.rb
index aad62ad..e584dd2 100644
--- a/lib/cfa/grub2/grub_cfg.rb
+++ b/lib/cfa/grub2/grub_cfg.rb
@@ -27,7 +27,7 @@ def self.parse(string)
 
         def self.serialize(_string)
           raise NotImplementedError,
-                "Serializing not implemented, use grub2 generator"
+            "Serializing not implemented, use grub2 generator"
         end
 
         def self.empty