diff --git a/roles/discourse/tasks/main.yml b/roles/discourse/tasks/main.yml
index 9b456ed198de6e2a84160836a8923b6f68b49a79..92e7c21c82851f8f12118c7974f87b75bdb263df 100644
--- a/roles/discourse/tasks/main.yml
+++ b/roles/discourse/tasks/main.yml
@@ -4,7 +4,7 @@
     name: discourse
     system: yes
     state: present
-    uid: 1000
+    gid: 1000
 
 - name: User for Discourse present
   user:
@@ -12,9 +12,10 @@
     system: yes
     state: present
     shell: /bin/false
+    home: /var/discourse
+    createhome: true
     group: discourse
     uid: 1000
-    createhome: false
 
 - name: Directory for Discourse present
   file:
@@ -27,9 +28,8 @@
   git:
     repo: https://github.com/discourse/discourse_docker.git
     dest: /var/discourse
-  become: yes
-  become_user: discourse 
-  become_flags: '-s /bin/bash'
+  become_user: 'discourse' 
+  become_flags: '-s /bin/sh'
 
 - name: Count how much swap is available
   shell: "free -g --si | awk '/^Swap:/{print $2}'"
@@ -101,12 +101,10 @@
   template:
     src: templates/standalone.yml.j2
     dest: /var/discourse/containers/app.yml
-  become: yes
   become_user: discourse 
   become_flags: '-s /bin/bash'
 
 - name: Rebuild Discourse app
   command: /var/discourse/launcher rebuild app
-  become: yes
   become_user: discourse 
   become_flags: '-s /bin/bash'