diff --git a/guest-overlay/files/pam_mount.conf.xml b/guest-overlay/files/pam_mount.conf.xml
index abfeb7c7ae58ad473a154d102e397d409a2ea47b..7f5241e9073bd8b51665f8bccee128d9dfecaca8 100644
--- a/guest-overlay/files/pam_mount.conf.xml
+++ b/guest-overlay/files/pam_mount.conf.xml
@@ -19,7 +19,9 @@
 
 <volume sgrp="gast" fstype="tmpfs" path="tmpfs" mountpoint="/guests/temporary" options="noatime,noexec,rw" />
 
-<volume path="none" sgrp="gast" fstype="aufs" mountpoint="/guests/home" options="br:/guests/temporary=rw:/guests/provision=ro,udba=reval" />
+<volume sgrp="gast" fstype="tmpfs" path="tmpfs" mountpoint="/guests/temporary_workdir" options="noatime,noexec,rw" />
+
+<volume path="none" sgrp="gast" fstype="overlay" mountpoint="/guests/home" options="lowerdir=/guests/provision,upperdir=/guests/temporary,workdir=/guests/temporary_workdir" />
 
 <!-- pam_mount parameters: General tunables -->
 
diff --git a/guest-overlay/tasks/main.yml b/guest-overlay/tasks/main.yml
index d493dc25acfff70ddac9f5b0cb61b5b67b3ce720..accaeebf004b42af87fea8fe648f56b190226be4 100644
--- a/guest-overlay/tasks/main.yml
+++ b/guest-overlay/tasks/main.yml
@@ -22,17 +22,16 @@
   tags:
     - guest-overlay
 
-- name: ensure aufs and pam-mount are available
+- name: ensure pam-mount available
   apt:
     name:
-      - aufs-tools
       - libpam-mount
     state: present
   tags:
     - guest-overlay
     - packages
 
-- name: ensure aufs mountpoints are available
+- name: ensure overlayfs mountpoints are available
   file:
     path: "/guests/{{ item }}"
     state: directory