diff --git a/brc_jupyter-compute/form.yml.erb b/brc_jupyter-compute/form.yml.erb
index e83e48f..81accee 100644
--- a/brc_jupyter-compute/form.yml.erb
+++ b/brc_jupyter-compute/form.yml.erb
@@ -60,7 +60,7 @@ attributes:
 
   qos_name:
     label: "SLURM QoS Name"
-    help: "Most users can leave it black for default assignment, Savio Condo users want to specify their condo QoS name"
+    help: "Most users can leave it blank for default assignment, Savio Condo users want to specify their condo QoS name"
     widget: select
 
   num_nodes:
@@ -70,12 +70,11 @@ attributes:
 
   num_cores:
     label: "Number of CPU cores per Node"
-    help: "Please specify the number of CPU cores you want per node for this Jupyter Server"
-    value: 1
+    help: "Please specify the number of CPU cores per node. If using a GPU, the total number of CPUs in the job must be 2 times the number of GPUs."
 
   gres_value:
-    label: "Number and type of GPUs"
-    help: "You choose to run in a partition with GPUs. Please specify the GRES value i.e the number and type of GPUs you want for this Jupyter Server"
+    label: "Number of GPUs"
+    help: "You choose to run in a partition with GPUs. Please specify the number of GPUs you want for this Jupyter Server."
 
   user_email:
     label: "Email address (optional)"
diff --git a/brc_jupyter-compute/submit.yml.erb b/brc_jupyter-compute/submit.yml.erb
index 3b245f6..0747fac 100644
--- a/brc_jupyter-compute/submit.yml.erb
+++ b/brc_jupyter-compute/submit.yml.erb
@@ -51,10 +51,12 @@ script:
      <%- end %>
      <%- if gres_value != "" %>
      - "--gres"
-     - "<%= gres_value %>"
+     - "gpu:<%= gres_value %>"
      <%- end %>
      <%- if num_cores != "" %>
-     - "--ntasks-per-core"
+     - "--cpus-per-task"
+     - "1"
+     - "--ntasks-per-node"
      - "<%= num_cores %>"
      <%- end %>
      - "--nodes"