diff --git a/scripts/settings/autogenerate-settings.sh b/scripts/settings/autogenerate-settings.sh
index f568cda7942..997c5d7d78f 100755
--- a/scripts/settings/autogenerate-settings.sh
+++ b/scripts/settings/autogenerate-settings.sh
@@ -58,7 +58,7 @@ settings_from_cpp AS
 ),
 main_content AS
 (
-    SELECT format('## {} {}\\n{}\\n\\nType: {}\\n\\nDefault value: {}\\n\\n{}\\n\\n',
+    SELECT format('## {} {}\\n{}\\n\\nType: \`{}\`\\n\\nDefault: \`{}\`\\n\\n{}\\n\\n',
                   name, '{#'||name||'}', multiIf(tier == 'Experimental', '<ExperimentalBadge/>', tier == 'Beta', '<BetaBadge/>', ''), type, default, trim(BOTH '\\n' FROM description))
     FROM system.settings WHERE name IN settings_from_cpp
     ORDER BY name
@@ -134,25 +134,38 @@ WITH
     (
         SELECT
 	        name,
-	        replaceRegexpAll(description, '(?m)^[ \t]+', '') AS description
+	        replaceRegexpAll(description, '(?m)^[ \t]+', '') AS description,
+	        type,
+	        default
         FROM system.server_settings
     ),
     combined_server_settings AS
     (
         SELECT
             name,
-            description
+            description,
+            type,
+            default
         FROM server_settings_in_source
         UNION ALL
         SELECT
             name,
-            doc AS description
+            doc AS description,
+            '' AS type,
+            '' AS default
         FROM server_settings_outside_source
     ),
     formatted_settings AS
     (
         SELECT
-            format('## {} {}\n\n{}\n\n', name, lcase('{#'||name||'}'), description) AS formatted_text
+            format(
+              '## {} {}\n\n{}{}{}\n\n',
+              name,
+              lcase('{#'||name||'}'),
+              if(type != '', concat('Type: \`', type, '\`\n\n'), ''),
+              if(default != '', concat('Default: \`', default, '\`\n\n'), ''),
+              description
+            ) AS formatted_text
         FROM combined_server_settings
         ORDER BY name ASC
     ),