diff --git a/.ci/start_mapdl.sh b/.ci/start_mapdl.sh
index 8d71fa8e02..170f7c0284 100755
--- a/.ci/start_mapdl.sh
+++ b/.ci/start_mapdl.sh
@@ -14,6 +14,9 @@ docker run \
     -p $PYMAPDL_DB_PORT:50055 \
     --shm-size=1gb \
     -e I_MPI_SHM_LMT=shm \
+    --oom-kill-disable \
+    --memory=6656MB  \
+    --memory-swap=16896MB \
     $MAPDL_IMAGE \
     -$DISTRIBUTED_MODE -np 2 > log.txt &
 grep -q 'Server listening on' <(timeout 60 tail -f log.txt)
diff --git a/.ci/start_mapdl_ubuntu.sh b/.ci/start_mapdl_ubuntu.sh
index 2165e2b079..2e3f511dae 100755
--- a/.ci/start_mapdl_ubuntu.sh
+++ b/.ci/start_mapdl_ubuntu.sh
@@ -17,5 +17,8 @@ docker run \
     -e I_MPI_SHM_LMT=shm \
     -w /jobs \
     -u=0:0 \
+    --oom-kill-disable \
+    --memory=6656MB \
+    --memory-swap=16896MB \
     $MAPDL_IMAGE /ansys_inc/v222/ansys/bin/mapdl -grpc -dir /jobs -$DISTRIBUTED_MODE -np 2 > log.txt &
 grep -q 'Server listening on' <(timeout 60 tail -f log.txt)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e3de78c98a..58966a26c7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -470,7 +470,7 @@ jobs:
       commit_long_sha: ${{ steps.attatch-to-pr.outputs.commit_long_sha }}
     container:
       image: ghcr.io/ansys/mapdl:v22.2-ubuntu
-      options: "-u=0:0 --entrypoint /bin/bash"
+      options: -u=0:0 --oom-kill-disable --memory=6656MB --memory-swap=16896MB --shm-size=1gb --entrypoint /bin/bash
       credentials:
         username: ${{ secrets.GH_USERNAME }}
         password: ${{ secrets.GITHUB_TOKEN }}
@@ -596,7 +596,7 @@ jobs:
     timeout-minutes: 55
     container:
       image: ghcr.io/ansys/mapdl:v22.2-ubuntu
-      options: "-u=0:0 --entrypoint /bin/bash"
+      options: -u=0:0 --oom-kill-disable --memory=6656MB --memory-swap=16896MB --shm-size=1gb --entrypoint /bin/bash
       credentials:
         username: ${{ secrets.GH_USERNAME }}
         password: ${{ secrets.GITHUB_TOKEN }}