diff --git a/roles/matrix-jitsi/templates/jibri/env.j2 b/roles/matrix-jitsi/templates/jibri/env.j2
new file mode 100644
index 000000000..b0dc8438b
--- /dev/null
+++ b/roles/matrix-jitsi/templates/jibri/env.j2
@@ -0,0 +1,17 @@
+PUBLIC_URL={{ matrix_jitsi_web_public_url }}
+XMPP_AUTH_DOMAIN={{ matrix_jitsi_xmpp_auth_domain }}
+XMPP_INTERNAL_MUC_DOMAIN={{ matrix_jitsi_xmpp_internal_muc_domain }}
+XMPP_RECORDER_DOMAIN={{ matrix_jitsi_recorder_domain }}
+XMPP_SERVER={{ matrix_jitsi_xmpp_server }}
+XMPP_DOMAIN={{ matrix_jitsi_xmpp_domain }}
+JIBRI_XMPP_USER={{ matrix_jitsi_jibri_xmpp_user }}
+JIBRI_XMPP_PASSWORD={{ matrix_jitsi_jibri_xmpp_password }}
+JIBRI_BREWERY_MUC={{ matrix_jitsi_jibri_brewery_muc }}
+JIBRI_RECORDER_USER={{ matrix_jitsi_jibri_recorder_user }}
+JIBRI_RECORDER_PASSWORD={{ matrix_jitsi_jibri_recorder_password }}
+JIBRI_RECORDING_DIR={{ matrix_jitsi_jibri_recording_dir }}
+JIBRI_FINALIZE_RECORDING_SCRIPT_PATH
+JIBRI_STRIP_DOMAIN_JID=muc
+JIBRI_LOGS_DIR={{ matrix_jitsi_jibri_logs_dir }}
+DISPLAY=:0
+TZ={{ matrix_jitsi_timezone }}
\ No newline at end of file
diff --git a/roles/matrix-jitsi/templates/jibri/matrix-jitsi-jibri.service.j2 b/roles/matrix-jitsi/templates/jibri/matrix-jitsi-jibri.service.j2
new file mode 100644
index 000000000..6ecafaa03
--- /dev/null
+++ b/roles/matrix-jitsi/templates/jibri/matrix-jitsi-jibri.service.j2
@@ -0,0 +1,33 @@
+#jinja2: lstrip_blocks: "True"
+[Unit]
+Description=Matrix jitsi-jicofo server
+{% for service in matrix_jitsi_jicofo_systemd_required_services_list %}
+Requires={{ service }}
+After={{ service }}
+{% endfor %}
+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'
+
+ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-jitsi-jicofo \
+			--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 %}
+			{{ arg }} \
+			{% endfor %}
+			{{ matrix_jitsi_jicofo_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'
+Restart=always
+RestartSec=30
+SyslogIdentifier=matrix-jitsi-jicofo
+
+[Install]
+WantedBy=multi-user.target
diff --git a/roles/matrix-jitsi/templates/jicofo/env.j2 b/roles/matrix-jitsi/templates/jicofo/env.j2
index 3de602825..927282151 100644
--- a/roles/matrix-jitsi/templates/jicofo/env.j2
+++ b/roles/matrix-jitsi/templates/jicofo/env.j2
@@ -30,5 +30,5 @@ TZ={{ matrix_jitsi_timezone }}
 XMPP_DOMAIN={{ matrix_jitsi_xmpp_domain }}
 XMPP_AUTH_DOMAIN={{ matrix_jitsi_xmpp_auth_domain }}
 XMPP_INTERNAL_MUC_DOMAIN={{ matrix_jitsi_xmpp_internal_muc_domain }}
-XMPP_MUC_DOMAIN
+XMPP_MUC_DOMAIN={{ matrix_jitsi_xmpp_muc_domain }}
 XMPP_SERVER={{ matrix_jitsi_xmpp_server }}
\ No newline at end of file