diff --git a/images/linux/scripts/base/limits.sh b/images/linux/scripts/base/limits.sh
index 24041bc99..0a0cc99e0 100644
--- a/images/linux/scripts/base/limits.sh
+++ b/images/linux/scripts/base/limits.sh
@@ -5,3 +5,7 @@ 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
+
+# Double stack size from default 8192KB
+echo '* soft stack 16384' >> /etc/security/limits.conf
+echo '* hard stack 16384' >> /etc/security/limits.conf