diff --git a/roles/matrix-bridge-facebook/tasks/main.yml b/roles/matrix-bridge-facebook/tasks/main.yml
index a34249e..d398496 100644
--- a/roles/matrix-bridge-facebook/tasks/main.yml
+++ b/roles/matrix-bridge-facebook/tasks/main.yml
@@ -53,6 +53,8 @@
   no_log: true
 
 - name: Generate facebook-registration.yaml
+  become: yes
+  become_user: mautrix-facebook
   shell:
     cmd: "/opt/mautrix-facebook/bin/python -m mautrix_facebook -g"
     chdir: /opt/mautrix-facebook
@@ -61,8 +63,6 @@
   no_log: true
 
 - name: Copy config for synapse
-  become: yes
-  become_user: mautrix-facebook
   file:
     src: /opt/mautrix-facebook/registration.yaml
     dest: /etc/matrix-synapse/facebook-registration.yaml
diff --git a/roles/matrix-bridge-facebook/templates/bridge_discord.service b/roles/matrix-bridge-facebook/templates/bridge_facebook.service
similarity index 100%
rename from roles/matrix-bridge-facebook/templates/bridge_discord.service
rename to roles/matrix-bridge-facebook/templates/bridge_facebook.service
diff --git a/roles/matrix-bridge-facebook/templates/config.yaml b/roles/matrix-bridge-facebook/templates/config.yaml
index 0149669..13f6b1a 100644
--- a/roles/matrix-bridge-facebook/templates/config.yaml
+++ b/roles/matrix-bridge-facebook/templates/config.yaml
@@ -77,7 +77,7 @@ appservice:
 
     # Authentication tokens for AS <-> HS communication. Autogenerated; do not modify.
     as_token: {{ matrix_bridge_facebook_as_token }}
-    hs_token: {{ matrix_bridge_facebook_as_token }}
+    hs_token: {{ matrix_bridge_facebook_hs_token }}
 
 # Prometheus telemetry config. Requires prometheus-client to be installed.
 metrics: