diff --git a/runbot/__manifest__.py b/runbot/__manifest__.py
index 5085df56..84d15e5d 100644
--- a/runbot/__manifest__.py
+++ b/runbot/__manifest__.py
@@ -6,7 +6,7 @@
     'author': "Odoo SA",
     'website': "http://runbot.odoo.com",
     'category': 'Website',
-    'version': '5.9',
+    'version': '5.10',
     'application': True,
     'depends': ['base', 'base_automation', 'website'],
     'data': [
diff --git a/runbot/migrations/18.0.5.10/pre-migration.py b/runbot/migrations/18.0.5.10/pre-migration.py
new file mode 100644
index 00000000..9c353800
--- /dev/null
+++ b/runbot/migrations/18.0.5.10/pre-migration.py
@@ -0,0 +1,3 @@
+def migrate(cr, version):
+    cr.execute("UPDATE runbot_build set local_state='killed' where local_state='manually_killed')
+    cr.execute("UPDATE runbot_build set global_state='killed' where global_state='manually_killed')
diff --git a/runbot/models/batch.py b/runbot/models/batch.py
index 1469d9e0..1ae89191 100644
--- a/runbot/models/batch.py
+++ b/runbot/models/batch.py
@@ -147,7 +147,7 @@ class Batch(models.Model):
             domain += [('host', '=', self.bundle_id.host_id.name), ('keep_host', '=', True)]
         build = self.env['runbot.build'].search(domain, limit=1, order='id desc')
         link_type = 'matched'
-        killed_states = ('skipped', 'killed', 'manually_killed')
+        killed_states = ('skipped', 'killed')
         if build and build.local_result not in killed_states and build.global_result not in killed_states:
             if build.killable:
                 build.killable = False
diff --git a/runbot/models/build.py b/runbot/models/build.py
index 6815e8ca..63390638 100644
--- a/runbot/models/build.py
+++ b/runbot/models/build.py
@@ -28,7 +28,7 @@ from odoo.tools.safe_eval import safe_eval
 
 _logger = logging.getLogger(__name__)
 
-result_order = ['ok', 'warn', 'ko', 'skipped', 'killed', 'manually_killed']
+result_order = ['ok', 'warn', 'ko', 'skipped', 'killed']
 state_order = ['pending', 'testing', 'waiting', 'running', 'done']
 
 COPY_WHITELIST = [
@@ -414,7 +414,7 @@ class BuildResult(models.Model):
     def _result_multi(self):
         if all(build.global_result == 'ok' or not build.global_result for build in self):
             return 'ok'
-        if any(build.global_result in ('skipped', 'killed', 'manually_killed') for build in self):
+        if any(build.global_result in ('skipped', 'killed') for build in self):
             return 'killed'
         if any(build.global_result == 'ko' for build in self):
             return 'ko'
@@ -680,7 +680,7 @@ class BuildResult(models.Model):
         if build.requested_action == 'deathrow':
             result = None
             if build.local_state != 'running' and build.global_result not in ('warn', 'ko'):
-                result = 'manually_killed'
+                result = 'killed'
             build._kill(result=result)
             return
 
@@ -1226,7 +1226,7 @@ class BuildResult(models.Model):
         if self.global_result == 'ok':
             return 'success'
 
-        if self.global_result in ('skipped', 'killed', 'manually_killed'):
+        if self.global_result in ('skipped', 'killed'):
             return 'secondary'
         return 'default'
 
diff --git a/runbot/templates/utils.xml b/runbot/templates/utils.xml
index a7aaf59f..76309259 100644
--- a/runbot/templates/utils.xml
+++ b/runbot/templates/utils.xml
@@ -19,7 +19,7 @@
                         <meta http-equiv="refresh" t-att-content="refresh"/>
                     </t>
 
-                    <t t-if="not page_info_state or page_info_state == 'ok' or page_info_state not in ('warn', 'ko', 'skipped', 'killed', 'manually_killed')">
+                    <t t-if="not page_info_state or page_info_state == 'ok' or page_info_state not in ('warn', 'ko', 'skipped', 'killed')">
                         <link rel="icon" type="image/png" href="/runbot/static/src/img/icon_ok.png"/>
                         <link rel="icon" type="image/svg+xml" href="/runbot/static/src/img/icon_ok.svg"/>
                     </t>
@@ -35,7 +35,7 @@
                         <link rel="icon" type="image/png" href="/runbot/static/src/img/icon_skipped.png"/>
                         <link rel="icon" type="image/svg+xml" href="/runbot/static/src/img/icon_skipped.svg"/>
                     </t>
-                    <t t-elif="page_info_state == 'killed' or page_info_state == 'manually_killed'">
+                    <t t-elif="page_info_state == 'killed'">
                         <link rel="icon" type="image/png" href="/runbot/static/src/img/icon_killed.png"/>
                         <link rel="icon" type="image/svg+xml" href="/runbot/static/src/img/icon_killed.svg"/>
                     </t>
@@ -280,7 +280,7 @@
                 <t t-if="build.global_result == 'skipped'">
                     <t t-set="rowclass">default</t>
                 </t>
-                <t t-if="build.global_result in ['killed', 'manually_killed']">
+                <t t-if="build.global_result in ['killed']">
                     <t t-set="rowclass">killed</t>
                 </t>
             </t>