diff --git a/files/cert2json.py b/files/cert2json.py
index 177210c12bc3ba871e24261458628d2a058b7173..b87db80c6764e307e22640f3e1536e67e3211275 100755
--- a/files/cert2json.py
+++ b/files/cert2json.py
@@ -38,17 +38,17 @@ with open(YAML_FILE, "w") as yaml_out:
     yaml_out.write("---\n")
     for txt_line in DECODED_OUTPUT:
         if "Certificate Name:" in txt_line:
-            txt_line_out = re.sub('.*Certificate Name: ', '  ', txt_line) + ":"
+            txt_line_out = re.sub('.*Certificate Name: ', '- ', txt_line) + ":"
         elif "Serial Number: " in txt_line:
-            txt_line_out = re.sub('.*Serial Number: ', '    Serial Number: ', txt_line)
+            txt_line_out = re.sub('.*Serial Number: ', '  Serial Number: ', txt_line)
         elif "Domains: " in txt_line:
-            txt_line_out = re.sub('.*Domains: ', '    Domains: ', txt_line)
+            txt_line_out = re.sub('.*Domains: ', '  Domains: ', txt_line)
         elif "Expiry Date: " in txt_line:
-            txt_line_out = re.sub('.*Expiry Date: ', '    Expiry Date: "', txt_line) + '"'
+            txt_line_out = re.sub('.*Expiry Date: ', '  Expiry Date: "', txt_line) + '"'
         elif "Certificate Path: " in txt_line:
-            txt_line_out = re.sub('.*Certificate Path: ', '    Certificate Path: ', txt_line)
+            txt_line_out = re.sub('.*Certificate Path: ', '  Certificate Path: ', txt_line)
         elif "Private Key Path: " in txt_line:
-            txt_line_out = re.sub('.*Private Key Path: ', '    Private Key Path: ', txt_line)
+            txt_line_out = re.sub('.*Private Key Path: ', '  Private Key Path: ', txt_line)
         else:
             txt_line_out = None