diff --git a/group_vars/all b/group_vars/all
index 04e692a8..00c7b7d7 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -117,13 +117,13 @@
   gpu_node_glob_bash: "{{ compute_node_prefix }}{0..{{ num_compute_nodes|int - 1 }}}"
 
 #Jupyter related
-  jupyter_provision: false
+  jupyter_provision: true
   jupyter_ood_app_repo: "https://github.com/OSC/bc_example_jupyter.git"
   jupyter_ood_app_refspec: "{{ github_refspec }}"
   jupyter_ood_app_version: "custom_environment"
 
 #EasyBuild variables
-  cluster_shared_folder: "/export"
+  cluster_shared_folder: "/cm/shared"
   easybuild_prefix: "{{ cluster_shared_folder }}/eb"
   easybuild_tmpdir: "/tmp"
   easybuild_buildpath: "/tmp/build"
diff --git a/roles/ohpc_add_easybuild/tasks/main.yaml b/roles/ohpc_add_easybuild/tasks/main.yaml
index 754575a8..c881a62a 100644
--- a/roles/ohpc_add_easybuild/tasks/main.yaml
+++ b/roles/ohpc_add_easybuild/tasks/main.yaml
@@ -34,8 +34,9 @@
 
 - name: Boostrap EasyBuild
   shell: |
-      source /opt/ohpc/admin/lmod/lmod/init/bash
-      python bootstrap_eb.py "{{ easybuild_prefix }}"
+      source /usr/share/lmod/lmod/init/bash 
+      source /tmp/eb_venv/bin/activate
+      /tmp/eb_venv/bin/eb --install-latest-eb-release --prefix {{ easybuild_prefix }}
   become_user: build
   args:
     executable: /bin/bash
@@ -68,10 +69,11 @@
 
 - name: Update file in warewulf file database
   command: wwsh file sync
+  when: not cod_deploy
 
 - name: Verify EasyBuild installation
   shell: |
-      source /opt/ohpc/admin/lmod/lmod/init/bash
+      source /usr/share/lmod/lmod/init/bash 
       module use "{{ easybuild_prefix }}/modules/all"
       module load EasyBuild
       eb --version
diff --git a/roles/ohpc_matlab/tasks/main.yaml b/roles/ohpc_matlab/tasks/main.yaml
index 296ed1c4..adbfdc1f 100644
--- a/roles/ohpc_matlab/tasks/main.yaml
+++ b/roles/ohpc_matlab/tasks/main.yaml
@@ -1,26 +1,22 @@
-- name: install the latest version of libXtst
-  yum:
-    name: libXt
-    state: latest
-
 - name: Create directory
   file:
     path: "{{ matlab_clustershare }}"
     state: directory
     mode: 0755
 
-- name: Download matlab
-  get_url:
-    url: "{{ matlab_download_url }}"
-    dest: "{{ matlab_destination  }}"
+- name: Create directory
+  file:
+    path: "{{ matlab_clustershare }}/{{ matlab_module_file }}/bin" 
+    state: directory
+    mode: 0755
 
-- name: Extract matlab
-  unarchive:
-    src: "{{ matlab_destination  }}"
-    dest: "{{ matlab_clustershare }}"
-    remote_src: yes
+- name: Install MATLAB (Executable file to run xfce4desktop)
+  template:
+    src: "{{ matlab_module_appdir }}"
+    dest: "{{ matlab_clustershare }}/{{ matlab_module_file }}/bin/{{ matlab_module_appdir }}"
+    mode: a+x
 
-- name: Create directory
+- name: Create modules directory
   file:
     path: "{{ matlab_module_path }}/{{ matlab_module_appdir }}"
     state: directory