diff --git a/pam.d/common-session-noninteractive b/pam.d/common-session-noninteractive
index 234496e..e7e76b6 100644
--- a/pam.d/common-session-noninteractive
+++ b/pam.d/common-session-noninteractive
@@ -7,8 +7,14 @@
 # at the start and end of all non-interactive sessions.
 #
 
+# Environment setup
 session	required	pam_env.so
+
+# User restrictions
 session	required	pam_namespace.so  unmnt_remnt
+session	required	pam_limits.so
+
+# Passwd database handling
 session	sufficient	pam_sss.so
 session	sufficient	pam_unix.so
 session	required	pam_deny.so
diff --git a/security/limits.conf b/security/limits.conf
index a21f76c..adf9cad 100644
--- a/security/limits.conf
+++ b/security/limits.conf
@@ -42,22 +42,9 @@
 #
 #<domain>      <type>  <item>         <value>
 #
-
-#*               soft    core            0
-#root            hard    core            100000
-#*               hard    rss             10000
-#@student        hard    nproc           20
-#@faculty        soft    nproc           20
-#@faculty        hard    nproc           50
-#ftp             hard    nproc           0
-#ftp             -       chroot          /ftp
-#@student        -       maxlogins       4
-
-@users           soft    nproc           30
-@users           hard    nproc           50
-@users           soft    nofile          4096
-@users           hard    nofile          10240
-@users		 soft	 memlock	 64
-@users		 hard	 memlock	 128
-
-# End of file
+1000:65535           soft    nproc           50
+1000:65535           hard    nproc           75
+1000:65535           soft    nofile          4096
+1000:65535           hard    nofile          10240
+1000:65535           soft    memlock         64
+1000:65535           hard    memlock         128