diff --git a/site/profile/manifests/ccs/home.pp b/site/profile/manifests/ccs/home.pp
index d215ef53ff..1f207ec6d5 100644
--- a/site/profile/manifests/ccs/home.pp
+++ b/site/profile/manifests/ccs/home.pp
@@ -4,7 +4,13 @@
   ## rather than each having their own?
   file_line { 'Change default home permissions':
     path  => '/etc/login.defs',
-    match => '^UMASK ',
+    match => '^UMASK\s',
     line  => 'UMASK 022',
   }
+  file_line { 'Change default home permissions for EL8+':
+    path               => '/etc/login.defs',
+    match              => '^HOME_MODE\s',
+    line               => 'HOME_MODE 0755',
+    append_on_no_match => false,
+  }
 }