diff --git a/cluster_setup/slurm.conf b/cluster_setup/slurm.conf
index 6256c1c75c8dcd316f097d22988fb647236749ea..f5c99a68e8123010693c5b73fe356c5e0b17de6c 100644
--- a/cluster_setup/slurm.conf
+++ b/cluster_setup/slurm.conf
@@ -1,4 +1,4 @@
-ControlMachine=master-nfs
+ControlMachine=master
 ControlAddr=10.0.0.8
 #
 MpiDefault=none
@@ -28,11 +28,14 @@ SlurmdLogFile=/var/log/slurm-llnl/slurmd.log
 AuthType=auth/munge
 
 # MEMORY LIMITS
-DefMemPerCPU=100
-MaxMemPerCPU=500
 MemLimitEnforce=yes
 KillWait=0
 
 # COMPUTE NODES
-NodeName=node-nfs NodeAddr=10.0.0.18 CPUs=2 ThreadsPerCore=1 RealMemory=3951 TmpDisk=19788
-PartitionName=swc Nodes=node-nfs Default=YES DefaultTime=1 MaxTime=2 State=UP
+NodeName=node1 NodeAddr=10.0.0.15 CPUs=2 ThreadsPerCore=1 RealMemory=3951 TmpDisk=19788
+NodeName=node2 NodeAddr=10.0.0.16 CPUs=4 ThreadsPerCore=1 RealMemory=3951 TmpDisk=19788
+NodeName=node3 NodeAddr=10.0.0.11 CPUs=8 ThreadsPerCore=1 RealMemory=3951 TmpDisk=19788
+
+# PARTIONS
+PartitionName=swc Nodes=node1,node2,node3 Default=YES DefaultTime=1 MaxTime=2 DefMemPerCPU=100 MaxMemPerCPU=300 State=UP
+PartitionName=swc-long Nodes=node1,node2,node3 Default=NO DefaultTime=5 MaxTime=10 DefMemPerCPU=100 MaxMemPerCPU=300 State=UP