diff --git a/roles/matrix-jitsi/templates/jibri/matrix-jitsi-jibri.service.j2 b/roles/matrix-jitsi/templates/jibri/matrix-jitsi-jibri.service.j2
index 6ecafaa0..044b9e69 100644
--- a/roles/matrix-jitsi/templates/jibri/matrix-jitsi-jibri.service.j2
+++ b/roles/matrix-jitsi/templates/jibri/matrix-jitsi-jibri.service.j2
@@ -1,7 +1,7 @@
 #jinja2: lstrip_blocks: "True"
 [Unit]
-Description=Matrix jitsi-jicofo server
-{% for service in matrix_jitsi_jicofo_systemd_required_services_list %}
+Description=Matrix jitsi-jibri server
+{% for service in matrix_jitsi_jibri_systemd_required_services_list %}
 Requires={{ service }}
 After={{ service }}
 {% endfor %}
@@ -10,24 +10,30 @@ DefaultDependencies=no
 [Service]
 Type=simple
 Environment="HOME={{ matrix_systemd_unit_home_path }}"
-ExecStartPre=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-jitsi-jicofo 2>/dev/null'
-ExecStartPre=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-jitsi-jicofo 2>/dev/null'
+ExecStartPre=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-jitsi-jibri 2>/dev/null'
+ExecStartPre=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-jitsi-jibri 2>/dev/null'
 
-ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-jitsi-jicofo \
+ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-jitsi-jibri \
 			--log-driver=none \
 			--network={{ matrix_docker_network }} \
-			--env-file={{ matrix_jitsi_jicofo_base_path }}/env \
-			--mount type=bind,src={{ matrix_jitsi_jicofo_config_path }},dst=/config \
-			{% for arg in matrix_jitsi_jicofo_container_extra_arguments %}
+			--env-file={{ matrix_jitsi_jibri_base_path }}/env \
+#			--device=/dev/snd:/dev/snd \
+			--mount type=bind,src=/dev/snd,dst=/dev/snd \
+			--mount type=bind,src={{ matrix_jitsi_jibri_config_path }},dst=/config \
+#			--volume={{ matrix_jitsi_jibri_config_path }}:/config:Z \
+			--volume=/dev/shm:/dev/shm \
+			--cap-add=SYS_ADMIN \
+			--cap-add=NET_BIND_SERVICE \
+			{% for arg in matrix_jitsi_jibri_container_extra_arguments %}
 			{{ arg }} \
 			{% endfor %}
-			{{ matrix_jitsi_jicofo_docker_image }}
+			{{ matrix_jitsi_jibri_docker_image }}
 
-ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-jitsi-jicofo 2>/dev/null'
-ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-jitsi-jicofo 2>/dev/null'
+ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-jitsi-jibri 2>/dev/null'
+ExecStop=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-jitsi-jibri 2>/dev/null'
 Restart=always
 RestartSec=30
-SyslogIdentifier=matrix-jitsi-jicofo
+SyslogIdentifier=matrix-jitsi-jibri
 
 [Install]
 WantedBy=multi-user.target