diff --git a/images/linux/scripts/base/limits.sh b/images/linux/scripts/base/limits.sh
index 0a0cc99e0..c064f3a5c 100644
--- a/images/linux/scripts/base/limits.sh
+++ b/images/linux/scripts/base/limits.sh
@@ -1,10 +1,13 @@
 #!/bin/bash -e
 
-echo '* soft nofile 65536' >> /etc/security/limits.conf
-echo '* hard nofile 65536' >> /etc/security/limits.conf
 echo 'session required pam_limits.so' >> /etc/pam.d/common-session
 echo 'session required pam_limits.so' >> /etc/pam.d/common-session-noninteractive
 echo 'DefaultLimitNOFILE=65536' >> /etc/systemd/system.conf
+echo 'DefaultLimitSTACK=16M:infinity' >> /etc/systemd/system.conf
+
+# Raise Number of File Descriptors
+echo '* soft nofile 65536' >> /etc/security/limits.conf
+echo '* hard nofile 65536' >> /etc/security/limits.conf
 
 # Double stack size from default 8192KB
 echo '* soft stack 16384' >> /etc/security/limits.conf