diff --git a/Dockerfile b/Dockerfile
index 28d9cada4..bdb6da3f5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -272,4 +272,4 @@ WORKDIR /home/wekan/app
 #
 # CMD ["node", "/build/main.js"]
 # CMD ["bash", "-c", "ulimit -s 65500; exec node --stack-size=65500 /build/main.js"]
-CMD ["bash", "-c", "ulimit -s 65500; exec node /build/main.js"]
+CMD ["bash", "-c", "ulimit -s 65500; exec node --stack-size=65500 --max-old-space-size=8192 /build/main.js"]
diff --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8
index f4fb3325e..6731b1380 100644
--- a/Dockerfile.arm64v8
+++ b/Dockerfile.arm64v8
@@ -88,5 +88,5 @@ RUN \
 EXPOSE $PORT
 USER wekan
 
-CMD ["bash", "-c", "ulimit -s 65500; exec node /home/wekan/bundle/main.js"]
+CMD ["bash", "-c", "ulimit -s 65500; exec node --stack-size=65500 --max-old-space-size=8192 /home/wekan/bundle/main.js"]
 
diff --git a/releases/virtualbox/start-wekan.sh b/releases/virtualbox/start-wekan.sh
index 09ec12765..ee0ca3265 100755
--- a/releases/virtualbox/start-wekan.sh
+++ b/releases/virtualbox/start-wekan.sh
@@ -411,6 +411,6 @@
       #export WAIT_SPINNER=Bounce
       #---------------------------------------------------------------------
 
-      node main.js & >> ~/repos/wekan.log
+      node --stack-size=65500 --max-old-space-size=8192 main.js & >> ~/repos/wekan.log
       cd ~/repos
 #done
diff --git a/snap-src/bin/wekan-control b/snap-src/bin/wekan-control
index e4260851d..900a81b2f 100755
--- a/snap-src/bin/wekan-control
+++ b/snap-src/bin/wekan-control
@@ -36,4 +36,4 @@ cd $APPLICATION_DIRECTORY
 #   bash -c "ulimit -s 65500; exec node --stack-size=65500 main.js"
 #---------------------------------------------------------------------
 #bash -c "ulimit -s 65500; exec $NODE_PATH/node --stack-size=65500 $APPLICATION_START"
-bash -c "ulimit -s 65500; exec $NODE_PATH/node $APPLICATION_START"
+bash -c "ulimit -s 65500; exec $NODE_PATH/node --stack-size=65500 --max-old-space-size=8192 $APPLICATION_START"
diff --git a/stacksmith/user-scripts/run.sh b/stacksmith/user-scripts/run.sh
index 1e9d3b460..84741eabc 100755
--- a/stacksmith/user-scripts/run.sh
+++ b/stacksmith/user-scripts/run.sh
@@ -20,9 +20,9 @@ echo "starting the wekan service..."
 #---------------------------------------------------------------------
 # https://github.com/wekan/wekan/issues/3585#issuecomment-1021522132
 # Add more Node heap:
-export NODE_OPTIONS="--max_old_space_size=4096"
+#export NODE_OPTIONS="--max_old_space_size=4096"
 # Add more stack:
 #bash -c "ulimit -s 65500; exec node --stack-size=65500 main.js"
-bash -c "ulimit -s 65500; exec node main.js"
+bash -c "ulimit -s 65500; exec --stack-size=65500 --max-old-space-size=8192 node main.js"
 #---------------------------------------------------------------------
 #node main.js
diff --git a/start-wekan.sh b/start-wekan.sh
index c51c8ff45..8f5210385 100755
--- a/start-wekan.sh
+++ b/start-wekan.sh
@@ -555,7 +555,7 @@
       #bash -c "ulimit -s 65500; exec node --stack-size=65500 --trace-deprecation main.js"
       #bash -c "ulimit -s 65500; exec node --stack-size=65500 main.js"
       #-------------------- OPTIONAL SETTINGS END ----------------------
-      bash -c "ulimit -s 65500; exec node main.js"
+      bash -c "ulimit -s 65500; exec node --stack-size=65500 --max-old-space-size=8192 main.js"
       #node main.js
       #---------------------------------------------------------------------
       # & >> ../../wekan.log