diff --git a/shared/slurm.nix b/shared/slurm.nix
index 4e2af26..7c43754 100644
--- a/shared/slurm.nix
+++ b/shared/slurm.nix
@@ -27,12 +27,20 @@ in
         (attrValues nodes));
 
     partitionName = [
-      "all Nodes=ALL Default=YES MaxTime=6:00:00 State=UP"
-      "vip Nodes=ALL AllowGroups=vip Default=NO MaxTime=INFINITE State=UP"
+      "all Nodes=ALL Default=YES MaxTime=6:00:00 State=UP OverSubscribe=NO"
+      "vip Nodes=ALL AllowGroups=vip Default=NO MaxTime=INFINITE State=UP OverSubscribe=NO"
     ];
 
     extraConfig = ''
       MailProg=${pkgs.mailutils}/bin/mail
+
+      # Do not block whole nodes to allow multiple jobs to fill up nodes
+      SelectType=select/cons_res
+      SelectTypeParameters=CR_CPU
+
+      # Free resources of halted jobs
+      PreemptType=preempt/partition_prio
+      PreemptMode=SUSPEND,GANG
     '';
   };