diff --git a/Dockerfile b/Dockerfile
index 478ea58..7eb3af1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ ARG GOSU_VERSION=1.11
 RUN set -ex \
     && yum makecache \
     && yum -y update \
-    && yum -y install dnf-plugins-core \
+    && yum -y install dnf-plugins-core epel-release \
     && yum config-manager --set-enabled powertools \
     && yum -y install \
        wget \
@@ -35,11 +35,12 @@ RUN set -ex \
        vim-enhanced \
        http-parser-devel \
        json-c-devel \
-       mpitests-openmpi \
+    #    mpitests-openmpi \
        pmix-devel \
        hwloc \
        hwloc-devel \
        openssh-server \
+       apptainer \
     && yum clean all \
     && rm -rf /var/cache/yum
 
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 09b4566..c32bce5 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -53,6 +53,12 @@ fi
 
 if [ "$1" = "slurmd" ]
 then
+    echo "---> Set shell resource limits ..."
+    ulimit -l unlimited
+    ulimit -s unlimited
+    ulimit -n 131072
+    ulimit -a
+
     echo "---> Starting the MUNGE Authentication service (munged) ..."
     gosu munge /usr/sbin/munged
 
diff --git a/slurm-cluster-chart/files/authorized_keys b/slurm-cluster-chart/files/authorized_keys
index c91d3ef..54f8282 100644
--- a/slurm-cluster-chart/files/authorized_keys
+++ b/slurm-cluster-chart/files/authorized_keys
@@ -1,2 +1,3 @@
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEx91hb5SMatDqPTpe63iOv34ddkR+PoeXf+86ET6v2y wtripp@LAPTOP-U9SBINHF
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCxXfcSTVZeiJrlLoGZxVCZGBOEdSejn/eqJo8uugfZLqXvFX2Mq/hvog0z2vccA1/7nX9DgsbG1R/2f8o1C2VPkURIFVfYcOc6+OK2PRYW/vgubqHIx0kkTxVhkCdbIPizHt4Fe7v27h+bAerLASv3xNThhX8dObCbEPyalwpFdRyOpUaW3jU8UDW2LfYqWYdd3KjRAVtS/0Xc6xkQ1ZHkpy0R2P9cMUbgXxpn011VF61uk4yO0qHa8lYqDRJVTmUcwGUQPbKmBWaKM14ltf/UQSvExPrAfUFIgHigJFo1aa8iIomt5XkZEfHSWkDiqKjoT+Lu2brU8xKwW3Vb5g9jfrZSM/xkXsw/YYarx4B/6f1dwSKF7rXinZflrQtuqBeg6Rscy2mhuByZPOUG8w9quicrYJHCMO68WwEQKSiG0C/BC5rsjtX08ice0Jngk8HlA95FZrXvxK5G6GIDeU7rG1V8NjpU8kn9K8J5xrlWKhuvxlkkDTdB8TZzH0UB4Eu4YhXoK/Zak0xY9zkIz1XPFRL8G8E0pWwf+dkuVlX2hsVBxAZpnaqa1vEj0lmuXUFbxCley18zgNf0ACDgMHb6sd2NxgadTi3rrSWk5sJhcGN7iT/DtwPovd6XmxQf+8ndiQwnJrBy1YrCpMWA4RWQngo7fSO3booC+Aleju1lmw== wtripp@LAPTOP-U9SBINHF
\ No newline at end of file
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCxXfcSTVZeiJrlLoGZxVCZGBOEdSejn/eqJo8uugfZLqXvFX2Mq/hvog0z2vccA1/7nX9DgsbG1R/2f8o1C2VPkURIFVfYcOc6+OK2PRYW/vgubqHIx0kkTxVhkCdbIPizHt4Fe7v27h+bAerLASv3xNThhX8dObCbEPyalwpFdRyOpUaW3jU8UDW2LfYqWYdd3KjRAVtS/0Xc6xkQ1ZHkpy0R2P9cMUbgXxpn011VF61uk4yO0qHa8lYqDRJVTmUcwGUQPbKmBWaKM14ltf/UQSvExPrAfUFIgHigJFo1aa8iIomt5XkZEfHSWkDiqKjoT+Lu2brU8xKwW3Vb5g9jfrZSM/xkXsw/YYarx4B/6f1dwSKF7rXinZflrQtuqBeg6Rscy2mhuByZPOUG8w9quicrYJHCMO68WwEQKSiG0C/BC5rsjtX08ice0Jngk8HlA95FZrXvxK5G6GIDeU7rG1V8NjpU8kn9K8J5xrlWKhuvxlkkDTdB8TZzH0UB4Eu4YhXoK/Zak0xY9zkIz1XPFRL8G8E0pWwf+dkuVlX2hsVBxAZpnaqa1vEj0lmuXUFbxCley18zgNf0ACDgMHb6sd2NxgadTi3rrSWk5sJhcGN7iT/DtwPovd6XmxQf+8ndiQwnJrBy1YrCpMWA4RWQngo7fSO3booC+Aleju1lmw== wtripp@LAPTOP-U9SBINHF
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDXp0/qiVze73XKMGPrbV3rtotqCljPE8Hr1DubJGE/ZwiclRC6sOLg7iWxHMAo7TNYOCevNbienVetth72p4793aiMVc/5RqPdvU38dRjysHTI47rhLSVyHh9aTcZ8lOvQdA6NnNIl0qciLP3XJf4BzHRKEN+Jy21qdzHeEW4GYMq2hSr8iUfTctfSrjB+tJfPNbt7Tw7yiC5frrhs+wNve5PtLlC+TWZPPt4licMf/gR/Ppm/wabrE71purw7qe1g8hl9QX4ftKahiYI2VtQa45uObqHOjVNHAtJK249p3VtHnhc78OjuK7uv8ue/j2ox6U9YjrT5+XGqASlPh4Cgp8rT/zOzgj4wZ2p/pWPBfIrmx/8av51x8Rf1Kb7Zl/A4C9oURf77kB2Rcgou0hO/cwSAT/XuWFdW5zyrUrxnFKoFU6p5jK/yP7gxITURvclnV4kABvkIk3neOREuhwK8OwMvZpZUX8iQUHo+2nyy2YTerOD5kx6BToDK1iMK6YU= rocky@steveb-docker
\ No newline at end of file
diff --git a/slurm-cluster-chart/files/slurm.conf b/slurm-cluster-chart/files/slurm.conf
index 6484087..d32768d 100644
--- a/slurm-cluster-chart/files/slurm.conf
+++ b/slurm-cluster-chart/files/slurm.conf
@@ -40,7 +40,7 @@ JobCompType=jobcomp/filetxt
 JobCompLoc=/var/log/slurm/jobcomp.log
 #
 # ACCOUNTING
-JobAcctGatherType=jobacct_gather/linux
+JobAcctGatherType=jobacct_gather/none
 JobAcctGatherFrequency=30
 #
 AccountingStorageType=accounting_storage/slurmdbd
@@ -51,4 +51,7 @@ AccountingStoragePort=6819
 MaxNodeCount=10
 # PARTITIONS
 PartitionName=all Default=yes Nodes=ALL
-TreeWidth=65533
\ No newline at end of file
+TreeWidth=65533
+
+TaskPlugin=task/none
+PropagateResourceLimitsExcept=MEMLOCK
diff --git a/slurm-cluster-chart/templates/slurmd-deployment.yaml b/slurm-cluster-chart/templates/slurmd-deployment.yaml
index 054fb10..d1b19ef 100644
--- a/slurm-cluster-chart/templates/slurmd-deployment.yaml
+++ b/slurm-cluster-chart/templates/slurmd-deployment.yaml
@@ -41,6 +41,8 @@ spec:
             - mountPath: /tempmounts/munge.key
               name: munge-key-secret
               subPath: munge.key
+          securityContext:
+            privileged: true
       restartPolicy: Always
       volumes:
         - name: slurm-jobdir