diff --git a/roles/calculateSlurmConf/templates/slurm.conf.j2 b/roles/calculateSlurmConf/templates/slurm.conf.j2
index 66ea9f7fc30dc920dabb1e07580fb4c006f0a1fe..4cc03ad73081b03a877d3ec7a488115f6c92bc70 100644
--- a/roles/calculateSlurmConf/templates/slurm.conf.j2
+++ b/roles/calculateSlurmConf/templates/slurm.conf.j2
@@ -118,6 +118,9 @@ JobCompType=jobcomp/none
{% if slurmjob is defined %}
Prolog={{ slurmjob.prolog }}
Epilog={{ slurmjob.epilog }}
+{% else %}
+Prolog={{ slurm_dir }}/bin/slurm.prolog
+Epilog={{ slurm_dir }}/bin/slurm.epilog
{% endif %}
#
# ACCOUNTING
diff --git a/roles/karaage3.1.17/templates/index.html.j2 b/roles/karaage3.1.17/templates/index.html.j2
index 61c24b3954b21f5ebd0fa0f50abda8fd76611eac..6b65f306e0dd0f09477fc69c67ba87e09fead635 100644
--- a/roles/karaage3.1.17/templates/index.html.j2
+++ b/roles/karaage3.1.17/templates/index.html.j2
@@ -1,15 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<body><h3>HPC identity system (The landing page is under the construction)</h3>
-<br>
-<p>Monash HPC identity system is a new HPC access control system. Access to the HPC ID system is done through the Australian Access Federation (AAF). This allows you to login using your Institutional username and password.
-<br>
-<br>
-If it is the first time you are using the system, it will give your options to select your existing HPC username for creating a new user account. You'll need to join projects before you can access HPC system.
-<br>
-<br>
-If your organisation is not a member of the AAF or if you need helps, please send HPC email support: help@massive.org.au.</p>
-<br>
-<p>Click following link <a href=https://{{ ansible_fqdn }}/aafbootstrap>to continue.</a></p>
-</body>
-</html>
+<html><body><h3>HPC identity management</h3>
+<p>To log in via AAF authentication, connect to <a href=https://{{ hpchostname }}.erc.monash.edu.au/aafbootstrap>aafbootstrap</a></p>
+<p>To log in without AAF authentication, connect to <a href=https://{{ hpchostname }}.erc.monash.edu.au/users>users</a></p>
+</body></html>
diff --git a/roles/slurm-common/tasks/main.yml b/roles/slurm-common/tasks/main.yml
index 9763a144c7e4dc04175cdac769dcb0fe1842c30c..31120c9385a9c1137fa6cf225b4cbbfa30de8379 100644
--- a/roles/slurm-common/tasks/main.yml
+++ b/roles/slurm-common/tasks/main.yml
@@ -123,6 +123,14 @@
sudo: true
when: slurm_gres_list is defined
+- name: install slurm prolog
+ template: src=slurm.prolog.j2 dest={{ slurm_dir }}/bin/slurm.prolog
+ sudo: true
+
+- name: install slurm epilog
+ template: src=slurm.epilog.j2 dest={{ slurm_dir }}/bin/slurm.epilog
+ sudo: true
+
- name: install slurm.conf
copy: src=files/slurm.conf dest={{ slurm_dir }}/etc/slurm.conf
sudo: true
diff --git a/roles/slurm-common/templates/slurm.epilog.j2 b/roles/slurm-common/templates/slurm.epilog.j2
new file mode 100644
index 0000000000000000000000000000000000000000..84dd012fae68a7fd85ac390582d8f8991c322073
--- /dev/null
+++ b/roles/slurm-common/templates/slurm.epilog.j2
@@ -0,0 +1,2 @@
+#!/bin/sh
+find /tmp -user ${SLURM_JOB_USER} | xargs rm -rf
diff --git a/roles/slurm-common/templates/slurm.prolog.j2 b/roles/slurm-common/templates/slurm.prolog.j2
new file mode 100644
index 0000000000000000000000000000000000000000..039e4d0069c5c26909f86c505b9de66182e6d1f3
--- /dev/null
+++ b/roles/slurm-common/templates/slurm.prolog.j2
@@ -0,0 +1,2 @@
+#!/bin/sh
+exit 0