diff --git a/rails/rubocop/rubocop-base.yml b/rails/rubocop/rubocop-base.yml
index 9eb16be04da6e0cb9d600e3e21b9b67dcf3ebf5a..35d1a469216f34378a38b0b5e0dcba8c7cc578c5 100644
--- a/rails/rubocop/rubocop-base.yml
+++ b/rails/rubocop/rubocop-base.yml
@@ -9,10 +9,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