diff --git a/forwardport/data/views.xml b/forwardport/data/views.xml
index 36d427f7..b098d7e5 100644
--- a/forwardport/data/views.xml
+++ b/forwardport/data/views.xml
@@ -15,7 +15,7 @@
                 ])"/>
                 <div t-if="outstanding != 0" class="alert col-md-12 alert-warning mb-0">
                     <a href="/forwardport/outstanding">
-                        <t t-esc="outstanding"/> outstanding forward-ports (>1 week)
+                        <t t-out="outstanding"/> outstanding forward-ports (>1 week)
                     </a>
                 </div>
             </t>
diff --git a/runbot/static/src/js/fields/fields.js b/runbot/static/src/js/fields/fields.js
index 5fa95487..6f029641 100644
--- a/runbot/static/src/js/fields/fields.js
+++ b/runbot/static/src/js/fields/fields.js
@@ -23,7 +23,7 @@ function stringify(obj) {
 export class JsonField extends TextField {
     static template = xml`
     <t t-if="props.readonly">
-            <span t-esc="value"/>
+            <span t-out="value"/>
         </t>
         <t t-else="">
             <div t-ref="div">
@@ -64,7 +64,7 @@ registry.category("fields").add("runbotjsonb", {
 
 export class FrontendUrl extends Component {
     static template = xml`
-        <div><a t-att-href="route" target="_blank"><t t-esc="displayValue"/></a></div>
+        <div><a t-att-href="route" target="_blank"><t t-out="displayValue"/></a></div>
     `;
 
     static components = { Many2OneField };
diff --git a/runbot/static/src/js/fields/tracking_value.xml b/runbot/static/src/js/fields/tracking_value.xml
index a3829af8..9aaca233 100644
--- a/runbot/static/src/js/fields/tracking_value.xml
+++ b/runbot/static/src/js/fields/tracking_value.xml
@@ -9,24 +9,24 @@
                         <button class="btn btn-sm btn-outline-primary" t-on-click="toggleKept">Toggle context</button>
                         <button class="btn btn-sm btn-outline-primary" t-on-click="copyNewToClipboard(trackingValue)">Copy new value to clipboard</button>
                     </div>
-                    <div class="o-mail-Message-trackingField ms-1 fst-italic text-muted">(<t t-esc="trackingValue.changedField"/>)</div>
+                    <div class="o-mail-Message-trackingField ms-1 fst-italic text-muted">(<t t-out="trackingValue.changedField"/>)</div>
                     <div class="code_diff">
                         <table>
                             <t t-foreach="lines(trackingValue)" t-as="line" t-key="line_index">
                                 <tr t-if="kept or line.type!=='kept'">
-                                    <td class="col_number" t-esc="line.pre_line_counter"/>
-                                    <td class="col_number" t-esc="line.post_line_counter"/>
-                                    <td class="code" t-att-class="line.type" t-esc="line.line"/>
+                                    <td class="col_number" t-out="line.pre_line_counter"/>
+                                    <td class="col_number" t-out="line.post_line_counter"/>
+                                    <td class="code" t-att-class="line.type" t-out="line.line"/>
                                 </tr>
                             </t>
                         </table>
                     </div>
                 </t>
                 <t t-else="">
-                    <span class="o-mail-Message-trackingOld me-1 px-1 text-muted fw-bold" t-esc="formatTrackingOrNone(trackingValue.fieldType, trackingValue.oldValue)"/>
+                    <span class="o-mail-Message-trackingOld me-1 px-1 text-muted fw-bold" t-out="formatTrackingOrNone(trackingValue.fieldType, trackingValue.oldValue)"/>
                     <i class="o-mail-Message-trackingSeparator fa fa-long-arrow-right mx-1 text-600"/>
-                    <span class="o-mail-Message-trackingNew me-1 fw-bold text-info" t-esc="formatTrackingOrNone(trackingValue.fieldType, trackingValue.newValue)"/>
-                    <span class="o-mail-Message-trackingField ms-1 fst-italic text-muted">(<t t-esc="trackingValue.changedField"/>)</span>
+                    <span class="o-mail-Message-trackingNew me-1 fw-bold text-info" t-out="formatTrackingOrNone(trackingValue.fieldType, trackingValue.newValue)"/>
+                    <span class="o-mail-Message-trackingField ms-1 fst-italic text-muted">(<t t-out="trackingValue.changedField"/>)</span>
                 </t>
             </li>
         </xpath>
diff --git a/runbot/templates/badge.xml b/runbot/templates/badge.xml
index 98f3f289..fdfc7d8d 100644
--- a/runbot/templates/badge.xml
+++ b/runbot/templates/badge.xml
@@ -15,10 +15,10 @@
         <rect t-att-x="left.width" width="4" height="18" t-att-fill="right.color"/>
         <rect rx="4" t-attf-width="{{ left.width + right.width }}" height="18" fill="url(#smooth)"/>
         <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
-          <text t-attf-x="{{left.width/2+1}}" y="13" fill="#010101" fill-opacity=".3"><t t-esc="left.text"/></text>
-          <text t-attf-x="{{left.width/2+1}}" y="12"><t t-esc="left.text"/></text>
-          <text t-attf-x="{{left.width+right.width/2-1}}" y="13" fill="#010101" fill-opacity=".3"><t t-esc="right.text"/></text>
-          <text t-attf-x="{{left.width+right.width/2-1}}" y="12"><t t-esc="right.text"/></text>
+          <text t-attf-x="{{left.width/2+1}}" y="13" fill="#010101" fill-opacity=".3"><t t-out="left.text"/></text>
+          <text t-attf-x="{{left.width/2+1}}" y="12"><t t-out="left.text"/></text>
+          <text t-attf-x="{{left.width+right.width/2-1}}" y="13" fill="#010101" fill-opacity=".3"><t t-out="right.text"/></text>
+          <text t-attf-x="{{left.width+right.width/2-1}}" y="12"><t t-out="right.text"/></text>
         </g>
       </svg>
     </template>
@@ -36,10 +36,10 @@
         <rect t-att-x="left.width" width="4" height="20" t-att-fill="right.color"/>
         <rect rx="3" t-attf-width="{{ left.width + right.width }}" height="20" fill="url(#smooth)"/>
         <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
-          <text t-attf-x="{{left.width/2+1}}" y="15" fill="#010101" fill-opacity=".3"><t t-esc="left.text"/></text>
-          <text t-attf-x="{{left.width/2+1}}" y="14"><t t-esc="left.text"/></text>
-          <text t-attf-x="{{left.width+right.width/2-1}}" y="15" fill="#010101" fill-opacity=".3"><t t-esc="right.text"/></text>
-          <text t-attf-x="{{left.width+right.width/2-1}}" y="14"><t t-esc="right.text"/></text>
+          <text t-attf-x="{{left.width/2+1}}" y="15" fill="#010101" fill-opacity=".3"><t t-out="left.text"/></text>
+          <text t-attf-x="{{left.width/2+1}}" y="14"><t t-out="left.text"/></text>
+          <text t-attf-x="{{left.width+right.width/2-1}}" y="15" fill="#010101" fill-opacity=".3"><t t-out="right.text"/></text>
+          <text t-attf-x="{{left.width+right.width/2-1}}" y="14"><t t-out="right.text"/></text>
         </g>
       </svg>
     </template>
diff --git a/runbot/templates/batch.xml b/runbot/templates/batch.xml
index 8840104d..b54f8c3b 100644
--- a/runbot/templates/batch.xml
+++ b/runbot/templates/batch.xml
@@ -10,7 +10,7 @@
                         <tr>
                             <td>Bundle</td>
                             <td>
-                                <a t-esc="batch.bundle_id.name" t-attf-href="/runbot/bundle/{{batch.bundle_id.id}}"/>
+                                <a t-out="batch.bundle_id.name" t-attf-href="/runbot/bundle/{{batch.bundle_id.id}}"/>
                                 &amp;emsp;
                                 <a groups="runbot.group_runbot_advanced_user" t-attf-href="/web/#id={{batch.id}}&amp;view_type=form&amp;model=runbot.batch&amp;menu_id={{env['ir.model.data']._xmlid_to_res_id('runbot.runbot_menu_root')}}" class="btn btn-default btn-sm" target="new" title="View Batch in Backend">
                                           <i class="fa fa-list"/>
@@ -19,28 +19,28 @@
                         </tr>
                         <tr t-if="batch.category_id.id != default_category">
                             <td>Category</td>
-                            <td t-esc="batch.category_id.name"></td>
+                            <td t-out="batch.category_id.name"></td>
                         </tr>
                         <tr>
                             <td>Version</td>
-                            <td t-esc="batch.slot_ids[0].params_id.version_id.name if batch.slot_ids else batch.bundle_id.version_id.name"/>
+                            <td t-out="batch.slot_ids[0].params_id.version_id.name if batch.slot_ids else batch.bundle_id.version_id.name"/>
                         </tr>
                         <tr>
                             <td>Create date</td>
-                            <td t-esc="batch.create_date"/>
+                            <td t-out="batch.create_date"/>
                         </tr>
                         <tr t-if="more">
                             <td>Last update</td>
                             <td>
-                                <t t-esc="batch.last_update"/>
-                                <span class="badge text-bg-info" t-esc="s2human(batch.last_update - batch.create_date)"/>
+                                <t t-out="batch.last_update"/>
+                                <span class="badge text-bg-info" t-out="s2human(batch.last_update - batch.create_date)"/>
                             </td>
                         </tr>
                         <tr t-if="more and batch.reference_batch_ids">
                             <td>Version reference batches (for upgrade)</td>
                             <td>
                                 <t t-foreach="batch.reference_batch_ids" t-as="reference_batch"/>
-                                <div><a t-attf-href="/runbot/batch/{{reference_batch.id}}"><t t-esc="reference_batch.bundle_id.version_id.name"/> (<t t-esc="reference_batch.id"/>)</a></div>
+                                <div><a t-attf-href="/runbot/batch/{{reference_batch.id}}"><t t-out="reference_batch.bundle_id.version_id.name"/> (<t t-out="reference_batch.id"/>)</a></div>
                             </td>
                         </tr>
                         <tr>
@@ -54,63 +54,63 @@
                                         <i class="fa fa-fw fa-link" t-if="commit_link.match_type == 'head'" title="This commit is an existing head from bundle branches"/>
                                         <i class="fa fa-fw fa-code-fork" t-if="commit_link.match_type == 'base_match'" title="This commit is matched from a base batch with matching merge_base"/>
                                         <i class="fa fa-fw fa-clock-o" t-if="commit_link.match_type == 'base_head'" title="This commit is the head of a base branch"/>
-                                        <span class="label" t-esc="commit.dname"/>
+                                        <span class="label" t-out="commit.dname"/>
                                     </a>
                                     <a t-att-href="'https://%s/commit/%s' % (commit_link.branch_id.remote_id.base_url, commit_link.commit_id.name)" title="View Commit on Github"><i class="fa fa-github"/></a>
                                     <small t-if="commit_link.match_type and commit_link.match_type.startswith('base')">
                                         from base:
-                                        <span t-esc="commit_link.branch_id.name"/>
+                                        <span t-out="commit_link.branch_id.name"/>
                                         <br/>
                                     </small>
                                     <small t-else="">
                                         found in branch
-                                        <span t-esc="commit_link.branch_id.name"/>
+                                        <span t-out="commit_link.branch_id.name"/>
                                         <t t-if="batch.state != 'preparing'">
-                                            <span t-esc="'+%s' % commit_link.diff_add" class="text-success"/>
-                                            <span t-esc="'-%s' % commit_link.diff_remove" class="text-danger"/>
+                                            <span t-out="'+%s' % commit_link.diff_add" class="text-success"/>
+                                            <span t-out="'-%s' % commit_link.diff_remove" class="text-danger"/>
                                             <span class="text-info">
                                                 (
-                                                <span t-esc="commit_link.file_changed"/>
+                                                <span t-out="commit_link.file_changed"/>
                                                 <i class="fa fa-file"/>
                                                 )
                                                 <span io="behind">(
-                                                    <span t-esc="'%s ahead' % commit_link.base_ahead" class="text-success"/>
+                                                    <span t-out="'%s ahead' % commit_link.base_ahead" class="text-success"/>
                                                     ,
-                                                    <span t-esc="'%s behind' % commit_link.base_behind" class="text-danger"/>
+                                                    <span t-out="'%s behind' % commit_link.base_behind" class="text-danger"/>
                                                 )</span>
                                             </span>
                                         </t>
                                         <br/>
                                         <t t-if="more">
                                             Base head:
-                                            <span t-esc="commit_link.base_commit_id.name"/>
+                                            <span t-out="commit_link.base_commit_id.name"/>
                                             <br/>
                                             Merge base:
-                                            <span t-esc="commit_link.merge_base_commit_id.name"/>
+                                            <span t-out="commit_link.merge_base_commit_id.name"/>
                                             <br/>
                                         </t>
                                     </small>
-                                    <b t-if="commit.rebase_on_id">Automatic rebase on <t t-esc="commit.rebase_on_id.name"/><br/></b>
+                                    <b t-if="commit.rebase_on_id">Automatic rebase on <t t-out="commit.rebase_on_id.name"/><br/></b>
                                     <t t-if="more or not (commit_link.match_type and commit_link.match_type.startswith('base'))">
                                         Subject:
-                                        <span t-esc="commit.subject"/>
+                                        <span t-out="commit.subject"/>
                                         <br/>
                                         Author:
-                                        <span t-esc="commit.author"/>
+                                        <span t-out="commit.author"/>
                                         (
-                                        <span t-esc="commit.author_email"/>
+                                        <span t-out="commit.author_email"/>
                                         )
                                         <br/>
                                         <t t-if="commit.author != commit.committer">
                                             Committer:
-                                            <span t-esc="commit.committer"/>
+                                            <span t-out="commit.committer"/>
                                             (
-                                            <span t-esc="commit.committer_email"/>
+                                            <span t-out="commit.committer_email"/>
                                             )
                                             <br/>
                                         </t>
                                         Commit date:
-                                        <span t-esc="commit.date"/>
+                                        <span t-out="commit.date"/>
                                         <br/>
                                     </t>
                                     <hr/>
@@ -155,7 +155,7 @@
                 <t t-foreach="batch.log_ids" t-as="log">
                     <t t-set="logclass" t-value="dict(ERROR='danger', WARNING='warning', INFO='info').get(log.level, 'warning')"/>
                     <div t-attf-class="alert alert-{{logclass}}">
-                        <b t-esc="log.level"/>
+                        <b t-out="log.level"/>
                         --
                         <t t-out="log._markdown()"/>
                     </div>
diff --git a/runbot/templates/branch.xml b/runbot/templates/branch.xml
index d95f6a96..7999a29f 100644
--- a/runbot/templates/branch.xml
+++ b/runbot/templates/branch.xml
@@ -8,7 +8,7 @@
             <div class='col-md-12'>
               <div class="navbar navbar-default">
                 <h3>
-                  <span class="text-muted"><t t-esc="branch.remote_id.short_name"/>:</span><t t-esc="branch.name"/> <i t-if="not branch.alive" title="deleted/closed" class="fa fa-ban text-danger"/>
+                  <span class="text-muted"><t t-out="branch.remote_id.short_name"/>:</span><t t-out="branch.name"/> <i t-if="not branch.alive" title="deleted/closed" class="fa fa-ban text-danger"/>
                   <div class="btn-group" role="group">
                     <a t-att-href="branch.branch_url" class="btn btn-sm text-start" title="View Branch on Github"><i class="fa fa-github"/></a>
                     <a groups="runbot.group_runbot_admin" class="btn btn-sm fa fa-list text-start" t-attf-href="/web/#id={{branch.id}}&amp;view_type=form&amp;model=runbot.branch" target="new" title="View Branch in Backend"/>
@@ -18,11 +18,11 @@
               <table class="table table-condensed table-responsive table-stripped">
                 <tr>
                   <td>Remote:</td>
-                  <td t-esc="branch.remote_id.name"></td>
+                  <td t-out="branch.remote_id.name"></td>
                 </tr>
                 <tr>
                   <td>Head:</td>
-                  <td t-esc="branch.head_name"></td>
+                  <td t-out="branch.head_name"></td>
                 </tr>
                 <tr>
                   <td>Bundle:</td>
@@ -30,7 +30,7 @@
                     <small>
                       <div class="btn-toolbar mb-1" role="toolbar">
                         <div class="btn-group btn-group-ssm w-100" role="group">
-                            <a t-attf-href="/runbot/bundle/{{branch.bundle_id.id}}" t-esc="branch.bundle_id.name" class="btn btn-default text-start" title="View Bundle Details"/>
+                            <a t-attf-href="/runbot/bundle/{{branch.bundle_id.id}}" t-out="branch.bundle_id.name" class="btn btn-default text-start" title="View Bundle Details"/>
                         </div>
                     </div>
                     </small>
@@ -39,21 +39,21 @@
                 <t t-if="branch.is_pr">
                   <tr t-if="pr_branch">
                     <td>Pull Head Name</td>
-                    <td><a t-attf-href="/runbot/branch/{{pr_branch.id}}" t-esc="branch.pull_head_name" title="View PR Details"/></td>
+                    <td><a t-attf-href="/runbot/branch/{{pr_branch.id}}" t-out="branch.pull_head_name" title="View PR Details"/></td>
                   </tr>
                   <tr>
                     <td>Target Branch</td>
-                    <td t-esc="branch.target_branch_name"></td>
+                    <td t-out="branch.target_branch_name"></td>
                   </tr>
                   <tr>
                     <td>Pr title</td>
-                    <td t-esc="branch.pr_title"/>
+                    <td t-out="branch.pr_title"/>
                   </tr>
                 </t>
                 <t t-elif="branch_pr">
                   <tr>
                     <td>Pull Request:</td>
-                    <td><a t-attf-href="/runbot/branch/{{branch_pr.id}}" t-esc="branch_pr.name" title="View Branch Details"/></td>
+                    <td><a t-attf-href="/runbot/branch/{{branch_pr.id}}" t-out="branch_pr.name" title="View Branch Details"/></td>
                   </tr>
                 </t>
               </table>
@@ -68,11 +68,11 @@
                       </tr>
                   </thead>
                   <tr t-foreach='branch.reflog_ids' t-as='reflog'>
-                    <td t-esc="reflog.date"/>
-                    <td><a t-attf-href="/runbot/commit/{{reflog.commit_id.id}}" t-esc="reflog.commit_id.name"/></td>
-                    <td t-esc="reflog.commit_id.date"/>
-                    <td t-esc="reflog.commit_id.author"/>
-                    <td t-esc="reflog.commit_id.subject"/>
+                    <td t-out="reflog.date"/>
+                    <td><a t-attf-href="/runbot/commit/{{reflog.commit_id.id}}" t-out="reflog.commit_id.name"/></td>
+                    <td t-out="reflog.commit_id.date"/>
+                    <td t-out="reflog.commit_id.author"/>
+                    <td t-out="reflog.commit_id.subject"/>
                   </tr>
                 </table>
                 <h4 t-else="">No Reflogs Found</h4>
diff --git a/runbot/templates/build.xml b/runbot/templates/build.xml
index 726492ec..79381982 100644
--- a/runbot/templates/build.xml
+++ b/runbot/templates/build.xml
@@ -29,22 +29,22 @@
               <ol class="breadcrumb mb-0">
                 <li t-attf-class="breadcrumb-item">
                   <a t-attf-href="/runbot/{{build.params_id.project_id.id}}">
-                    <t t-esc="build.params_id.project_id.name"/>
+                    <t t-out="build.params_id.project_id.name"/>
                   </a>
                 </li>
                 <li t-if="unique_bundle" t-attf-class="breadcrumb-item">
                   <a t-att-href="unique_bundle._url()">
-                    <t t-esc="unique_bundle.name"/>
+                    <t t-out="unique_bundle.name"/>
                   </a>
                 </li>
                 <li t-if="unique_batch" t-attf-class="breadcrumb-item">
                   <a t-att-href="unique_batch._url()">
-                    batch-<t t-esc="unique_batch.id"/> (<t t-esc="build.params_id.trigger_id.name"/>)
+                    batch-<t t-out="unique_batch.id"/> (<t t-out="build.params_id.trigger_id.name"/>)
                   </a>
                 </li>
                 <li t-foreach="build.ancestors" t-as="ancestor" t-attf-class="breadcrumb-item{{' active' if ancestor == build else ''}}">
                   <a t-att-href="ancestor.build_url">
-                    <t t-esc="ancestor.description or ancestor.config_id.name"/>
+                    <t t-out="ancestor.description or ancestor.config_id.name"/>
                   </a>
                 </li>
               </ol>
@@ -70,14 +70,14 @@
             <div class="build_details">
               <!-- Batch/bundles links-->
               <t t-if="len(bundles) > 1">
-                This build is referenced in <t t-esc="len(bundles)"/> bundles
+                This build is referenced in <t t-out="len(bundles)"/> bundles
                 <ul>
-                  <li t-foreach="bundles" t-as="bundle" ><a t-esc="bundle.name" t-attf-href="/runbot/bundle/{{bundle.id}}"/></li>
+                  <li t-foreach="bundles" t-as="bundle" ><a t-out="bundle.name" t-attf-href="/runbot/bundle/{{bundle.id}}"/></li>
                 </ul>
               </t>
               <t t-if="len(batches) > 1">
-                <b>First apparition:</b> <a t-esc="batches[0].bundle_id.name" t-attf-href="/runbot/batch/{{batches[0].id}}"/><br/>
-                <b>Last apparition:</b> <a t-esc="batches[-1].bundle_id.name" t-attf-href="/runbot/batch/{{batches[-1].id}}"/><br/>
+                <b>First apparition:</b> <a t-out="batches[0].bundle_id.name" t-attf-href="/runbot/batch/{{batches[0].id}}"/><br/>
+                <b>Last apparition:</b> <a t-out="batches[-1].bundle_id.name" t-attf-href="/runbot/batch/{{batches[-1].id}}"/><br/>
               </t>
               <!-- Parent -->
               <div t-if="build.parent_id and build.orphan_result">
@@ -95,7 +95,7 @@
               <t t-foreach="build.params_id.sudo().commit_link_ids" t-as="build_commit">
                 <b>Commit:</b>
                 <a t-attf-href="/runbot/commit/{{build_commit.commit_id.id}}">
-                  <t t-esc="build_commit.commit_id.dname"/>
+                  <t t-out="build_commit.commit_id.dname"/>
                 </a>
                 &amp;nbsp;
                 <a t-att-href="'https://%s/commit/%s' % (build_commit.branch_id.remote_id.base_url, build_commit.commit_id.name)" title="View Commit on Github"><i class="fa fa-github"/></a>
@@ -105,40 +105,40 @@
                 </t>
                 <div t-else="" class="ms-3">
                   <b>Subject:</b>
-                  <t t-esc="build_commit.commit_id.subject"/>
+                  <t t-out="build_commit.commit_id.subject"/>
                   <br/>
                   <b>Author:</b>
-                  <t t-esc="build_commit.commit_id.author"/>
+                  <t t-out="build_commit.commit_id.author"/>
                   <br/>
                   <b>Committer:</b>
-                  <t t-esc="build_commit.commit_id.committer"/>
+                  <t t-out="build_commit.commit_id.committer"/>
                   <br/>
                 </div>
               </t>
               <b>Version:</b>
-              <t t-esc="build.params_id.version_id.name"/>
+              <t t-out="build.params_id.version_id.name"/>
               <br/>
               <b>Config:</b>
-              <t t-esc="build.params_id.config_id.name"/>
+              <t t-out="build.params_id.config_id.name"/>
               <br/>
               <t t-if='more'>
                 <b>Trigger:</b>
-                <t t-esc="build.params_id.trigger_id.name"/>
+                <t t-out="build.params_id.trigger_id.name"/>
                 <br/>
                 <b>Config data:</b>
-                <t t-esc="build.params_id.config_data.dict"/>
+                <t t-out="build.params_id.config_data.dict"/>
                 <br/>
                 <b>Modules:</b>
-                <t t-esc="build.params_id.modules"/>
+                <t t-out="build.params_id.modules"/>
                 <br/>
                 <b>Extra params:</b>
-                <t t-esc="build.params_id.extra_params"/>
+                <t t-out="build.params_id.extra_params"/>
                 <br/>
 
                 <t t-if="len(build.params_id.builds_reference_ids) > 1">
                   <b>Reference builds:</b>
                   <t t-foreach="build.params_id.builds_reference_ids" t-as="reference">
-                    <span t-esc="reference.id"/>
+                    <span t-out="reference.id"/>
                   </t>
                   <br/>
                 </t>
@@ -149,39 +149,39 @@
                     <a t-if="simbuild.id != build.id" t-attf-href="/runbot/build/#{simbuild.id}">
                       <span
                         t-attf-class="badge text-bg-{{simbuild._get_color_class()}}"
-                        t-esc="simbuild.id"/>
+                        t-out="simbuild.id"/>
                     </a>
                   </t>
                   <br/>
                 </t>
                 <b>Host:</b>
-                <t t-esc="build.host"/>
+                <t t-out="build.host"/>
               </t>
               <div>
                 <b title="Execution time of this build, without child time">
                   Build time:
                 </b>
-                <t t-att-tile='build.build_time' t-esc="s2human(build.build_time)"/>
-                <i t-if='more'>(<t t-esc="build.build_time"/>s)</i>
+                <t t-att-tile='build.build_time' t-out="s2human(build.build_time)"/>
+                <i t-if='more'>(<t t-out="build.build_time"/>s)</i>
               </div>
               <div>
                 <b title='Time from creation to finish (queue time + completion time)'>
                   Wait time:
                 </b>
-                <t t-att-tile='build.wait_time' t-esc="s2human(build.wait_time)"/>
-                <i t-if='more'>(<t t-esc="build.wait_time"/>s)</i>
+                <t t-att-tile='build.wait_time' t-out="s2human(build.wait_time)"/>
+                <i t-if='more'>(<t t-out="build.wait_time"/>s)</i>
               </div>
               <div>
                 <b title='Total time '>
                   Load time:
                 </b>
-                <t t-att-tile='build.load_time' t-esc="s2human(build.load_time)"/>
-                <i t-if='more'>(<t t-esc="build.load_time"/>s)</i>
+                <t t-att-tile='build.load_time' t-out="s2human(build.load_time)"/>
+                <i t-if='more'>(<t t-out="build.load_time"/>s)</i>
               </div>
               <div>
                 <t t-if="build.stat_ids">
                   <b>Stats:</b>
-                    <a t-attf-href="/runbot/build/stats/{{build.id}}">Build <t t-esc="build.id"/></a>
+                    <a t-attf-href="/runbot/build/stats/{{build.id}}">Build <t t-out="build.id"/></a>
                   <br/>
                 </t>
               </div>
@@ -200,14 +200,14 @@
                   <td>
                     <a t-attf-href="/runbot/{{'batch/%s/' % from_batch.id if from_batch else ''}}build/{{child.id}}">
                       Build
-                      <t t-esc="child.id"/>
+                      <t t-out="child.id"/>
                     </a>
                     <t t-if="child.description">
                       <t t-out="child.md_description" />
                     </t>
                     <t t-else="">
                       with config
-                      <t t-esc="child.params_id.config_id.name"/>
+                      <t t-out="child.params_id.config_id.name"/>
                     </t>
                     <a groups="runbot.group_build_config_user" t-attf-href="/web#id={{child.params_id.config_id.id}}&amp;view_type=form&amp;model=runbot.build.config">...</a>
                     <t t-if="child.orphan_result">
@@ -215,15 +215,15 @@
                     </t>
                     <t t-if="child.job">
                       Running step:
-                      <t t-esc="child.job"/>
+                      <t t-out="child.job"/>
                     </t>
                     <t t-if="child.global_state in ['testing', 'waiting']">
                       <i class="fa fa-spinner fa-spin"/>
-                      <t t-esc="child.global_state"/>
+                      <t t-out="child.global_state"/>
                     </t>
                   </td>
                   <td>
-                    <span t-attf-class="badge text-bg-info" t-esc="s2human(child.build_time)"/>
+                    <span t-attf-class="badge text-bg-info" t-out="s2human(child.build_time)"/>
                   </td>
                   <td>
                     <t t-call="runbot.build_button">
@@ -252,13 +252,13 @@
                 <t t-set="logclass" t-value="dict(CRITICAL='danger', ERROR='danger', WARNING='warning', OK='success', SEPARATOR='separator').get(l.level)"/>
                 <tr t-att-class="'separator' if logclass == 'separator' else ''" t-att-title="l.active_step_id.description or ''">
                   <td style="white-space: nowrap; width:1%;">
-                    <t t-esc="l.create_date.strftime('%Y-%m-%d %H:%M:%S')"/>
+                    <t t-out="l.create_date.strftime('%Y-%m-%d %H:%M:%S')"/>
                   </td>
                   <td style="white-space: nowrap; width:1%;">
-                    <b t-if="l.level != 'SEPARATOR' and l.type not in ['link', 'markdown']" t-esc="l.level"/>
+                    <b t-if="l.level != 'SEPARATOR' and l.type not in ['link', 'markdown']" t-out="l.level"/>
                   </td>
                   <td style="white-space: nowrap; width:1%;">
-                    <t t-if="l.level != 'SEPARATOR' and l.type not in ['link', 'markdown']" t-esc="l.type"/>
+                    <t t-if="l.level != 'SEPARATOR' and l.type not in ['link', 'markdown']" t-out="l.type"/>
                   </td>
                   <t t-set="message_class" t-value="''"/>
                   <t t-if="subbuild" t-set="message_class">
@@ -271,7 +271,7 @@
                       <t t-if="l.type == 'subbuild'">
                         <a t-attf-href="/runbot/build/{{l.path}}">
                           Build #
-                          <t t-esc="l.path"/>
+                          <t t-out="l.path"/>
                         </a>
                       </t>
                       <t t-else="">
@@ -283,31 +283,31 @@
                           <t t-set="path" t-value="l.path.replace('/data/build/%s/' % repo_name, '')"/>
                           <t t-set="href" t-value="'https://%s/blob/%s/%s#L%s' % (repo_base_url, commit_hash, path, l.line)"/>
                         </t>
-                        <a t-att-href="href" t-attf-title="Func: {{l.func}}"><t t-esc="l.name"/>:<t t-esc="l.line"/></a>
+                        <a t-att-href="href" t-attf-title="Func: {{l.func}}"><t t-out="l.name"/>:<t t-out="l.line"/></a>
                       </t>
                     </t>
                     <!-- DEPRECATED: Will be removed once no ir.logging is concerned. -->
                     <span class="log_message" t-if="l.type == 'link' and len(l.message.split('$$')) == 3">
                       <t t-set="message" t-value="l.message.split('$$')"/>
                       <t t-if="message[1].startswith('fa-')">
-                        <t t-esc="message[0]"/>
+                        <t t-out="message[0]"/>
                         <a t-attf-href="{{l.path}}">
                           <i t-attf-class="fa {{message[1]}}"/>
                         </a>
-                        <t t-esc="message[2]"/>
+                        <t t-out="message[2]"/>
                       </t>
                       <t t-else="">
-                        <t t-esc="message[0]"/>
+                        <t t-out="message[0]"/>
                         <a t-attf-href="{{l.path}}">
-                          <t t-esc="message[1]"/>
+                          <t t-out="message[1]"/>
                         </a>
-                        <t t-esc="message[2]"/>
+                        <t t-out="message[2]"/>
                       </t>
                     </span>
                     <span class="log_message" t-elif="l.type == 'markdown'" t-out="l._markdown()"/>
                     <span class="log_message" t-else="">
-                      <t t-if="'\n' not in l.message" t-esc="l.message"/>
-                      <pre t-if="'\n' in l.message" style="margin:0;padding:0; border: none;"><t t-esc="l.message"/></pre>
+                      <t t-if="'\n' not in l.message" t-out="l.message"/>
+                      <pre t-if="'\n' in l.message" style="margin:0;padding:0; border: none;"><t t-out="l.message"/></pre>
                     </span>
                   </td>
                   <td t-attf-class="bg-{{message_class.strip() or logclass}}-subtle">
@@ -326,14 +326,14 @@
                   <tr>
                     <td/><td/><td/>
                     <td t-attf-class="bg-{{'info' if error.active else 'success'}}-subtle" colspan="2">
-                      This error is already <em t-attf-title="{{'Was detected by runbot in nightly builds.' if error.active else 'Either the error is not properly fixed or the branch does not contain the fix.'}}"><t t-esc="'known' if error.active else 'fixed'"/></em>.
+                      This error is already <em t-attf-title="{{'Was detected by runbot in nightly builds.' if error.active else 'Either the error is not properly fixed or the branch does not contain the fix.'}}"><t t-out="'known' if error.active else 'fixed'"/></em>.
                       <!--a groups="runbot.group_user" t-attf-href="/web#id={{error_content.id}}&amp;view_type=form&amp;model=runbot.build.error.content&amp;menu_id={{env['ir.model.data']._xmlid_to_res_id('runbot.runbot_menu_root')}}" title="View in Backend" target="new">
                         <i t-attf-class="fa fa-search"/>
                       </a-->
                       <a groups="runbot.group_user" t-attf-href="/web#id={{error.id}}&amp;view_type=form&amp;model=runbot.build.error&amp;menu_id={{env['ir.model.data']._xmlid_to_res_id('runbot.runbot_menu_root')}}" title="View in Backend" target="new">
                         <i t-attf-class="fa fa-list"/>
                       </a>
-                      <span groups="runbot.group_runbot_admin" t-if="error.responsible or error.responsible.id == uid">(<i t-esc="error.responsible.name"/>)</span>
+                      <span groups="runbot.group_runbot_admin" t-if="error.responsible or error.responsible.id == uid">(<i t-out="error.responsible.name"/>)</span>
                     </td>
                   </tr>
                 </t>
@@ -356,11 +356,11 @@
                 </t>
                 <tr t-attf-class="bg-{{rowclass.strip()}}-subtle{{' line-through' if build.orphan_result else ''}}">
                   <td>
-                      <t t-esc="build.create_date"/>
+                      <t t-out="build.create_date"/>
                   </td>
                   <td>
                     <a t-attf-href="/runbot/{{'batch/%s/' % from_batch.id if from_batch else ''}}build/{{build.id}}">
-                      <t t-esc="build.id"/>
+                      <t t-out="build.id"/>
                     </a>
                   </td>
                   <td>
@@ -371,17 +371,17 @@
                   <td>
                     <t t-if="build.global_state in ['testing', 'waiting']">
                       <i class="fa fa-spinner fa-spin"/>
-                      <t t-esc="build.global_state"/>
+                      <t t-out="build.global_state"/>
                     </t>
                   </td>
                   <td>
-                    <span t-esc="build.params_id.config_id.name"/>
+                    <span t-out="build.params_id.config_id.name"/>
                   </td>
                   <td>
-                    <span t-esc="build.params_id.version_id.name"/>
+                    <span t-out="build.params_id.version_id.name"/>
                   </td>
                   <td>
-                    <span t-esc="s2human(build.build_time)"/>
+                    <span t-out="s2human(build.build_time)"/>
                   </td>
                   <td>
                     <t t-call="runbot.build_button">
diff --git a/runbot/templates/build_error.xml b/runbot/templates/build_error.xml
index 070d075e..5d4b044b 100644
--- a/runbot/templates/build_error.xml
+++ b/runbot/templates/build_error.xml
@@ -18,27 +18,27 @@
           <div class="card">
             <div class="card-header">
               <div class="row">
-                <div class="col"><t t-esc="build_error.last_seen_date" t-options='{"widget": "datetime"}'/></div>
+                <div class="col"><t t-out="build_error.last_seen_date" t-options='{"widget": "datetime"}'/></div>
                 <div class="col col-md-8">
                   <button class="btn accordion-button collapsed" type="button" data-bs-toggle="collapse" t-attf-data-bs-target="#collapse{{build_error.id}}" aria-expanded="true" aria-controls="collapseOne">
-                    <code><t t-esc="build_error.name"/></code>
+                    <code><t t-out="build_error.name"/></code>
                   </button>
                 </div>
                 <div class="col">
                   <t t-foreach="build_error.trigger_ids" t-as="trigger">
-                    <span class="badge text-bg-pill text-bg-info small"><t t-esc="trigger.name"/></span>
+                    <span class="badge text-bg-pill text-bg-info small"><t t-out="trigger.name"/></span>
                   </t>
                 </div>
                 <div class="col">
-                  <t t-if="build_error.responsible" t-esc="build_error.responsible.name"/>
+                  <t t-if="build_error.responsible" t-out="build_error.responsible.name"/>
                   <a t-else="" t-attf-href="/runbot/errors/assign/{{build_error.id}}" data-runbot="action" role="button" class="btn btn-primary btn-sm">Assign to me</a>
                 </div>
                 <div class="col">
                   <a t-att-href="build_error.last_seen_build_id.build_url" t-attf-title="View last affected build ({{build_error.last_seen_build_id.id}})"><i class="fa fa-external-link"/></a>
                   <a groups="base.group_user" t-attf-href="/web/#id={{build_error.id}}&amp;view_type=form&amp;model=runbot.build.error&amp;menu_id={{env['ir.model.data']._xmlid_to_res_id('runbot.runbot_menu_root')}}" target="new" title="View in Backend">
-                    <span class="badge text-bg-info" t-esc="build_error.build_count" t-attf-title="This error was seen {{build_error.build_count}} View in backend"/>
+                    <span class="badge text-bg-info" t-out="build_error.build_count" t-attf-title="This error was seen {{build_error.build_count}} View in backend"/>
                   </a>
-                  <span groups="!base.group_user" class="badge text-bg-info" t-esc="build_error.build_count" t-attf-title="This error was seen {{build_error.build_count}}"/>
+                  <span groups="!base.group_user" class="badge text-bg-info" t-out="build_error.build_count" t-attf-title="This error was seen {{build_error.build_count}}"/>
                   <span class="fa fa-random" t-if="build_error.random"/>
                 </div>
               </div>
@@ -46,7 +46,7 @@
 
             <div t-attf-id="collapse{{build_error.id}}" class="collapse" aria-labelledby="headingOne" t-attf-data-parent="#accordion_{{accordion_id}}">
               <div class="card-body">
-                <pre class="pre-scrollable bg-danger-subtle"><t t-esc="build_error.content.strip()" /></pre>
+                <pre class="pre-scrollable bg-danger-subtle"><t t-out="build_error.content.strip()" /></pre>
               </div>
             </div>
           </div>
@@ -79,11 +79,11 @@
                     <span class="ms-auto">
                       <span class="dropdown me-auto">
                       <a role="button" href="#" class="dropdown-toggle btn btn-secondary" data-bs-toggle="dropdown">
-                        Sort By: <t t-esc="request.params.get('sort', '')"/>
+                        Sort By: <t t-out="request.params.get('sort', '')"/>
                       </a>
                       <div class="dropdown-menu" aria-labelledby="sortMenuButton" role="menu">
                         <t t-foreach="sort_order_choices" t-as="sort_choice">
-                          <a role="menuitem" class="dropdown-item" t-attf-href="/runbot/errors?sort={{sort_choice}}"><t t-esc="sort_order_choices[sort_choice]"/></a>
+                          <a role="menuitem" class="dropdown-item" t-attf-href="/runbot/errors?sort={{sort_choice}}"><t t-out="sort_order_choices[sort_choice]"/></a>
                         </t>
                       </div>
                     </span>
@@ -110,7 +110,7 @@
           <div class="row">
             <div t-if="team" class='col-md-12'>
               <div class="col-lg-12 text-center mb16">
-                <h2>Team <t t-esc="team.name.capitalize()"/>
+                <h2>Team <t t-out="team.name.capitalize()"/>
                   <a groups="base.group_user" t-attf-href="/web/#id={{team.id}}&amp;view_type=form&amp;model=runbot.team&amp;menu_id={{env['ir.model.data']._xmlid_to_res_id('runbot.runbot_menu_root')}}" target="new" title="View in Backend">
                     <i class="fa fa-list"/>
                   </a>
@@ -140,7 +140,7 @@
               <div class="row">
                 <div class="list-group list-group-horizontal">
                   <t t-foreach="teams" t-as="team">
-                    <a t-attf-href="/runbot/teams/{{ team.id }}" class="list-group-item list-group-item-action"><t t-esc="team.name"/></a>
+                    <a t-attf-href="/runbot/teams/{{ team.id }}" class="list-group-item list-group-item-action"><t t-out="team.name"/></a>
                   </t>
                 </div>
               </div>
diff --git a/runbot/templates/build_stats.xml b/runbot/templates/build_stats.xml
index d771ed74..5c0d815d 100644
--- a/runbot/templates/build_stats.xml
+++ b/runbot/templates/build_stats.xml
@@ -8,22 +8,22 @@
             <div class="row g-0">
               <div class="col-md-4">
                 <div class="bg-success-subtle">
-                  <b>Build: </b><a t-attf-href="/runbot/build/{{build.id}}"><t t-esc="build.id"/></a><br/>
+                  <b>Build: </b><a t-attf-href="/runbot/build/{{build.id}}"><t t-out="build.id"/></a><br/>
                   <t t-if="build.description">
                     <b>Description:</b>
                     <t t-out="build.md_description"/>
                     <br/>
                   </t>
-                  <b>Date: </b><t t-esc="build.create_date" /><br/>
-                  <b>Config: </b><t t-esc="build.params_id.config_id.name" /><br/>
+                  <b>Date: </b><t t-out="build.create_date" /><br/>
+                  <b>Config: </b><t t-out="build.params_id.config_id.name" /><br/>
                   <b>Bundle(s): </b>
                   <t t-foreach="bundles" t-as="bundle">
-                    <a t-attf-href="/runbot/bundle/{{bundle.id}}"><t t-esc="bundle.name" /></a>
+                    <a t-attf-href="/runbot/bundle/{{bundle.id}}"><t t-out="bundle.name" /></a>
                   </t><br/>
                   <t t-foreach="build.params_id.sudo().commit_link_ids" t-as="build_commit">
                     <b>Commit:</b>
                     <a t-attf-href="/runbot/commit/{{build_commit.commit_id.id}}">
-                      <t t-esc="build_commit.commit_id.dname"/>
+                      <t t-out="build_commit.commit_id.dname"/>
                     </a>
                     <a t-att-href="'https://%s/commit/%s' % (build_commit.branch_id.remote_id.base_url, build_commit.commit_id.name)" class="btn btn-sm text-start" title="View Commit on Github"><i class="fa fa-github"/></a>
                     <t t-if="build_commit.match_type in ('default', 'pr_target', 'prefix') ">
@@ -32,27 +32,27 @@
                     </t>
                     <div t-else="" class="ms-3">
                       <b>Subject:</b>
-                      <t t-esc="build_commit.commit_id.subject"/>
+                      <t t-out="build_commit.commit_id.subject"/>
                       <br/>
                       <b>Author:</b>
-                      <t t-esc="build_commit.commit_id.author"/>
+                      <t t-out="build_commit.commit_id.author"/>
                       <br/>
                       <b>Committer:</b>
-                      <t t-esc="build_commit.commit_id.committer"/>
+                      <t t-out="build_commit.commit_id.committer"/>
                       <br/>
                     </div>
                   </t>
                   <b>Version:</b>
-                  <t t-esc="build.params_id.version_id.name"/>
+                  <t t-out="build.params_id.version_id.name"/>
                   <br/>
                 </div>
               </div>
               <div t-foreach="sorted(build_stats.keys())" t-as="category" class="col-md-4">
-                <h3><t t-esc="category.title().replace('_', ' ')"/></h3>
+                <h3><t t-out="category.title().replace('_', ' ')"/></h3>
                 <table class="table table-condensed table-responsive table-stripped">
                   <tr t-foreach="build_stats[category].keys()" t-as="module">
-                    <td><t t-esc="module"/></td>
-                    <td><t t-esc="build_stats[category][module]"/></td>
+                    <td><t t-out="module"/></td>
+                    <td><t t-out="build_stats[category][module]"/></td>
                   </tr>
                 </table>
               </div>
@@ -69,11 +69,11 @@
         <div class="container-fluid">
           <nav class="navbar navbar-light">
             <div class="container">
-              <b>Bundle:</b><t t-esc="bundle.name"/>
-              <b>Trigger:</b><t t-esc="trigger.name"/>
+              <b>Bundle:</b><t t-out="bundle.name"/>
+              <b>Trigger:</b><t t-out="trigger.name"/>
               <b>Stat Category:</b>
               <select id="key_category_selector" class="form-select" aria-label="Stat Category">
-                <option t-foreach="stats_categories" t-as="category" t-attf-value="{{category}}"><t t-esc="category.replace('_',' ').title()"/></option>
+                <option t-foreach="stats_categories" t-as="category" t-attf-value="{{category}}"><t t-out="category.replace('_',' ').title()"/></option>
               </select>
               <b>Nb of builds:</b>
               <select id="limit_selector" class="form-select" aria-label="Number Of Builds">
diff --git a/runbot/templates/bundle.xml b/runbot/templates/bundle.xml
index 21b10ed6..f403cd74 100644
--- a/runbot/templates/bundle.xml
+++ b/runbot/templates/bundle.xml
@@ -8,7 +8,7 @@
                         <div class='col-md-12'>
                             <div class="navbar navbar-default">
                                 <span class="text-center" style="font-size: 18px;">
-                                    <t t-esc="bundle.name"/>
+                                    <t t-out="bundle.name"/>
                                     <i t-if="bundle.sticky" class="fa fa-star" style="color: #f0ad4e" />
                                     <div class="btn-group" role="group">
                                         <a groups="runbot.group_runbot_advanced_user" t-attf-href="/web/#id={{bundle.id}}&amp;view_type=form&amp;model=runbot.bundle&amp;menu_id={{env['ir.model.data']._xmlid_to_res_id('runbot.runbot_menu_root')}}" class="btn btn-default" target="new" title="View in Backend">
@@ -55,7 +55,7 @@
                                     <tr>
                                         <td>Version</td>
                                         <td>
-                                            <t t-esc="bundle.version_id.name"/>
+                                            <t t-out="bundle.version_id.name"/>
                                         </td>
                                     </tr>
                                     <tr>
@@ -68,8 +68,8 @@
                                                             <div class="btn-group btn-group-ssm" role="group">
                                                                 <a t-att-href="branch.branch_url" class="btn btn-default text-left" title="View Branch on Github"><i class="fa fa-github"/></a>
                                                                 <a groups="runbot.group_runbot_admin" class="btn btn-default fa fa-list text-left" t-attf-href="/web/#id={{branch.id}}&amp;view_type=form&amp;model=runbot.branch" target="new" title="View Branch in Backend"/>
-                                                                <a href="#" t-esc="branch.remote_id.short_name" class="btn btn-default disabled text-left"/>
-                                                                <a t-attf-href="/runbot/branch/{{branch.id}}" class="btn btn-default text-left" title="View Branch Details"><span t-att-class="'' if branch.alive else 'line-through'" t-esc="branch.name"/> <i t-if="not branch.alive" title="deleted/closed" class="fa fa-ban text-danger"/></a>
+                                                                <a href="#" t-out="branch.remote_id.short_name" class="btn btn-default disabled text-left"/>
+                                                                <a t-attf-href="/runbot/branch/{{branch.id}}" class="btn btn-default text-left" title="View Branch Details"><span t-att-class="'' if branch.alive else 'line-through'" t-out="branch.name"/> <i t-if="not branch.alive" title="deleted/closed" class="fa fa-ban text-danger"/></a>
                                                                 <t t-if="not any (b.is_pr and b.alive for b in group[1]) and not branch.is_pr">
                                                                     <a t-attf-href="https://{{group[0].main_remote_id.base_url}}/compare/{{bundle.version_id.name}}...{{branch.remote_id.owner}}:{{branch.name}}?expand=1" class="btn btn-default text-left" title="Create pr"><i class="fa fa-code-fork"/> Create pr</a>
                                                                 </t>
@@ -83,7 +83,7 @@
 
                                     <tr t-if="more">
                                         <td>Project</td>
-                                        <td t-esc="bundle.project_id.name"/>
+                                        <td t-out="bundle.project_id.name"/>
                                     </tr>
                                     <tr t-if="more">
                                         <td>New build enabled</td>
@@ -93,11 +93,11 @@
                                     </tr>
                                     <tr t-if="more">
                                         <td>Modules</td>
-                                        <td t-esc="bundle.modules or '/'"/>
+                                        <td t-out="bundle.modules or '/'"/>
                                     </tr>
                                 </table>
                             </div>
-                            <div t-foreach="bundle._consistency_warning()" t-as="warning" t-esc="warning[1]" t-attf-class="alert alert-{{warning[0]}}"/>
+                            <div t-foreach="bundle._consistency_warning()" t-as="warning" t-out="warning[1]" t-attf-class="alert alert-{{warning[0]}}"/>
                             <div class="batch_row" t-foreach="batchs" t-as="batch">
                                 <t t-call="runbot.batch_tile"/>
                             </div>
diff --git a/runbot/templates/commit.xml b/runbot/templates/commit.xml
index d4e3f17a..aee17902 100644
--- a/runbot/templates/commit.xml
+++ b/runbot/templates/commit.xml
@@ -6,17 +6,17 @@
       <td t-if="state=='pending'">
         <i class="fa fa-circle text-warning"/>
         &amp;nbsp;
-        <t t-esc="state"/>
+        <t t-out="state"/>
       </td>
       <td t-if="state=='success'">
         <i class="fa fa-check text-success"/>
         &amp;nbsp;
-        <t t-esc="state"/>
+        <t t-out="state"/>
       </td>
       <td t-if="state in ('failure', 'error')">
         <i class="fa fa-times text-danger"/>
         &amp;nbsp;
-        <t t-esc="state"/>
+        <t t-out="state"/>
       </td>
     </template>
 
@@ -29,7 +29,7 @@
               <tr>
                 <td>Name</td>
                 <td>
-                  <t t-esc="commit.name"/>
+                  <t t-out="commit.name"/>
                   <div class="btn-group" role="group">
                     <a t-att-href="'' if not reflogs else 'https://%s/commit/%s' % (reflogs[0].branch_id.remote_id.base_url, commit.name)" class="btn btn-sm text-start" title="View Commit on Github"><i class="fa fa-github"/></a>
                     <a groups="runbot.group_runbot_admin" class="btn btn-sm fa fa-list text-start" t-attf-href="/web/#id={{commit.id}}&amp;view_type=form&amp;model=runbot.commit" target="new" title="View Commit in Backend"/>
@@ -39,33 +39,33 @@
               <tr>
                 <td>Tree hash</td>
                 <td>
-                  <t t-esc="commit.tree_hash"/>
+                  <t t-out="commit.tree_hash"/>
                 </td>
               </tr>
               <tr>
                 <td>Repo</td>
-                <td t-esc="commit.repo_id.name"/>
+                <td t-out="commit.repo_id.name"/>
               </tr>
               <tr>
                 <td>Subject</td>
-                <td t-esc="commit.subject"/>
+                <td t-out="commit.subject"/>
               </tr>
               <tr>
                 <td>Date</td>
-                <td t-esc="commit.date"/>
+                <td t-out="commit.date"/>
               </tr>
               <tr>
                 <td>Author</td>
                 <td>
-                  <t t-esc="commit.author"/>
-                  <small t-esc="commit.author_email"/>
+                  <t t-out="commit.author"/>
+                  <small t-out="commit.author_email"/>
                 </td>
               </tr>
               <tr t-if="commit.author != commit.committer">
                 <td>Commiter</td>
                 <td>
-                  <t t-esc="commit.committer"/>
-                  <small t-esc="commit.committer_email"/>
+                  <t t-out="commit.committer"/>
+                  <small t-out="commit.committer_email"/>
                 </td>
               </tr>
             </table>
@@ -76,15 +76,15 @@
             <table class="table table-sm table-borderless">
               <tr t-foreach='last_status_by_context' t-as='context'>
                 <t t-set="status" t-value="last_status_by_context[context]"/>
-                <td t-esc="status.sent_date and status.sent_date.strftime('%Y-%m-%d %H:%M:%S') or '—'"/>
-                <td t-esc="context"/>
+                <td t-out="status.sent_date and status.sent_date.strftime('%Y-%m-%d %H:%M:%S') or '—'"/>
+                <td t-out="context"/>
                 <t t-call="runbot.commit_status_state_td">
                   <t t-set="state" t-value="status.state"/>
                 </t>
                 <td>
                   <a t-att-href="status.target_url">
                     build
-                    <t t-if="status.target_url" t-esc="status.target_url.split('/')[-1]" />
+                    <t t-if="status.target_url" t-out="status.target_url.split('/')[-1]" />
                   </a>
                 </td>
                 <td groups="base.group_user">
@@ -101,9 +101,9 @@
             <h3>Branch presence history</h3>
             <table class="table table-stripped">
               <tr t-foreach='reflogs' t-as='reflog'>
-                <td t-esc="reflog.date"/>
-                <td t-esc="reflog.branch_id.remote_id.short_name"/>
-                <td><a t-attf-href="/runbot/branch/{{reflog.branch_id.id}}" t-esc="reflog.branch_id.name" title="View Branch Details"/></td>
+                <td t-out="reflog.date"/>
+                <td t-out="reflog.branch_id.remote_id.short_name"/>
+                <td><a t-attf-href="/runbot/branch/{{reflog.branch_id.id}}" t-out="reflog.branch_id.name" title="View Branch Details"/></td>
               </tr>
             </table>
           </div>
@@ -111,15 +111,15 @@
             <h3>Status history</h3>
             <table class="table table-stripped">
               <tr t-foreach='status_list' t-as='status'>
-                <td t-esc="status.sent_date and status.sent_date.strftime('%Y-%m-%d %H:%M:%S') or '—'"/>
-                <td t-esc="status.context"/>
+                <td t-out="status.sent_date and status.sent_date.strftime('%Y-%m-%d %H:%M:%S') or '—'"/>
+                <td t-out="status.context"/>
                 <t t-call="runbot.commit_status_state_td">
                   <t t-set="state" t-value="status.state"/>
                 </t>
                 <td>
                   <a t-attf-href="/runbot/build/{{status.build_id.id}}">
                     build
-                    <t t-esc="status.build_id.id" />
+                    <t t-out="status.build_id.id" />
                   </a>
                 </td>
               </tr>
@@ -129,4 +129,4 @@
       </t>
     </template>
   </data>
-</odoo>
\ No newline at end of file
+</odoo>
diff --git a/runbot/templates/dashboard.xml b/runbot/templates/dashboard.xml
index e6721e88..cd29412b 100644
--- a/runbot/templates/dashboard.xml
+++ b/runbot/templates/dashboard.xml
@@ -14,20 +14,20 @@
               <div>
                 <span t-attf-class="badge text-bg-{{pending_level}}">
                   Pending:
-                  <t t-esc="pending_count"/><span title="Assigned build (reserved host)" t-if="pending_assigned_count">(<t t-esc="pending_assigned_count"/>)</span>
+                  <t t-out="pending_count"/><span title="Assigned build (reserved host)" t-if="pending_assigned_count">(<t t-out="pending_assigned_count"/>)</span>
                 </span>
               </div>
               <t t-set="project_id"/>
               <t t-set="nb_project" t-value="len(bundles.mapped('project_id'))"/>
               <t t-foreach="bundles.sorted(lambda b: (-b.project_id.id, b.version_id.number), reverse=True)" t-as="bundle">
-                <h3 t-if="nb_project > 1 and project_id != bundle.project_id.id" t-esc="bundle.project_id.name"/>
+                <h3 t-if="nb_project > 1 and project_id != bundle.project_id.id" t-out="bundle.project_id.name"/>
                 <t t-set="project_id" t-value="bundle.project_id.id"/>
                 <h4>
-                  <t t-esc="bundle.name"/>
+                  <t t-out="bundle.name"/>
                 </h4>
                 <t t-foreach="bundle.last_done_batch.slot_ids" t-as="slot">
                   <span t-attf-class="badge text-bg-{{slot.build_id._get_color_class()}}">
-                    <t t-esc="slot.trigger_id.name"/>
+                    <t t-out="slot.trigger_id.name"/>
                   </span>
                 </t>
               </t>
@@ -74,7 +74,7 @@
               </div>
               <t t-foreach="hosts_data.sorted(key=lambda h:h.name)" t-as="host">
                 <div>
-                  <span t-esc="host.name.split('.')[0]"/>
+                  <span t-out="host.name.split('.')[0]"/>
                   <t t-if="host.nb_testing == 0">
                     <t t-set="klass">success</t>
                   </t>
@@ -88,11 +88,11 @@
                     <t t-set="klass">danger</t>
                   </t>
                   <span t-attf-class="badge text-bg-{{klass}}">
-                    <span t-esc="host.nb_testing"/>
+                    <span t-out="host.nb_testing"/>
                     /
-                    <span t-esc="host.nb_worker"/>
+                    <span t-out="host.nb_worker"/>
                   </span>
-                  <t t-esc="host.nb_running"/>
+                  <t t-out="host.nb_running"/>
                   <t t-set="succes_time" t-value="int(datetime.datetime.now().timestamp() - host.last_success.timestamp())"/>
                   <t t-set="start_time" t-value="int(datetime.datetime.now().timestamp() - host.last_start_loop.timestamp())"/>
                   <t t-set="end_time" t-value="int(datetime.datetime.now().timestamp() - host.last_end_loop.timestamp())"/>
@@ -106,7 +106,7 @@
                   </t>
 
                   <span t-attf-class="badge text-bg-{{klass}}">
-                    <span t-esc="succes_time"/>
+                    <span t-out="succes_time"/>
                   </span>
 
                   <t t-set="klass">success</t>
@@ -118,7 +118,7 @@
                   </t>
 
                   <span t-attf-class="badge text-bg-{{klass}}">
-                    <span t-esc="start_time"/>
+                    <span t-out="start_time"/>
                   </span>
 
                   <t t-set="klass">success</t>
@@ -130,7 +130,7 @@
                   </t>
 
                   <span t-attf-class="badge text-bg-{{klass}}">
-                    <span t-esc="end_time"/>
+                    <span t-out="end_time"/>
                   </span>
 
                   <t t-set="cron_time" t-value="end_time-start_time"/>
@@ -142,7 +142,7 @@
                     <t t-set="klass">danger</t>
                   </t>
                   <span t-attf-class="badge text-bg-{{klass}}">
-                    <span t-esc="cron_time"/>
+                    <span t-out="cron_time"/>
                   </span>
 
                 </div>
@@ -151,7 +151,7 @@
               <table>
                 <tr t-foreach="bundles.sorted(lambda b: b.version_id.number, reverse=True)" t-as="bundle">
                   <td>
-                    <t t-esc="bundle.version_id.number"/>
+                    <t t-out="bundle.version_id.number"/>
                   </td>
                   <td>
                     <t t-set='batch' t-value="bundle.with_context({'category_id': category.id}).last_done_batch"/>
@@ -159,7 +159,7 @@
                       <t t-foreach="batch.slot_ids" t-as='slot'>
                         <tr>
                           <td>
-                            <t t-esc="slot.trigger_id.name[:4]"/>
+                            <t t-out="slot.trigger_id.name[:4]"/>
                           </td>
                           <t t-set="build" t-value="slot.build_id"/>
                           <td>
@@ -169,7 +169,7 @@
                           </td>
                           <td t-foreach="build.children_ids" t-as="child">
                             <span t-attf-class="badge text-bg-{{slot.build_id._get_color_class()}}">
-                              <t t-esc="child.params_id.config_id.name[:4]"/>
+                              <t t-out="child.params_id.config_id.name[:4]"/>
                             </span>
                           </td>
                         </tr>
@@ -188,16 +188,16 @@
       <div class="col-md-3 col-lg-2 p-2">
         <div class="card">
           <div class="card-header limited-height-toggle" t-attf-onclick="$('#tile_{{tile.id}}').toggleClass('limited-height')">
-            <t t-esc="tile.display_name"/> <t t-if="tile.build_ids"> (<t t-esc="len(tile.build_ids)"/>)</t>
+            <t t-out="tile.display_name"/> <t t-if="tile.build_ids"> (<t t-out="len(tile.build_ids)"/>)</t>
           </div>
           <div class="card-body limited-height" t-attf-id="tile_{{tile.id}}">
             <p t-if="not tile.build_ids" class="text-success my-0">No build found 👍</p>
             <t t-foreach="tile.sticky_bundle_ids.sorted(lambda b: b.version_id.number, reverse=True)" t-as="bundle">
               <t t-set="failed_builds" t-value="tile.build_ids.filtered(lambda b: b.top_parent.slot_ids.batch_id.bundle_id == bundle)"/>
-              <h4 class="card-title" t-if="failed_builds" t-esc="bundle.name"/>
+              <h4 class="card-title" t-if="failed_builds" t-out="bundle.name"/>
               <p t-foreach="failed_builds" t-as="build" class="my-0">
                   <a class="text-danger" t-attf-href="/runbot/build/{{build.id}}" target="new">
-                    <t t-esc="build.description or build.id"/>
+                    <t t-out="build.description or build.id"/>
                   </a>
               </p>
             </t>
@@ -243,7 +243,7 @@
               <div class="one_line">
                 <i t-if="bundle.sticky" class="fa fa-star" style="color: #f0ad4e" />
                 <a t-attf-href="/runbot/bundle/#{bundle.id}" title="View Bundle">
-                  <b t-esc="bundle.name"/>
+                  <b t-out="bundle.name"/>
                 </a>
               </div>
               <div class="badge text-bg-info" t-out="len(builds)"/>
diff --git a/runbot/templates/frontend.xml b/runbot/templates/frontend.xml
index 553bd44a..e66d51c8 100644
--- a/runbot/templates/frontend.xml
+++ b/runbot/templates/frontend.xml
@@ -26,7 +26,7 @@
             </div>
             <div class='col-md-12'>
               <div t-if="message" class="alert alert-warning" role="alert">
-                <t t-esc="message" />
+                <t t-out="message" />
               </div>
               <div t-if="not project" class="mb32">
                 <h3>No project</h3>
@@ -37,7 +37,7 @@
                     <div class="one_line">
                       <i t-if="bundle.sticky" class="fa fa-star" style="color: #f0ad4e" />
                       <a t-attf-href="/runbot/bundle/#{bundle.id}" t-attf-title="View Bundle #{bundle.name}">
-                        <b t-esc="bundle.name"/>
+                        <b t-out="bundle.name"/>
                       </a>
                     </div>
                     <div class="btn-toolbar" role="toolbar" aria-label="Toolbar with button groups">
@@ -62,7 +62,7 @@
                       </div>
                     </div>
                     <div t-if="bundle.host_id">
-                      <span class="badge text-bg-info" t-esc="bundle.host_id.name"></span>
+                      <span class="badge text-bg-info" t-out="bundle.host_id.name"></span>
                     </div>
                   </div>
                   <div class="col-md-9 col-lg-10">
@@ -91,7 +91,7 @@
           <a t-attf-href="/runbot/batch/#{batch.id}" title="View Batch">
             <div class="batch_header">
               <span t-attf-class="badge text-bg-{{'warning' if batch.has_warning else 'default'}}">
-                <t t-esc="batch._get_formated_age()"/>
+                <t t-out="batch._get_formated_age()"/>
                 <i class="fa fa-exclamation-triangle" t-if="batch.has_warning"/>
               </span>
               <span class="float-end header_hover">View batch...</span>
@@ -118,10 +118,10 @@
                 <i class="fa fa-fw fa-link" t-if="commit_link.match_type == 'head'" title="This commit is an existing head from bundle branches"/>
                 <i class="fa fa-fw fa-code-fork" t-if="commit_link.match_type == 'base_match'" title="This commit is matched from a base batch with matching merge_base"/>
                 <i class="fa fa-fw fa-clock-o" t-if="commit_link.match_type == 'base_head'" title="This commit is the head of a base branch"/>
-                <t t-esc="commit_link.commit_id.dname"/>
+                <t t-out="commit_link.commit_id.dname"/>
               </a>
               <a t-att-href="'https://%s/commit/%s' % (commit_link.branch_id.remote_id.base_url, commit_link.commit_id.name)" t-attf-class="badge text-bg-{{match_class}}" title="View Commit on Github"><i class="fa fa-github"/></a>
-              <span t-esc="commit_link.commit_id.subject"/>
+              <span t-out="commit_link.commit_id.subject"/>
             </div>
           </div>
         </div>
diff --git a/runbot/templates/git.xml b/runbot/templates/git.xml
index 54984370..f69633e9 100644
--- a/runbot/templates/git.xml
+++ b/runbot/templates/git.xml
@@ -6,10 +6,10 @@
 	filemode = true
 	bare = true
 <t t-foreach="repo.remote_ids" t-as="remote_id">
-[remote "<t t-esc="remote_id.remote_name"/>"]
-	url = <t t-esc="remote_id.name"/>
-<t t-if = "remote_id.fetch_heads">	fetch = +refs/heads/*:refs/<t t-esc='remote_id.remote_name'/>/heads/*</t>
-<t t-if = "remote_id.fetch_pull">	fetch = +refs/pull/*/head:refs/<t t-esc='remote_id.remote_name'/>/pull/*</t>
+[remote "<t t-out="remote_id.remote_name"/>"]
+	url = <t t-out="remote_id.name"/>
+<t t-if = "remote_id.fetch_heads">	fetch = +refs/heads/*:refs/<t t-out='remote_id.remote_name'/>/heads/*</t>
+<t t-if = "remote_id.fetch_pull">	fetch = +refs/pull/*/head:refs/<t t-out='remote_id.remote_name'/>/pull/*</t>
 </t></template>
     </data>
 </odoo>
diff --git a/runbot/templates/nginx.xml b/runbot/templates/nginx.xml
index 13fc2211..6c7da41d 100644
--- a/runbot/templates/nginx.xml
+++ b/runbot/templates/nginx.xml
@@ -2,8 +2,8 @@
 <odoo>
     <data>
       <template id="runbot.nginx_config">
-pid <t t-esc="nginx_dir"/>/nginx.pid;
-error_log <t t-esc="nginx_dir"/>/error.log;
+pid <t t-out="nginx_dir"/>/nginx.pid;
+error_log <t t-out="nginx_dir"/>/error.log;
 worker_processes  1;
 events { worker_connections  1024; }
 http {
@@ -16,10 +16,10 @@ index index.html;
 log_format full '$remote_addr - $remote_user [$time_local] '
                 '"$request" $status $body_bytes_sent '
                 '"$http_referer" "$http_user_agent" $request_time';
-access_log <t t-esc="nginx_dir"/>/access.log full;
-error_log <t t-esc="nginx_dir"/>/error.log;
-client_body_temp_path <t t-esc="nginx_dir"/>;
-fastcgi_temp_path <t t-esc="nginx_dir"/>;
+access_log <t t-out="nginx_dir"/>/access.log full;
+error_log <t t-out="nginx_dir"/>/error.log;
+client_body_temp_path <t t-out="nginx_dir"/>;
+fastcgi_temp_path <t t-out="nginx_dir"/>;
 
 autoindex on;
 
@@ -33,7 +33,7 @@ map $http_x_forwarded_proto $real_scheme {
   ''      $scheme;
 }
 
-proxy_temp_path <t t-esc="nginx_dir"/>;
+proxy_temp_path <t t-out="nginx_dir"/>;
 proxy_read_timeout 600;
 proxy_connect_timeout 600;
 proxy_set_header X-Forwarded-Host $host;
@@ -45,20 +45,20 @@ proxy_set_header X-Real-IP 127.0.0.42;
 server {
     listen 8080 default;
     location /runbot/static/ {
-      alias <t t-esc="runbot_static"/>;
+      alias <t t-out="runbot_static"/>;
       autoindex off;
       return 404;
       location /runbot/static/src { }
       location ~ /runbot/static/build/[^/]+/(logs|tests|coverage)/ {
           autoindex on;
-          add_header 'Access-Control-Allow-Origin' '<t t-esc="base_url"/>';
+          add_header 'Access-Control-Allow-Origin' '<t t-out="base_url"/>';
       }
     }
 }
 
 server {
   listen 8080;
-  server_name ~^dockerhub\.<t t-esc="re_escape(host_name)"/>$;
+  server_name ~^dockerhub\.<t t-out="re_escape(host_name)"/>$;
 
 	location /v2/ {
 		limit_except GET HEAD OPTIONS {
@@ -79,22 +79,22 @@ server {
 <t id="server_build_anchor"/>
 server {
   listen 8080;
-  server_name ~^<t t-out="re_escape(build.dest)"/>(-[a-z0-9_-]+)?-<t t-esc="build._get_run_token()[0]"/>(-[a-z0-9_]+)\.<t t-esc="re_escape(build.host)"/>$;
+  server_name ~^<t t-out="re_escape(build.dest)"/>(-[a-z0-9_-]+)?-<t t-out="build._get_run_token()[0]"/>(-[a-z0-9_]+)\.<t t-out="re_escape(build.host)"/>$;
   <t id="build_anchor_authenticated"/>
   location / {
     <t id="build_anchor_authenticated_side_effect"/>
-    return 307 http://<t t-out="build.dest"/>$1.<t t-esc="build.host"/>;
+    return 307 http://<t t-out="build.dest"/>$1.<t t-out="build.host"/>;
   }
 }
 
 server {
     listen 8080;
-    server_name ~^<t t-out="re_escape(build.dest)"/>(-[a-z0-9_-]+)?\.<t t-esc="re_escape(build.host)"/>$;
+    server_name ~^<t t-out="re_escape(build.dest)"/>(-[a-z0-9_-]+)?\.<t t-out="re_escape(build.host)"/>$;
     <t id="build_anchor"/>
-    location / { proxy_pass http://127.0.0.1:<t t-esc="build.port"/>; }
-    location /longpolling { proxy_pass http://127.0.0.1:<t t-esc="build.port + 1"/>; }
+    location / { proxy_pass http://127.0.0.1:<t t-out="build.port"/>; }
+    location /longpolling { proxy_pass http://127.0.0.1:<t t-out="build.port + 1"/>; }
     location /websocket {
-      proxy_pass http://127.0.0.1:<t t-esc="build.port + 1"/>;
+      proxy_pass http://127.0.0.1:<t t-out="build.port + 1"/>;
       proxy_set_header X-Forwarded-Host $host;
       proxy_set_header X-Forwarded-Proto $real_scheme;
       proxy_set_header Host $host;
diff --git a/runbot/templates/utils.xml b/runbot/templates/utils.xml
index ad48381c..debf37cf 100644
--- a/runbot/templates/utils.xml
+++ b/runbot/templates/utils.xml
@@ -5,7 +5,7 @@
         <template id="runbot.base_page">
             <html t-att-data-bs-theme="theme">
                 <head>
-                    <title t-esc="title or 'Runbot'"/>
+                    <title t-out="title or 'Runbot'"/>
                     <link rel="stylesheet" type="text/css" href="/runbot/static/src/libs/bootstrap/css/bootstrap.css"/>
                     <link rel="stylesheet" type="text/css" href="/runbot/static/src/libs/fontawesome/css/font-awesome.css"/>
                     <link rel="stylesheet" type="text/css" href="/runbot/static/src/css/runbot.css"/>
@@ -53,7 +53,7 @@
                         <nav class="navbar navbar-expand-md bg-body-tertiary">
                             <a t-if="project" t-att-href="qu(search=search)">
                                 <b class="active_project">
-                                    <t t-esc="project.name"/>
+                                    <t t-out="project.name"/>
                                 </b>
                             </a>
                             <button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target="#top_menu_collapse">
@@ -65,7 +65,7 @@
                                         <t t-foreach="projects" t-as="l_project">
                                             <li class="nav-item">
                                                 <a class="nav-link" t-att-href="qu('/runbot/%s' % slug(l_project), search=search)">
-                                                    <t t-esc="l_project.name"/>
+                                                    <t t-out="l_project.name"/>
                                                 </a>
                                             </li>
                                         </t>
@@ -82,7 +82,7 @@
                                         <li class="nav-item dropdown" t-ignore="true">
                                             <a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown">
                                                 <b>
-                                                    <span t-esc="user_id.name[:23] + '...' if user_id.name and len(user_id.name) &gt; 25 else user_id.name"/>
+                                                    <span t-out="user_id.name[:23] + '...' if user_id.name and len(user_id.name) &gt; 25 else user_id.name"/>
                                                 </b>
                                             </a>
                                             <div class="dropdown-menu dropdown-menu-end js_usermenu" role="menu">
@@ -91,7 +91,7 @@
                                                 <div t-if="user_id.runbot_team_ids" class="dropdown-divider"/>
                                                 <div t-if="user_id.runbot_team_ids" class="dropdown-header">Teams</div>
                                                 <a t-foreach="user_id.runbot_team_ids" t-as="team" class="dropdown-item" role="menuitem" t-attf-href="/runbot/teams/{{team.id}}">
-                                                    <t t-esc="team.name.capitalize()"/>
+                                                    <t t-out="team.name.capitalize()"/>
                                                 </a>
                                             </div>
                                         </li>
@@ -136,7 +136,7 @@
 
                             <div class="text-nowrap btn-group btn-group-sm" role="group">
                                 <t t-foreach="categories" t-as="category">
-                                    <button t-attf-onclick="document.cookie = 'category={{category.id}}; expires=Thu, 1 Dec 2942 12:00:00 UTC; path=/'; location.reload();" type="button" t-attf-class="btn btn-{{'primary' if category.id == active_category_id else 'secondary'}}" t-esc="category.name"/>
+                                    <button t-attf-onclick="document.cookie = 'category={{category.id}}; expires=Thu, 1 Dec 2942 12:00:00 UTC; path=/'; location.reload();" type="button" t-attf-class="btn btn-{{'primary' if category.id == active_category_id else 'secondary'}}" t-out="category.name"/>
                                 </t>
                             </div>
         
@@ -146,12 +146,12 @@
                                 <t t-foreach="categories" t-as="category">
                                     <t t-set="category_triggers" t-value="triggers.filtered(lambda t: not t.manual and t.category_id == category)"/>
                                     <t t-if="category_triggers">
-                                        <h3 t-esc="category.name"/>
+                                        <h3 t-out="category.name"/>
                                         <div class="row">
                                             <t t-foreach="category_triggers" t-as="trigger">
                                                 <div class="col-md-3 text-nowrap">
                                                     <input t-attf-class="trigger_selection {{'trigger_selection_hide' if trigger.hide else 'trigger_selection_show'}}" type="checkbox" t-attf-name="trigger_{{trigger.id}}" t-attf-id="trigger_{{trigger.id}}" t-att-checked="trigger_display is None or trigger.id in trigger_display"/>
-                                                    <label t-attf-for="trigger_{{trigger.id}}" t-esc="trigger.name"/>
+                                                    <label t-attf-for="trigger_{{trigger.id}}" t-out="trigger.name"/>
                                                 </div>
                                             </t>
                                         </div>
@@ -181,8 +181,8 @@
                 <li class="nav-item">
                     <a href="/runbot/errors" class="nav-link text-danger" t-attf-title="You have {{nb_assigned_errors}} random bug assigned">
                         <i class="fa fa-bug"/>
-                        <t t-esc="nb_assigned_errors"/>
-                        <span class="text-warning" t-if="nb_team_errors">+<t t-esc="nb_team_errors"/></span>
+                        <t t-out="nb_assigned_errors"/>
+                        <span class="text-warning" t-if="nb_team_errors">+<t t-out="nb_team_errors"/></span>
                     </a>
                 </li>
             </t>
@@ -191,7 +191,7 @@
                 <li class="nav-item">
                     <a href="/runbot/errors" class="nav-link text-warning" t-attf-title="Your team has {{nb_team_errors}} random bug assigned">
                         <i class="fa fa-bug"/>
-                        <t t-esc="nb_team_errors"/>
+                        <t t-out="nb_team_errors"/>
                     </a>
                 </li>
             </t>
@@ -207,7 +207,7 @@
             <a href="/runbot/load_info" class="slots_infos">
                 <span t-attf-class="badge text-bg-{{pending_level}}">
                     Pending:
-                    <t t-esc="pending_count"/><span title="Assigned build (reserved host)" t-if="pending_assigned_count">(<t t-esc="pending_assigned_count"/>)</span>
+                    <t t-out="pending_count"/><span title="Assigned build (reserved host)" t-if="pending_assigned_count">(<t t-out="pending_assigned_count"/>)</span>
                 </span>
                 <t t-set="testing" t-value="hosts_data._total_testing()"/>
                 <t t-set="workers" t-value="hosts_data._total_workers()"/>
@@ -220,9 +220,9 @@
                 </t>
                 <span t-attf-class="badge text-bg-{{klass}}">
                     Testing:
-                    <t t-esc="testing"/>
+                    <t t-out="testing"/>
                     /
-                    <t t-esc="workers"/>
+                    <t t-out="workers"/>
                 </span>
             </a>
         </template>
@@ -235,10 +235,10 @@
                     <i t-attf-class="fa fa-{{slot._fa_link_type()}}"/>
                 </span>
                 <a t-if="bu" t-attf-href="/runbot/batch/{{slot.batch_id.id}}/build/#{bu.id}" t-attf-class="btn btn-default slot_name">
-                    <span t-esc="slot.trigger_id.name"/>
+                    <span t-out="slot.trigger_id.name"/>
                 </a>
                 <span t-else="" t-attf-class="btn btn-default disabled slot_name">
-                    <span t-esc="slot.trigger_id.name"/>
+                    <span t-out="slot.trigger_id.name"/>
                 </span>
                 <a t-if="slot.trigger_id.report_view_id" title="View last trigger report" t-attf-href="/runbot/trigger/report/{{slot.trigger_id.id}}" class="fa fa-eye btn btn-info"/>
                 <a t-if="bu.local_state == 'running' and bu.database_ids" t-attf-href="/runbot/run/{{bu.id}}" class="fa fa-sign-in btn btn-info"/>
@@ -290,7 +290,7 @@
             <t t-if="build.global_result == 'warn'">
                 <t t-set="rowclass">warning</t>
             </t>
-            <t t-esc="rowclass"/>
+            <t t-out="rowclass"/>
         </template>
 
         <template id="runbot.build_menu">
@@ -307,7 +307,7 @@
                     <t t-foreach="bu.database_ids[1:].sorted('name')" t-as="db">
                         <a class="dropdown-item" t-attf-href="/runbot/run/{{bu.id}}/{{db.db_suffix}}">
                             <i class="fa fa-sign-in"/>
-                            Connect <t t-esc="db.db_suffix"></t>
+                            Connect <t t-out="db.db_suffix"></t>
                         </a>
                     </t>
                     <a class="dropdown-item" t-attf-href="http://{{bu.domain}}/web/database/selector">
@@ -355,7 +355,7 @@
                     <a class="dropdown-item" t-attf-href="{{log_url}}/runbot/static/build/#{bu.dest}/logs/#{log_name}.txt">
                         <i class="fa fa-file-text-o"/>
                         Full
-                        <t t-esc="log_name"/>
+                        <t t-out="log_name"/>
                         logs
                     </a>
                 </t>
@@ -382,7 +382,7 @@
             <t t-foreach="bundle.branch_ids.sorted(key=lambda b: (not b.alive, b.remote_id.repo_id.sequence, b.remote_id.repo_id.id, b.is_pr, b.id))" t-as="branch">
               <t t-set="link_title" t-value="'View %s %s on Github' % ('PR' if branch.is_pr else 'Branch', branch.name)"/>
               <a t-att-href="branch.branch_url" class="dropdown-item" t-att-title="link_title">
-                <span class="font-italic text-muted" t-esc="branch.remote_id.short_name"/> <span t-att-class="'' if branch.alive else 'line-through'" t-esc="branch.name"/> <i t-if="not branch.alive" title="deleted/closed" class="fa fa-ban text-danger"/>
+                <span class="font-italic text-muted" t-out="branch.remote_id.short_name"/> <span t-att-class="'' if branch.alive else 'line-through'" t-out="branch.name"/> <i t-if="not branch.alive" title="deleted/closed" class="fa fa-ban text-danger"/>
               </a>
             </t>
           </div>
@@ -404,11 +404,11 @@
                 <t t-foreach="project.trigger_ids.sorted(lambda t: (t.category_id.id, t.sequence, t.id))" t-as="trigger">
                     <t t-if="trigger.has_stats and not trigger.manual" >
                         <t t-if="current_category != trigger.category_id">
-                            <span class="dropdown-item"><b><t t-esc="trigger.category_id.name"/></b></span>
+                            <span class="dropdown-item"><b><t t-out="trigger.category_id.name"/></b></span>
                             <t t-set="current_category" t-value="trigger.category_id"/>
                         </t>
                         <a class="dropdown-item" t-attf-href="/runbot/stats/{{bundle.id}}/{{trigger.id}}">
-                            <t t-esc="trigger.name" />
+                            <t t-out="trigger.name" />
                         </a>
                     </t>
                 </t>
diff --git a/runbot_merge/views/templates.xml b/runbot_merge/views/templates.xml
index ab6717c9..7a39c316 100644
--- a/runbot_merge/views/templates.xml
+++ b/runbot_merge/views/templates.xml
@@ -19,7 +19,7 @@
            t-att-title="title.strip()"
            t-att-target="target or None"
            t-att-class="classes or None"
-        ><t t-esc="pr.display_name"/></a>
+        ><t t-out="pr.display_name"/></a>
     </template>
 
     <template id="staging-statuses" name="dropdown statuses list of stagings">
@@ -50,7 +50,7 @@
                        else 'bg-danger' if st[0] in ('error', 'failure')
                        else 'bg-info' if st[0]
                        else 'bg-light'}}">
-                        <t t-esc="req.repo_id.name"/>: <t t-esc="req.context"/>
+                        <t t-out="req.repo_id.name"/>: <t t-out="req.context"/>
                     </a>
                 </t>
             </div>
@@ -196,7 +196,7 @@
                 <li t-attf-class="staging {{stateclass.strip()}} {{decorationclass.strip()}}" t-att-title="title.strip() or None">
                     <ul class="list-unstyled">
                         <li t-foreach="staging.batch_ids" t-as="batch" class="batch">
-                            <t t-esc="batch.prs[:1].label"/>
+                            <t t-out="batch.prs[:1].label"/>
                             <t t-foreach="batch.prs" t-as="pr">
                                 <t t-call="runbot_merge.link-pr"/>
                             </t>
@@ -219,7 +219,7 @@
         <t t-call="website.layout">
             <div id="wrap"><div class="container-fluid">
                 <section class="row">
-                    <h1 class="col-md-12"><t t-esc="branch.project_id.name"/>: <t t-esc="branch.name"/></h1>
+                    <h1 class="col-md-12"><t t-out="branch.project_id.name"/>: <t t-out="branch.name"/></h1>
                 </section>
                 <form method="get">
                     <label for="until">Staged before:</label>
@@ -290,7 +290,7 @@
                                                     data-bs-toggle="dropdown"
                                                     aria-expanded="false"
                                             >
-                                                <t t-esc="first_pr.label"/>
+                                                <t t-out="first_pr.label"/>
                                                 <span class="caret"></span>
                                             </button>
                                             <div class="dropdown-menu">
@@ -321,7 +321,7 @@
             <div id="wrap"><div class="container-fluid">
                 <h1>Changelog</h1>
                 <section t-foreach="entries" t-as="entry">
-                    <h3 t-if="not entry_first" t-esc="entry"/>
+                    <h3 t-if="not entry_first" t-out="entry"/>
                     <ul>
                         <li t-foreach="sorted(entry_value)" t-as="item">
                             <t t-out="item"/>
@@ -336,14 +336,14 @@
         <div class="alert alert-success">
             Merged
             <t t-if="merged_head">
-                at <a t-attf-href="https://github.com/{{pr.repository.name}}/commit/{{merged_head}}"><t t-esc="merged_head"/></a>
+                at <a t-attf-href="https://github.com/{{pr.repository.name}}/commit/{{merged_head}}"><t t-out="merged_head"/></a>
             </t>
             <p>Statuses:</p>
             <ul>
                 <t t-foreach="pr.repository.status_ids._for_pr(pr)" t-as="ci">
                     <t t-set="st" t-value="statuses.get(ci.context.strip())"/>
                     <li t-if="st">
-                        <a t-att-href="st.get('target_url') if st else None"><t t-esc="ci.context.strip()"/></a><t t-if="st and st.get('description')">: <t t-esc="st['description']"/></t>
+                        <a t-att-href="st.get('target_url') if st else None"><t t-out="ci.context.strip()"/></a><t t-if="st and st.get('description')">: <t t-out="st['description']"/></t>
                     </li>
                 </t>
             </ul>
@@ -367,7 +367,7 @@
     <template id="view_pull_request_info_error">
         <div class="alert alert-danger">
             Error:
-            <span t-esc="pr.with_context(active_test=False).batch_id.staging_ids[-1:].reason">
+            <span t-out="pr.with_context(active_test=False).batch_id.staging_ids[-1:].reason">
                 Unable to stage PR
             </span>
         </div>
@@ -410,7 +410,7 @@
                             <t t-else="">ok</t>
                         </t>
                         <li t-att-class="result">
-                            <a t-att-href="st.get('target_url') if st else None"><t t-esc="ci.context.strip()"/></a><t t-if="st and st.get('description')">: <t t-esc="st['description']"/></t>
+                            <a t-att-href="st.get('target_url') if st else None"><t t-out="ci.context.strip()"/></a><t t-if="st and st.get('description')">: <t t-out="st['description']"/></t>
                         </li>
                     </t>
                 </ul>
@@ -443,7 +443,7 @@
                 </h1>
                 <h6>Created by <span t-field="pr.author.display_name"/></h6>
                 <t t-set="tmpl">
-                    <t t-if="pr.state in ('merged', 'closed', 'error')"><t t-esc="pr.state"/></t>
+                    <t t-if="pr.state in ('merged', 'closed', 'error')"><t t-out="pr.state"/></t>
                     <t t-elif="pr.staging_id">staging</t>
                     <t t-else="">open</t>
                 </t>