diff --git a/form.yml b/form.yml.erb
similarity index 60%
rename from form.yml
rename to form.yml.erb
index 07ca419c82693f29fe0ba16a649b4e8202eb98e0..0ca53d1caf04af0e894e02dc6158dccf699e3a6c 100644
--- a/form.yml
+++ b/form.yml.erb
@@ -1,5 +1,5 @@
 ---
-cluster: "SLURM_CLUSTER"  
+cluster: "SLURM_CLUSTER" 
 attributes:
   bc_num_hours:
     value: 1
@@ -39,11 +39,22 @@ attributes:
     label: "MATLAB version"
     help: "This defines the version of MATLAB you want to load."
     options:
-{% for ver in matlab_vers %}
-      - [ "{{ ver }}", "{{ matlab_module_name }}/{{ ver }}"]
-{% endfor %}
+      - [ "R2022a", "rc/matlab/R2022a"]
+      - [ "R2021b", "rc/matlab/R2021b"]
+      - [ "R2021a", "rc/matlab/R2021a"]
+      - [ "R2020a", "rc/matlab/R2020a"]
+      - [ "R2019b", "rc/matlab/R2019b"]
+      - [ "R2019a", "rc/matlab/R2019a"]
+      - [ "R2018a", "rc/matlab/R2018a"]
+      - [ "R2017b", "rc/matlab/R2017b"]
+      - [ "R2017a", "rc/matlab/R2017a"]
+      - [ "R2016b", "rc/matlab/R2016b"]
+      - [ "R2016a", "rc/matlab/R2016a"]
+      - [ "R2015a", "rc/matlab/R2015a"]
+      - [ "R2013a", "rc/matlab/R2013a"]
+      - [ "R2012a", "rc/matlab/R2012a"]
 
-  cuda_toolkit: "{{ cuda_toolkit_module }}"
+  cuda_toolkit: "cuda10.0/toolkit"
 
 form:
   - version
diff --git a/template/script.sh.erb b/template/script.sh.erb
index 5473f3c9800622cb399a8fc390d950dbc0ef7598..8884fa8a339c8c45a136935c94d1d03887bffa11 100755
--- a/template/script.sh.erb
+++ b/template/script.sh.erb
@@ -1,10 +1,5 @@
 #!/usr/bin/env bash
 
-<%- gpu = context.node_type.include?("vis") -%>
-
-# Clean the environment
-module purge
-
 # Set working directory to home directory
 cd "${HOME}"
 
@@ -17,7 +12,7 @@ cd "${HOME}"
   export XDG_CONFIG_HOME="<%= session.staged_root.join("config") %>"
   export XDG_DATA_HOME="<%= session.staged_root.join("share") %>"
   export XDG_CACHE_HOME="$(mktemp -d)"
-  module restore
+  module reset
   set -x
   xfwm4 --compositor=off --daemon --sm-client-disable
   xsetroot -solid "#D3D3D3"
@@ -29,17 +24,13 @@ cd "${HOME}"
 # Start MATLAB
 #
 
+<%- if context.bc_partition == "pascalnodes" -%>
+# Load CUDA toolkit
+module load <%= context.cuda_toolkit %>
+<%- end -%>
 # Load the required environment
-module load xalt/latest <%= context.version %>
-
+module load <%= context.version %>
 # Launch MATLAB
-<%- if gpu -%>
-module load intel/16.0.3 virtualgl
-module list
-set -x
-vglrun matlab -desktop -nosoftwareopengl
-<%- else -%>
 module list
 set -x
 matlab -desktop
-<%- end -%>