diff --git a/roles/jitsi_jibri/tasks/user.yml b/roles/jitsi_jibri/tasks/user.yml
index 4502922..7244256 100644
--- a/roles/jitsi_jibri/tasks/user.yml
+++ b/roles/jitsi_jibri/tasks/user.yml
@@ -1,5 +1,10 @@
 ---
 
 - name: Create jibri user account
-  user: name={{ jitsi_jibri_user }} home={{ jitsi_root_dir }}/jibri system=True
+  user:
+    name: "{{ jitsi_jibri_user }}"
+    home: "{{ jitsi_root_dir }}/jibri"
+    groups:
+      - tty
+      - video
   tags: jitsi
diff --git a/roles/jitsi_jibri/templates/jitsi-jibri-xorg.service.j2 b/roles/jitsi_jibri/templates/jitsi-jibri-xorg.service.j2
index 266c0da..6d48f0f 100644
--- a/roles/jitsi_jibri/templates/jitsi-jibri-xorg.service.j2
+++ b/roles/jitsi_jibri/templates/jitsi-jibri-xorg.service.j2
@@ -6,7 +6,7 @@ After=network.target
 User={{ jitsi_jibri_user }}
 Group={{ jitsi_jibri_user }}
 Environment=DISPLAY=:0
-ExecStart=/usr/bin/Xorg -nocursor -noreset  +extension RANDR +extension RENDER -logfile /dev/stdout  -config {{ jitsi_root_dir }}/jibri/xorg-video-dummy.conf :0
+ExecStart=/usr/bin/Xorg -nocursor -noreset  +extension RANDR +extension RENDER -config {{ jitsi_root_dir }}/etc/jibri/xorg-video-dummy.conf :0
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
 Restart=on-failure
diff --git a/roles/jitsi_jibri/templates/jitsi-jibri.service.j2 b/roles/jitsi_jibri/templates/jitsi-jibri.service.j2
index 251cae0..c8fec54 100644
--- a/roles/jitsi_jibri/templates/jitsi-jibri.service.j2
+++ b/roles/jitsi_jibri/templates/jitsi-jibri.service.j2
@@ -8,14 +8,10 @@ SuccessExitStatus=143
 User={{ jitsi_jibri_user }}
 Group={{ jitsi_jibri_user }}
 PrivateTmp=true
-PrivateDevices=true
-ProtectHome=true
-ProtectSystem=full
-ReadOnlyDirectories={{ jitsi_root_dir }}/etc {{ jitsi_root_dir }}/jibri
 Restart=on-failure
 StartLimitInterval=0
 RestartSec=30
-ExecStart=/bin/java -Dconfig.file="{{ jitsi_root_dir }}/etc/jibri/jibri.conf" -jar {{ jitsi_root_dir }}/jibri/jibri.jar
+ExecStart=/bin/java -Dconfig.file={{ jitsi_root_dir }}/etc/jibri/jibri.conf -jar {{ jitsi_root_dir }}/jibri/jibri.jar
 
 [Install]
 WantedBy=multi-user.target