diff --git a/rails/rubocop.yml b/rails/rubocop.yml
index 8afa4c6849124d3f2c843586cac6e9cc013f523b..a54128be635178ea747cad2ecffa66fc72eb8027 100644
--- a/rails/rubocop.yml
+++ b/rails/rubocop.yml
@@ -15,10 +15,18 @@ AllCops:
 
 # BEGIN Customizations
 # BEGIN Layout
+# align case with its 'end' to forbid deep indentation and be consistent with variable assignments
+Layout/CaseIndentation:
+  EnforcedStyle: end # default: case
+
 # only before, enforcing also after adds too many blank lines
 Layout/EmptyLinesAroundAccessModifier:
   EnforcedStyle: only_before # default: around
 
+# prevent unnecessary deep indentation by enforcing 'end' to be at the start of the line
+Layout/EndAlignment:
+  EnforcedStyleAlignWith: start_of_line # default: keyword
+
 # indent first element one level deeper than the 'parent'
 Layout/FirstArrayElementIndentation:
   EnforcedStyle: consistent # default: special_inside_parentheses