diff --git a/generate-hosts.yml b/generate-hosts.yml
new file mode 100644
index 0000000..812157d
--- /dev/null
+++ b/generate-hosts.yml
@@ -0,0 +1,7 @@
+---
+  - hosts: all
+    become: yes
+    become_method: sudo
+    roles:
+      - generate-hosts
+      - cleanup
diff --git a/roles/general-use-gui/tasks/main.yml b/roles/general-use-gui/tasks/main.yml
index 88418d2..481a7d7 100644
--- a/roles/general-use-gui/tasks/main.yml
+++ b/roles/general-use-gui/tasks/main.yml
@@ -116,6 +116,9 @@
         - i3lock
         - light-locker
 
+-   name: WORKAROUND for login failure - install dbus-user-session
+    apt: name=dbus-user-session state=latest
+
 -   name: Disable xscreensaver for xfce4 users
     command: mv /etc/xdg/autostart/xscreensaver.desktop /etc/xdg/autostart/xscreensaver.desktop.disabled
     args:
diff --git a/upgrade-office.yml b/upgrade-office.yml
index 2cfddb0..8d9ed92 100644
--- a/upgrade-office.yml
+++ b/upgrade-office.yml
@@ -1,6 +1,6 @@
 ---
    - hosts: office
-     remote_user: root
+     become: yes
      tasks:
         - name: upgrade software packages (safe)
           apt: update_cache=yes upgrade=safe