diff --git a/cmd/bots/internal/common/templates/alerts/alert_fixed.md b/cmd/bots/internal/common/templates/alerts/alert_fixed.md
index 883d4e3b..b01aabac 100644
--- a/cmd/bots/internal/common/templates/alerts/alert_fixed.md
+++ b/cmd/bots/internal/common/templates/alerts/alert_fixed.md
@@ -1,3 +1,3 @@
```yaml
-{{ .PreviousAlert}} issue has been resolved ✅
+✅ {{ .PreviousAlert}} issue has been resolved
```
diff --git a/cmd/bots/internal/common/templates/alerts/base_target_alert.html b/cmd/bots/internal/common/templates/alerts/base_target_alert.html
index 90c91ec6..eab10ad4 100644
--- a/cmd/bots/internal/common/templates/alerts/base_target_alert.html
+++ b/cmd/bots/internal/common/templates/alerts/base_target_alert.html
@@ -1,4 +1,4 @@
-Base Target Alert
+❌ Base Target Alert
Base target is greater than the threshold value. The threshold value is {{ .Threshold}}
{{ with .BaseTargetValues }}{{range .}}
{{ .Node }}
diff --git a/cmd/bots/internal/common/templates/alerts/base_target_alert.md b/cmd/bots/internal/common/templates/alerts/base_target_alert.md
index f3949e73..64227048 100644
--- a/cmd/bots/internal/common/templates/alerts/base_target_alert.md
+++ b/cmd/bots/internal/common/templates/alerts/base_target_alert.md
@@ -1,6 +1,6 @@
```yaml
-Alert type: Base Target
-Details: Base target is greater than the threshold value. The threshold value is {{ .Threshold }}
+❌ Base Target Alert
+Base target is greater than the threshold value. The threshold value is {{ .Threshold }}
{{ with .BaseTargetValues }}{{ range . }}
Node: {{ .Node}}
Base Target: {{ .BaseTarget}}
diff --git a/cmd/bots/internal/common/templates/alerts/height_alert.html b/cmd/bots/internal/common/templates/alerts/height_alert.html
index 1743ac4a..12cbdeb9 100644
--- a/cmd/bots/internal/common/templates/alerts/height_alert.html
+++ b/cmd/bots/internal/common/templates/alerts/height_alert.html
@@ -1,4 +1,4 @@
-❌Height Alert
+❌ Height Alert
Some node(s) are {{ .HeightDifference}} blocks behind
{{ with .FirstGroup }}
First group with height {{ .Height}}
:{{range .Nodes}}
diff --git a/cmd/bots/internal/common/templates/alerts/height_alert.md b/cmd/bots/internal/common/templates/alerts/height_alert.md
index ffca27a3..3f3d9e72 100644
--- a/cmd/bots/internal/common/templates/alerts/height_alert.md
+++ b/cmd/bots/internal/common/templates/alerts/height_alert.md
@@ -1,6 +1,6 @@
```yaml
-Alert type: Height ❌
-Details: Some node(s) are {{ .HeightDifference}} blocks behind
+❌ Height Alert
+Some node(s) are {{ .HeightDifference}} blocks behind
{{ with .FirstGroup }}
First group with height {{ .Height}}:{{range .Nodes}}
{{.}}{{end}}{{end}}
diff --git a/cmd/bots/internal/common/templates/alerts/incomplete_alert.html b/cmd/bots/internal/common/templates/alerts/incomplete_alert.html
index e8e1b4fc..30b440f2 100644
--- a/cmd/bots/internal/common/templates/alerts/incomplete_alert.html
+++ b/cmd/bots/internal/common/templates/alerts/incomplete_alert.html
@@ -1,2 +1,2 @@
-❗️Incomplete Alert:
+❗️Incomplete Alert
Incomplete statement for node {{ .Node}} {{ .Version}} at height {{ .Height}}
diff --git a/cmd/bots/internal/common/templates/alerts/incomplete_alert.md b/cmd/bots/internal/common/templates/alerts/incomplete_alert.md
index a976474e..1b805c3e 100644
--- a/cmd/bots/internal/common/templates/alerts/incomplete_alert.md
+++ b/cmd/bots/internal/common/templates/alerts/incomplete_alert.md
@@ -1,4 +1,4 @@
```yaml
-Alert type: Incomplete❗️
-Details: Incomplete statement for node {{ .Node}} {{ .Version}} at height {{ .Height}}
+❗️Incomplete Alert
+Incomplete statement for node {{ .Node}} {{ .Version}} at height {{ .Height}}
```
diff --git a/cmd/bots/internal/common/templates/alerts/internal_error_alert.md b/cmd/bots/internal/common/templates/alerts/internal_error_alert.md
index 40de83d5..ff4318d0 100644
--- a/cmd/bots/internal/common/templates/alerts/internal_error_alert.md
+++ b/cmd/bots/internal/common/templates/alerts/internal_error_alert.md
@@ -1,4 +1,4 @@
```yaml
-Alert type: Internal Error ❗️
-Details: An internal error has occurred, {{ .Error}}
+❗️Internal Error Alert
+An internal error has occurred, {{ .Error}}
```
diff --git a/cmd/bots/internal/common/templates/alerts/invalid_height_alert.html b/cmd/bots/internal/common/templates/alerts/invalid_height_alert.html
index a9339bfb..c17484bc 100644
--- a/cmd/bots/internal/common/templates/alerts/invalid_height_alert.html
+++ b/cmd/bots/internal/common/templates/alerts/invalid_height_alert.html
@@ -1,2 +1,2 @@
-❌Invalid Height Alert
+❌ Invalid Height Alert
Node {{ .Node}} {{ .Version}} has an invalid height {{ .Height}}
diff --git a/cmd/bots/internal/common/templates/alerts/invalid_height_alert.md b/cmd/bots/internal/common/templates/alerts/invalid_height_alert.md
index 9ccc6ff6..88ffe1fc 100644
--- a/cmd/bots/internal/common/templates/alerts/invalid_height_alert.md
+++ b/cmd/bots/internal/common/templates/alerts/invalid_height_alert.md
@@ -1,4 +1,4 @@
```yaml
-Alert type: Invalid Height ❌
-Details: Node {{ .Node}} {{ .Version}} has an invalid height {{ .Height}}
+❌ Invalid Height Alert
+Node {{ .Node}} {{ .Version}} has an invalid height {{ .Height}}
```
diff --git a/cmd/bots/internal/common/templates/alerts/simple_alert.html b/cmd/bots/internal/common/templates/alerts/simple_alert.html
index 9e714499..6e0310c3 100644
--- a/cmd/bots/internal/common/templates/alerts/simple_alert.html
+++ b/cmd/bots/internal/common/templates/alerts/simple_alert.html
@@ -1,2 +1,2 @@
-Simple Alert
+❌ Simple Alert
{{ .Description}}
diff --git a/cmd/bots/internal/common/templates/alerts/simple_alert.md b/cmd/bots/internal/common/templates/alerts/simple_alert.md
index 10a6ce5e..be745d11 100644
--- a/cmd/bots/internal/common/templates/alerts/simple_alert.md
+++ b/cmd/bots/internal/common/templates/alerts/simple_alert.md
@@ -1,4 +1,4 @@
```yaml
-Alert type: Simple Alert ❌
-Details: {{ .Description}}
+❌ Simple Alert
+{{ .Description}}
```
diff --git a/cmd/bots/internal/common/templates/alerts/state_hash_alert.html b/cmd/bots/internal/common/templates/alerts/state_hash_alert.html
index 02202928..53806cc8 100644
--- a/cmd/bots/internal/common/templates/alerts/state_hash_alert.html
+++ b/cmd/bots/internal/common/templates/alerts/state_hash_alert.html
@@ -1,4 +1,4 @@
-❌Diverging State Hashes
+❌ Diverging State Hashes
Nodes on the same chain have diverging state hashes at {{ .SameHeight}}
{{ with .FirstGroup }}
BlockID: {{ .BlockID}}
diff --git a/cmd/bots/internal/common/templates/alerts/state_hash_alert.md b/cmd/bots/internal/common/templates/alerts/state_hash_alert.md
index 65c2d4e9..ff62aa35 100644
--- a/cmd/bots/internal/common/templates/alerts/state_hash_alert.md
+++ b/cmd/bots/internal/common/templates/alerts/state_hash_alert.md
@@ -1,6 +1,6 @@
```yaml
-Alert type: State Hash ❌
-Details: Nodes on the same chain have diverging state hashes at {{ .SameHeight}}
+❌ State Hash Alert
+Nodes on the same chain have diverging state hashes at {{ .SameHeight}}
{{ with .FirstGroup }}
BlockID (First group): {{ .BlockID}}
State Hash (First group): {{ .StateHash}}{{range .Nodes}}
diff --git a/cmd/bots/internal/common/templates/alerts/state_hash_several_chains_alert.html b/cmd/bots/internal/common/templates/alerts/state_hash_several_chains_alert.html
index 62964260..b3780e4a 100644
--- a/cmd/bots/internal/common/templates/alerts/state_hash_several_chains_alert.html
+++ b/cmd/bots/internal/common/templates/alerts/state_hash_several_chains_alert.html
@@ -1,4 +1,4 @@
-❌Several Chains Detected
+❌ Several Chains Detected
{{ with .FirstGroup }}
BlockID: {{ .BlockID}}
{{range .Nodes}}
{{.}}
{{end}}{{end}}
diff --git a/cmd/bots/internal/common/templates/alerts/state_hash_several_chains_alert.md b/cmd/bots/internal/common/templates/alerts/state_hash_several_chains_alert.md
index b9fd3efd..17ed548f 100644
--- a/cmd/bots/internal/common/templates/alerts/state_hash_several_chains_alert.md
+++ b/cmd/bots/internal/common/templates/alerts/state_hash_several_chains_alert.md
@@ -1,6 +1,6 @@
```yaml
-Alert type: Several Chains Detected ❌
-Details: Nodes have different state hashes at the same height {{ .SameHeight}}
+❌ Several Chains Detected
+Nodes have different state hashes at the same height {{ .SameHeight}}
{{ with .FirstGroup }}
BlockID (First group): {{ .BlockID}}{{range .Nodes}}
{{.}}{{end}}{{end}}
diff --git a/cmd/bots/internal/common/templates/alerts/unreachable_alert.html b/cmd/bots/internal/common/templates/alerts/unreachable_alert.html
index 06592c46..4f7744bb 100644
--- a/cmd/bots/internal/common/templates/alerts/unreachable_alert.html
+++ b/cmd/bots/internal/common/templates/alerts/unreachable_alert.html
@@ -1,2 +1,2 @@
-❌Unreachable Alert
+❌ Unreachable Alert
Node {{ .Node}} is unreachable
diff --git a/cmd/bots/internal/common/templates/alerts/unreachable_alert.md b/cmd/bots/internal/common/templates/alerts/unreachable_alert.md
index fc7c15c4..2d5e911c 100644
--- a/cmd/bots/internal/common/templates/alerts/unreachable_alert.md
+++ b/cmd/bots/internal/common/templates/alerts/unreachable_alert.md
@@ -1,4 +1,4 @@
```yaml
-Alert type: Unreachable ❌
-Details: Node {{ .Node}} is unreachable
+❌ Unreachable Alert
+Node {{ .Node}} is unreachable
```
diff --git a/cmd/bots/internal/common/testdata/templates/alerts/alert_fixed.md.golden b/cmd/bots/internal/common/testdata/templates/alerts/alert_fixed.md.golden
index f7065b43..efc6ba6b 100644
--- a/cmd/bots/internal/common/testdata/templates/alerts/alert_fixed.md.golden
+++ b/cmd/bots/internal/common/testdata/templates/alerts/alert_fixed.md.golden
@@ -1,3 +1,3 @@
```yaml
-UnreachableAlert issue has been resolved ✅
+✅ UnreachableAlert issue has been resolved
```
diff --git a/cmd/bots/internal/common/testdata/templates/alerts/base_target_alert.html.golden b/cmd/bots/internal/common/testdata/templates/alerts/base_target_alert.html.golden
index 257fac91..ee0d0a7a 100644
--- a/cmd/bots/internal/common/testdata/templates/alerts/base_target_alert.html.golden
+++ b/cmd/bots/internal/common/testdata/templates/alerts/base_target_alert.html.golden
@@ -1,4 +1,4 @@
-Base Target Alert
+❌ Base Target Alert
Base target is greater than the threshold value. The threshold value is 101
test1
diff --git a/cmd/bots/internal/common/testdata/templates/alerts/base_target_alert.md.golden b/cmd/bots/internal/common/testdata/templates/alerts/base_target_alert.md.golden
index ed031b3c..de7cb3df 100644
--- a/cmd/bots/internal/common/testdata/templates/alerts/base_target_alert.md.golden
+++ b/cmd/bots/internal/common/testdata/templates/alerts/base_target_alert.md.golden
@@ -1,6 +1,6 @@
```yaml
-Alert type: Base Target
-Details: Base target is greater than the threshold value. The threshold value is 101
+❌ Base Target Alert
+Base target is greater than the threshold value. The threshold value is 101
Node: test1
Base Target: 150
diff --git a/cmd/bots/internal/common/testdata/templates/alerts/height_alert.html.golden b/cmd/bots/internal/common/testdata/templates/alerts/height_alert.html.golden
index 6876c6c6..aaab759a 100644
--- a/cmd/bots/internal/common/testdata/templates/alerts/height_alert.html.golden
+++ b/cmd/bots/internal/common/testdata/templates/alerts/height_alert.html.golden
@@ -1,4 +1,4 @@
-❌Height Alert
+❌ Height Alert
Some node(s) are 1 blocks behind
First group with height 2
:
diff --git a/cmd/bots/internal/common/testdata/templates/alerts/height_alert.md.golden b/cmd/bots/internal/common/testdata/templates/alerts/height_alert.md.golden
index 8cd62f5b..79b44f3d 100644
--- a/cmd/bots/internal/common/testdata/templates/alerts/height_alert.md.golden
+++ b/cmd/bots/internal/common/testdata/templates/alerts/height_alert.md.golden
@@ -1,6 +1,6 @@
```yaml
-Alert type: Height ❌
-Details: Some node(s) are 1 blocks behind
+❌ Height Alert
+Some node(s) are 1 blocks behind
First group with height 2:
node 3
diff --git a/cmd/bots/internal/common/testdata/templates/alerts/incomplete_alert.html.golden b/cmd/bots/internal/common/testdata/templates/alerts/incomplete_alert.html.golden
index 241186c6..5650b41a 100644
--- a/cmd/bots/internal/common/testdata/templates/alerts/incomplete_alert.html.golden
+++ b/cmd/bots/internal/common/testdata/templates/alerts/incomplete_alert.html.golden
@@ -1,2 +1,2 @@
-❗️Incomplete Alert:
+❗️Incomplete Alert
Incomplete statement for node a 1 at height 1
diff --git a/cmd/bots/internal/common/testdata/templates/alerts/incomplete_alert.md.golden b/cmd/bots/internal/common/testdata/templates/alerts/incomplete_alert.md.golden
index 3e4ee6f2..b7121eb8 100644
--- a/cmd/bots/internal/common/testdata/templates/alerts/incomplete_alert.md.golden
+++ b/cmd/bots/internal/common/testdata/templates/alerts/incomplete_alert.md.golden
@@ -1,4 +1,4 @@
```yaml
-Alert type: Incomplete❗️
-Details: Incomplete statement for node a 1 at height 1
+❗️Incomplete Alert
+Incomplete statement for node a 1 at height 1
```
diff --git a/cmd/bots/internal/common/testdata/templates/alerts/internal_error_alert.md.golden b/cmd/bots/internal/common/testdata/templates/alerts/internal_error_alert.md.golden
index 64fedc38..c6387290 100644
--- a/cmd/bots/internal/common/testdata/templates/alerts/internal_error_alert.md.golden
+++ b/cmd/bots/internal/common/testdata/templates/alerts/internal_error_alert.md.golden
@@ -1,4 +1,4 @@
```yaml
-Alert type: Internal Error ❗️
-Details: An internal error has occurred, error
+❗️Internal Error Alert
+An internal error has occurred, error
```
diff --git a/cmd/bots/internal/common/testdata/templates/alerts/invalid_height_alert.html.golden b/cmd/bots/internal/common/testdata/templates/alerts/invalid_height_alert.html.golden
index 73e9e502..0a6dde86 100644
--- a/cmd/bots/internal/common/testdata/templates/alerts/invalid_height_alert.html.golden
+++ b/cmd/bots/internal/common/testdata/templates/alerts/invalid_height_alert.html.golden
@@ -1,2 +1,2 @@
-❌Invalid Height Alert
+❌ Invalid Height Alert
Node a 1 has an invalid height 1
diff --git a/cmd/bots/internal/common/testdata/templates/alerts/invalid_height_alert.md.golden b/cmd/bots/internal/common/testdata/templates/alerts/invalid_height_alert.md.golden
index e60086d5..0bf7c36e 100644
--- a/cmd/bots/internal/common/testdata/templates/alerts/invalid_height_alert.md.golden
+++ b/cmd/bots/internal/common/testdata/templates/alerts/invalid_height_alert.md.golden
@@ -1,4 +1,4 @@
```yaml
-Alert type: Invalid Height ❌
-Details: Node a 1 has an invalid height 1
+❌ Invalid Height Alert
+Node a 1 has an invalid height 1
```
diff --git a/cmd/bots/internal/common/testdata/templates/alerts/simple_alert.html.golden b/cmd/bots/internal/common/testdata/templates/alerts/simple_alert.html.golden
index ad98dc73..a64a6474 100644
--- a/cmd/bots/internal/common/testdata/templates/alerts/simple_alert.html.golden
+++ b/cmd/bots/internal/common/testdata/templates/alerts/simple_alert.html.golden
@@ -1,2 +1,2 @@
-Simple Alert
+❌ Simple Alert
Simple alert !!!
diff --git a/cmd/bots/internal/common/testdata/templates/alerts/simple_alert.md.golden b/cmd/bots/internal/common/testdata/templates/alerts/simple_alert.md.golden
index 508dfe56..275102a7 100644
--- a/cmd/bots/internal/common/testdata/templates/alerts/simple_alert.md.golden
+++ b/cmd/bots/internal/common/testdata/templates/alerts/simple_alert.md.golden
@@ -1,4 +1,4 @@
```yaml
-Alert type: Simple Alert ❌
-Details: Simple alert !!!
+❌ Simple Alert
+Simple alert !!!
```
diff --git a/cmd/bots/internal/common/testdata/templates/alerts/state_hash_alert.html.golden b/cmd/bots/internal/common/testdata/templates/alerts/state_hash_alert.html.golden
index ee0176d7..08ca5f37 100644
--- a/cmd/bots/internal/common/testdata/templates/alerts/state_hash_alert.html.golden
+++ b/cmd/bots/internal/common/testdata/templates/alerts/state_hash_alert.html.golden
@@ -1,4 +1,4 @@
-❌Diverging State Hashes
+❌ Diverging State Hashes
Nodes on the same chain have diverging state hashes at 100
BlockID: 1111111ogCyDbaRMvkdsHB3qfdyFYaG1WtRUAfdh
diff --git a/cmd/bots/internal/common/testdata/templates/alerts/state_hash_alert.md.golden b/cmd/bots/internal/common/testdata/templates/alerts/state_hash_alert.md.golden
index 82116279..7342ab3e 100644
--- a/cmd/bots/internal/common/testdata/templates/alerts/state_hash_alert.md.golden
+++ b/cmd/bots/internal/common/testdata/templates/alerts/state_hash_alert.md.golden
@@ -1,6 +1,6 @@
```yaml
-Alert type: State Hash ❌
-Details: Nodes on the same chain have diverging state hashes at 100
+❌ State Hash Alert
+Nodes on the same chain have diverging state hashes at 100
BlockID (First group): 1111111ogCyDbaRMvkdsHB3qfdyFYaG1WtRUAfdh
State Hash (First group): 0000000000000066000000000000000000000000000000000000000000000000
diff --git a/cmd/bots/internal/common/testdata/templates/alerts/state_hash_several_chains_alert.html.golden b/cmd/bots/internal/common/testdata/templates/alerts/state_hash_several_chains_alert.html.golden
index 5de28e4d..3b7fc2b7 100644
--- a/cmd/bots/internal/common/testdata/templates/alerts/state_hash_several_chains_alert.html.golden
+++ b/cmd/bots/internal/common/testdata/templates/alerts/state_hash_several_chains_alert.html.golden
@@ -1,4 +1,4 @@
-❌Several Chains Detected
+❌ Several Chains Detected
BlockID: 1111111ogCyDbaRMvkdsHB3qfdyFYaG1WtRUAfdh
a
diff --git a/cmd/bots/internal/common/testdata/templates/alerts/state_hash_several_chains_alert.md.golden b/cmd/bots/internal/common/testdata/templates/alerts/state_hash_several_chains_alert.md.golden
index b2ead1fc..4fc7b28e 100644
--- a/cmd/bots/internal/common/testdata/templates/alerts/state_hash_several_chains_alert.md.golden
+++ b/cmd/bots/internal/common/testdata/templates/alerts/state_hash_several_chains_alert.md.golden
@@ -1,6 +1,6 @@
```yaml
-Alert type: Several Chains Detected ❌
-Details: Nodes have different state hashes at the same height 100
+❌ Several Chains Detected
+Nodes have different state hashes at the same height 100
BlockID (First group): 1111111ogCyDbaRMvkdsHB3qfdyFYaG1WtRUAfdh
a
diff --git a/cmd/bots/internal/common/testdata/templates/alerts/unreachable_alert.html.golden b/cmd/bots/internal/common/testdata/templates/alerts/unreachable_alert.html.golden
index d86d665e..62ae17e5 100644
--- a/cmd/bots/internal/common/testdata/templates/alerts/unreachable_alert.html.golden
+++ b/cmd/bots/internal/common/testdata/templates/alerts/unreachable_alert.html.golden
@@ -1,2 +1,2 @@
-❌Unreachable Alert
+❌ Unreachable Alert
Node node is unreachable
diff --git a/cmd/bots/internal/common/testdata/templates/alerts/unreachable_alert.md.golden b/cmd/bots/internal/common/testdata/templates/alerts/unreachable_alert.md.golden
index 2c872634..bca72d22 100644
--- a/cmd/bots/internal/common/testdata/templates/alerts/unreachable_alert.md.golden
+++ b/cmd/bots/internal/common/testdata/templates/alerts/unreachable_alert.md.golden
@@ -1,4 +1,4 @@
```yaml
-Alert type: Unreachable ❌
-Details: Node node is unreachable
+❌ Unreachable Alert
+Node node is unreachable
```