diff --git a/docs/operator-manual/notifications/catalog.md b/docs/operator-manual/notifications/catalog.md
index 8f413ac7eb5b38..add7084304b98e 100644
--- a/docs/operator-manual/notifications/catalog.md
+++ b/docs/operator-manual/notifications/catalog.md
@@ -62,8 +62,7 @@ slack:
         "short": true
       }
       {{range $index, $c := .app.status.conditions}}
-      {{if not $index}},{{end}}
-      {{if $index}},{{end}}
+      ,
       {
         "title": "{{$c.type}}",
         "value": "{{$c.message}}",
@@ -90,8 +89,7 @@ teams:
       "value": "{{.app.status.sync.revision}}"
     }
     {{range $index, $c := .app.status.conditions}}
-      {{if not $index}},{{end}}
-      {{if $index}},{{end}}
+      ,
       {
         "name": "{{$c.type}}",
         "value": "{{$c.message}}"
@@ -145,8 +143,7 @@ slack:
         "short": true
       }
       {{range $index, $c := .app.status.conditions}}
-      {{if not $index}},{{end}}
-      {{if $index}},{{end}}
+      ,
       {
         "title": "{{$c.type}}",
         "value": "{{$c.message}}",
@@ -169,8 +166,7 @@ teams:
       "value": "{{.app.spec.source.repoURL}}"
     }
     {{range $index, $c := .app.status.conditions}}
-      {{if not $index}},{{end}}
-      {{if $index}},{{end}}
+      ,
       {
         "name": "{{$c.type}}",
         "value": "{{$c.message}}"
@@ -224,8 +220,7 @@ slack:
         "short": true
       }
       {{range $index, $c := .app.status.conditions}}
-      {{if not $index}},{{end}}
-      {{if $index}},{{end}}
+      ,
       {
         "title": "{{$c.type}}",
         "value": "{{$c.message}}",
@@ -252,8 +247,7 @@ teams:
       "value": "{{.app.spec.source.repoURL}}"
     }
     {{range $index, $c := .app.status.conditions}}
-      {{if not $index}},{{end}}
-      {{if $index}},{{end}}
+      ,
       {
         "name": "{{$c.type}}",
         "value": "{{$c.message}}"
@@ -307,8 +301,7 @@ slack:
         "short": true
       }
       {{range $index, $c := .app.status.conditions}}
-      {{if not $index}},{{end}}
-      {{if $index}},{{end}}
+      ,
       {
         "title": "{{$c.type}}",
         "value": "{{$c.message}}",
@@ -335,8 +328,7 @@ teams:
       "value": "{{.app.spec.source.repoURL}}"
     }
     {{range $index, $c := .app.status.conditions}}
-      {{if not $index}},{{end}}
-      {{if $index}},{{end}}
+      ,
       {
         "name": "{{$c.type}}",
         "value": "{{$c.message}}"
@@ -394,8 +386,7 @@ slack:
         "short": true
       }
       {{range $index, $c := .app.status.conditions}}
-      {{if not $index}},{{end}}
-      {{if $index}},{{end}}
+      ,
       {
         "title": "{{$c.type}}",
         "value": "{{$c.message}}",
@@ -418,8 +409,7 @@ teams:
       "value": "{{.app.spec.source.repoURL}}"
     }
     {{range $index, $c := .app.status.conditions}}
-      {{if not $index}},{{end}}
-      {{if $index}},{{end}}
+      ,
       {
         "name": "{{$c.type}}",
         "value": "{{$c.message}}"
@@ -472,8 +462,7 @@ slack:
         "short": true
       }
       {{range $index, $c := .app.status.conditions}}
-      {{if not $index}},{{end}}
-      {{if $index}},{{end}}
+      ,
       {
         "title": "{{$c.type}}",
         "value": "{{$c.message}}",
@@ -500,8 +489,7 @@ teams:
       "value": "{{.app.spec.source.repoURL}}"
     }
     {{range $index, $c := .app.status.conditions}}
-      {{if not $index}},{{end}}
-      {{if $index}},{{end}}
+      ,
       {
         "name": "{{$c.type}}",
         "value": "{{$c.message}}"
diff --git a/notifications_catalog/templates/app-deployed.yaml b/notifications_catalog/templates/app-deployed.yaml
index 843bf57e21a89c..ee58c775f1fd80 100644
--- a/notifications_catalog/templates/app-deployed.yaml
+++ b/notifications_catalog/templates/app-deployed.yaml
@@ -25,8 +25,7 @@ slack:
             "short": true
           }
           {{range $index, $c := .app.status.conditions}}
-          {{if not $index}},{{end}}
-          {{if $index}},{{end}}
+          ,
           {
             "title": "{{$c.type}}",
             "value": "{{$c.message}}",
@@ -52,8 +51,7 @@ teams:
           "value": "{{.app.status.sync.revision}}"
         }
         {{range $index, $c := .app.status.conditions}}
-          {{if not $index}},{{end}}
-          {{if $index}},{{end}}
+          ,
           {
             "name": "{{$c.type}}",
             "value": "{{$c.message}}"
diff --git a/notifications_catalog/templates/app-health-degraded.yaml b/notifications_catalog/templates/app-health-degraded.yaml
index 46c39b2e9ca0cf..59115c9a14935f 100644
--- a/notifications_catalog/templates/app-health-degraded.yaml
+++ b/notifications_catalog/templates/app-health-degraded.yaml
@@ -21,8 +21,7 @@ slack:
             "short": true
           }
           {{range $index, $c := .app.status.conditions}}
-          {{if not $index}},{{end}}
-          {{if $index}},{{end}}
+          ,
           {
             "title": "{{$c.type}}",
             "value": "{{$c.message}}",
@@ -44,8 +43,7 @@ teams:
           "value": "{{.app.spec.source.repoURL}}"
         }
         {{range $index, $c := .app.status.conditions}}
-          {{if not $index}},{{end}}
-          {{if $index}},{{end}}
+          ,
           {
             "name": "{{$c.type}}",
             "value": "{{$c.message}}"
diff --git a/notifications_catalog/templates/app-sync-failed.yaml b/notifications_catalog/templates/app-sync-failed.yaml
index 4a5ece85ba541d..a4c23787dde8b2 100644
--- a/notifications_catalog/templates/app-sync-failed.yaml
+++ b/notifications_catalog/templates/app-sync-failed.yaml
@@ -21,8 +21,7 @@ slack:
             "short": true
           }
           {{range $index, $c := .app.status.conditions}}
-          {{if not $index}},{{end}}
-          {{if $index}},{{end}}
+          ,
           {
             "title": "{{$c.type}}",
             "value": "{{$c.message}}",
@@ -48,8 +47,7 @@ teams:
           "value": "{{.app.spec.source.repoURL}}"
         }
         {{range $index, $c := .app.status.conditions}}
-          {{if not $index}},{{end}}
-          {{if $index}},{{end}}
+          ,
           {
             "name": "{{$c.type}}",
             "value": "{{$c.message}}"
diff --git a/notifications_catalog/templates/app-sync-running.yaml b/notifications_catalog/templates/app-sync-running.yaml
index b2a86042e3ce2c..434132ad86d896 100644
--- a/notifications_catalog/templates/app-sync-running.yaml
+++ b/notifications_catalog/templates/app-sync-running.yaml
@@ -21,8 +21,7 @@ slack:
             "short": true
           }
           {{range $index, $c := .app.status.conditions}}
-          {{if not $index}},{{end}}
-          {{if $index}},{{end}}
+          ,
           {
             "title": "{{$c.type}}",
             "value": "{{$c.message}}",
@@ -47,8 +46,7 @@ teams:
           "value": "{{.app.spec.source.repoURL}}"
         }
         {{range $index, $c := .app.status.conditions}}
-          {{if not $index}},{{end}}
-          {{if $index}},{{end}}
+          ,
           {
             "name": "{{$c.type}}",
             "value": "{{$c.message}}"
diff --git a/notifications_catalog/templates/app-sync-status-unknown.yaml b/notifications_catalog/templates/app-sync-status-unknown.yaml
index b1af244fb6d2d3..c893070bfcc63a 100644
--- a/notifications_catalog/templates/app-sync-status-unknown.yaml
+++ b/notifications_catalog/templates/app-sync-status-unknown.yaml
@@ -26,8 +26,7 @@ slack:
             "short": true
           }
           {{range $index, $c := .app.status.conditions}}
-          {{if not $index}},{{end}}
-          {{if $index}},{{end}}
+          ,
           {
             "title": "{{$c.type}}",
             "value": "{{$c.message}}",
@@ -48,8 +47,7 @@ teams:
           "value": "{{.app.spec.source.repoURL}}"
         }
         {{range $index, $c := .app.status.conditions}}
-          {{if not $index}},{{end}}
-          {{if $index}},{{end}}
+          ,
           {
             "name": "{{$c.type}}",
             "value": "{{$c.message}}"
diff --git a/notifications_catalog/templates/app-sync-succeeded.yaml b/notifications_catalog/templates/app-sync-succeeded.yaml
index d791de55149a49..76e467bd1c37dd 100644
--- a/notifications_catalog/templates/app-sync-succeeded.yaml
+++ b/notifications_catalog/templates/app-sync-succeeded.yaml
@@ -21,8 +21,7 @@ slack:
             "short": true
           }
           {{range $index, $c := .app.status.conditions}}
-          {{if not $index}},{{end}}
-          {{if $index}},{{end}}
+          ,
           {
             "title": "{{$c.type}}",
             "value": "{{$c.message}}",
@@ -48,8 +47,7 @@ teams:
           "value": "{{.app.spec.source.repoURL}}"
         }
         {{range $index, $c := .app.status.conditions}}
-          {{if not $index}},{{end}}
-          {{if $index}},{{end}}
+          ,
           {
             "name": "{{$c.type}}",
             "value": "{{$c.message}}"