diff --git a/rootfs/etc/confd/templates/config.yaml.tmpl b/rootfs/etc/confd/templates/config.yaml.tmpl
index edbca87..ac0c7ad 100644
--- a/rootfs/etc/confd/templates/config.yaml.tmpl
+++ b/rootfs/etc/confd/templates/config.yaml.tmpl
@@ -37,20 +37,20 @@ appservice:
 
   # Authentication tokens for AS <-> HS communication. Autogenerated; do not modify.
   as_token: "{{ getenv "AS_TOKEN" }}"
-  hs_token: {{ getenv "HS_TOKEN" }}"
+  hs_token: "{{ getenv "HS_TOKEN" }}"
 
 # Bridge config. Currently unused.
 bridge:
   # Localpart template of MXIDs for WhatsApp users.
   # {{.}} is replaced with the phone number of the WhatsApp user.
-  username_template: whatsapp_{{.}}
+  username_template: _whatsapp_{{"{{"}}.{{"}}"}}
   # Displayname template for WhatsApp users.
   # {{.Notify}} - nickname set by the WhatsApp user
   # {{.Jid}}    - phone number (international format)
   # The following variables are also available, but will cause problems on multi-user instances:
   # {{.Name}}   - display name from contact list
   # {{.Short}}  - short display name from contact list
-  displayname_template: "{{if .Notify}}{{.Notify}}{{else}}{{.Jid}}{{end}} (WA)"
+  displayname_template: "{{"{{"}}if .Notify{{"}}"}}{{"{{"}}.Notify{{"}}"}}{{"{{"}}else{{"}}"}}{{"{{"}}.Jid{{"}}"}}{{"{{"}}end{{"}}"}} (WA)"
 
   # The prefix for commands. Only required in non-management rooms.
   command_prefix: "!wa"
@@ -72,7 +72,7 @@ logging:
   # The directory for log files. Will be created if not found.
   directory: /var/lib/matrix-bridge/logs
   # Available variables: .Date for the file date and .Index for different log files on the same day.
-  file_name_format: "{{.Date}}-{{.Index}}.log"
+  file_name_format: "{{"{{"}}.Date{{"}}"}}-{{"{{"}}.Index{{"}}"}}.log"
   # Date format for file names in the Go time format: https://golang.org/pkg/time/#pkg-constants
   file_date_format: 2006-01-02
   # Log file permissions.