diff --git a/csub.py b/csub.py
index c80685b..3fa5fbe 100644
--- a/csub.py
+++ b/csub.py
@@ -206,10 +206,12 @@
     value: {args.name}
   arguments: 
     value: "/bin/zsh -c 'source ~/.zshrc && {args.command}'" # zshrc is just loaded to have some env variables ready
+  workingDir:
+    value: {working_dir}
   environment:
     items:
       HOME:
-        value: "/home/{user_cfg['user']}"
+        value: "{working_dir}"
       NB_USER:
         value: {user_cfg['user']}
       NB_UID:
diff --git a/template/user_template.yaml b/template/user_template.yaml
index 47a4835..419f9be 100644
--- a/template/user_template.yaml
+++ b/template/user_template.yaml
@@ -2,7 +2,7 @@
 user: <enter username>
 uid: <enter uid>
 group: MLO-unit
-gid: 75545
+gid: 83070
 wandb_api_key: <enter api key>
 working_dir: /mloscratch/homes/<enter username>
 symlinks: # list of symlinks to create (enter 'dir' or 'file' and the path)')