diff --git a/form.yml b/form.yml
index ee9c0ca..a44656e 100644
--- a/form.yml
+++ b/form.yml
@@ -1,6 +1,7 @@
 ---
 cluster:
   - "pitzer"
+  - "pitzer-rhel9"
   - "cardinal"
   - "ascend"
 form:
@@ -17,6 +18,8 @@ form:
   - bc_email_on_started
   - version
 attributes:
+  bc_num_slots:
+    min: 1
   num_workers:
     widget: "number_field"
     value: "1"
@@ -38,12 +41,14 @@ attributes:
       - [ 
           "any", "any",
           data-max-num-workers-for-cluster-pitzer: 48,
+          data-max-num-workers-for-cluster-pitzer-rhel9: 48,
           data-max-num-workers-for-cluster-cardinal: 48,
           data-max-num-workers-for-cluster-ascend: 118,
         ]
       - [ 
           "hugemem", "hugemem",
           data-max-num-workers-for-cluster-pitzer: 80,
+          data-max-num-workers-for-cluster-pitzer-rhel9: 80,
           data-option-for-cluster-cardinal: false,
           data-option-for-cluster-ascend: false,
         ]
@@ -74,42 +79,49 @@ attributes:
           "3.4.1", "3.4.1",
           data-option-for-cluster-cardinal: false,
           data-option-for-cluster-ascend: false,
+          data-option-for-cluster-pitzer-rhel9: false,
         ]
       - [
-        "3.0.1", "3.0.1",
-        data-option-for-cluster-cardinal: false,
-        data-option-for-cluster-ascend: false,
+          "3.0.1", "3.0.1",
+          data-option-for-cluster-cardinal: false,
+          data-option-for-cluster-ascend: false,
+          data-option-for-cluster-pitzer-rhel9: false,
         ]
       - [
-        "2.4.5", "2.4.5",
-        data-option-for-cluster-cardinal: false,
-        data-option-for-cluster-ascend: false,
+          "2.4.5", "2.4.5",
+          data-option-for-cluster-cardinal: false,
+          data-option-for-cluster-ascend: false,
+          data-option-for-cluster-pitzer-rhel9: false,
         ]
       - [
-        "2.3.0", "2.3.0",
-        data-option-for-cluster-pitzer: false,
-        data-option-for-cluster-ascend: false,
+          "2.3.0", "2.3.0",
+          data-option-for-cluster-pitzer: false,
+          data-option-for-cluster-pitzer-rhel9: false,
+          data-option-for-cluster-ascend: false,
         ]
   version:
     widget: "select"
     label: "JupyterLab Version"
     options:
       - [
-        "4.1", "app_jupyter/4.1.5",
-        data-option-for-cluster-pitzer: false,
+          "4.1", "app_jupyter/4.1.5",
+          data-option-for-cluster-pitzer: false,
         ]
       - [
-        "3.0", "app_jupyter/3.0.17",
-        data-option-for-cluster-cardinal: false,
-        data-option-for-cluster-ascend: false,
+          "3.0", "app_jupyter/3.0.17",
+          data-option-for-cluster-cardinal: false,
+          data-option-for-cluster-ascend: false,
+          data-option-for-cluster-pitzer-rhel9: false,
         ]
       - [
-        "2.2", "app_jupyter/2.2.10",
-        data-option-for-cluster-cardinal: false,
-        data-option-for-cluster-ascend: false,
+          "2.2", "app_jupyter/2.2.10",
+          data-option-for-cluster-cardinal: false,
+          data-option-for-cluster-ascend: false,
+          data-option-for-cluster-pitzer-rhel9: false,
         ]
       - [
-        "1.2", "app_jupyter/1.2.21",
-        data-option-for-cluster-cardinal: false,
-        data-option-for-cluster-ascend: false,
+          "1.2", "app_jupyter/1.2.21",
+          data-option-for-cluster-cardinal: false,
+          data-option-for-cluster-ascend: false,
+          data-option-for-cluster-pitzer-rhel9: false,
         ]
diff --git a/submit.yml.erb b/submit.yml.erb
index db3b35a..d79f7dc 100644
--- a/submit.yml.erb
+++ b/submit.yml.erb
@@ -1,15 +1,6 @@
 <%-
 
-  cores_lookup = {
-                  "hugemem" => {"pitzer" => "80"},
-                  "any" => {"pitzer" => "40", "cardinal" => "48", "ascend" => '118' }
-                }
-
-  base_slurm_args = if bc_num_slots.blank?
-                      ["--nodes", "1", "--ntasks-per-node", cores_lookup[node_type][cluster] ]
-                    else
-                      ["--nodes", "#{bc_num_slots}", "--ntasks-per-node", cores_lookup[node_type][cluster] ]
-                    end
+  base_slurm_args = ["--nodes", "#{bc_num_slots}", "--exclusive" ]
 
   slurm_args =  case node_type
                 when "hugemem"
diff --git a/template/before.sh.erb b/template/before.sh.erb
index 33433fc..9ba47ad 100755
--- a/template/before.sh.erb
+++ b/template/before.sh.erb
@@ -138,7 +138,7 @@ module purge
 # Load the runtime environment
 runtime_env() {
   module purge
-  <%- unless ['cardinal', 'ascend'].include?(context.cluster) -%>
+  <%- if context.cluster == 'pitzer' -%>
   module load python/3.6-conda5.2 spark/<%= context.spark_version %>
   <%- else -%>
   module load python/3.12 spark/<%= context.spark_version %>
diff --git a/template/script.sh.erb b/template/script.sh.erb
index 89b9892..9142104 100755
--- a/template/script.sh.erb
+++ b/template/script.sh.erb
@@ -42,7 +42,7 @@ cd "${NOTEBOOK_ROOT}"
 echo "TTT - $(date)"
 
 # Setup Jupyter Notebook environment
-<%- if ['cardinal', 'ascend'].include?(context.cluster) -%>
+<%- if ['cardinal', 'ascend', 'pitzer-rhel9'].include?(context.cluster) -%>
 module load project/ondemand <%= context.version %>
 <%- else -%>
 module load ondemand/project <%= context.version %>