diff --git a/form.yml.erb b/form.yml.erb
index 0743d97657ba59fcb45df1f25dbe3f58da5491bf..427dd3bf65497b01bf518997328549979d406ca5 100644
--- a/form.yml.erb
+++ b/form.yml.erb
@@ -4,6 +4,7 @@
 ---
 title: "HPC Desktop"
 cluster: SLURM_CLUSTER
+submit: "submit.yml.erb"
 attributes:
   desktop: "xfce"
   bc_num_slots:
@@ -37,16 +38,10 @@ attributes:
       - [ "<%= p %>", "<%= p %>" ]
     <%- end -%>
 
-  bc_reservation:
-    widget: "text_field"
-    label: Reservation Name
-    value: ""
-
 form:
   - desktop
   - bc_num_hours
   - bc_partition
-  - bc_reservation
   - bc_num_gpus
   - bc_num_slots
   - bc_num_mems
diff --git a/submit.yml.erb b/submit.yml.erb
index c479578737da62bafd550df66a8d5fd7af9b60e5..516b352b1e0ade8bdedc51afbacf97ebeea5dd03 100644
--- a/submit.yml.erb
+++ b/submit.yml.erb
@@ -1,3 +1,31 @@
+<%-
+  email = ENV['USER']
+  if !email.include? '@'
+    email = email + '@uab.edu'
+  end
+-%>
 ---
 batch_connect:
-  template: vnc
+  template: "vnc"
+
+script:
+  job_environment:
+    USER: "<%= ENV['USER'] %>"
+  native:
+    - "-N 1"
+    - "-n <%= bc_num_slots.blank? ? 1 : bc_num_slots.to_i %>"
+    - "--mem-per-cpu=<%= bc_num_mems.blank? ? 4 : bc_num_mems.to_i %>G"
+    - "--partition=<%= bc_partition %>"
+    - "--time=<%= bc_num_hours.blank? ? 1 : bc_num_hours.to_i %>:00:00"
+    - "--job-name=ood-vnc"
+<%- if bc_partition.include? "pascalnodes" or bc_partition.include? "amperenodes" -%>
+    - "--gres=gpu:<%= bc_num_gpus.blank? ? 1 : bc_num_gpus.to_i %>"
+<%- end -%>
+<%- if bc_email_on_started == "1" -%>
+    - "--mail-type=BEGIN"
+    - "--mail-user=<%= email %>"
+<%- end -%>
+<%- if bc_email_on_started == "1" -%>
+    - "--mail-type=BEGIN"
+    - "--mail-user=<%= email %>"
+<%- end -%>