diff --git a/crates/cli/src/subcommands/call.rs b/crates/cli/src/subcommands/call.rs
index db2fbb8fc28..d3b657cc452 100644
--- a/crates/cli/src/subcommands/call.rs
+++ b/crates/cli/src/subcommands/call.rs
@@ -18,7 +18,7 @@ use super::sql::parse_req;
 pub fn cli() -> clap::Command {
     clap::Command::new("call")
         .about(format!(
-            "Invokes a reducer function in a database.\n\n{}",
+            "Invokes a reducer function in a database. {}",
             UNSTABLE_WARNING
         ))
         .arg(
diff --git a/crates/cli/src/subcommands/describe.rs b/crates/cli/src/subcommands/describe.rs
index f33850c8226..6f1759ff791 100644
--- a/crates/cli/src/subcommands/describe.rs
+++ b/crates/cli/src/subcommands/describe.rs
@@ -10,7 +10,7 @@ use spacetimedb_lib::sats;
 pub fn cli() -> clap::Command {
     clap::Command::new("describe")
         .about(format!(
-            "Describe the structure of a database or entities within it.\n\n{}",
+            "Describe the structure of a database or entities within it. {}",
             UNSTABLE_WARNING
         ))
         .arg(
diff --git a/crates/cli/src/subcommands/energy.rs b/crates/cli/src/subcommands/energy.rs
index 16b0e8fa56b..0d4249e2320 100644
--- a/crates/cli/src/subcommands/energy.rs
+++ b/crates/cli/src/subcommands/energy.rs
@@ -8,7 +8,7 @@ use crate::util::{self, get_login_token_or_log_in, UNSTABLE_WARNING};
 pub fn cli() -> clap::Command {
     clap::Command::new("energy")
         .about(format!(
-            "Invokes commands related to database budgets.\n\n{}",
+            "Invokes commands related to database budgets. {}",
             UNSTABLE_WARNING
         ))
         .args_conflicts_with_subcommands(true)
diff --git a/crates/cli/src/subcommands/init.rs b/crates/cli/src/subcommands/init.rs
index 48f14c2a69c..2ef43d30202 100644
--- a/crates/cli/src/subcommands/init.rs
+++ b/crates/cli/src/subcommands/init.rs
@@ -8,7 +8,7 @@ use std::path::{Path, PathBuf};
 
 pub fn cli() -> clap::Command {
     clap::Command::new("init")
-        .about(format!("Initializes a new spacetime project.\n\n{}", UNSTABLE_WARNING))
+        .about(format!("Initializes a new spacetime project. {}", UNSTABLE_WARNING))
         .arg(
             Arg::new("project-path")
                 .value_parser(clap::value_parser!(PathBuf))
diff --git a/crates/cli/src/subcommands/list.rs b/crates/cli/src/subcommands/list.rs
index 095a5cd6bb4..d7c7dafa7a7 100644
--- a/crates/cli/src/subcommands/list.rs
+++ b/crates/cli/src/subcommands/list.rs
@@ -16,7 +16,7 @@ use tabled::{
 pub fn cli() -> Command {
     Command::new("list")
         .about(format!(
-            "Lists the databases attached to an identity.\n\n{}",
+            "Lists the databases attached to an identity. {}",
             UNSTABLE_WARNING
         ))
         .arg(common_args::server().help("The nickname, host name or URL of the server from which to list databases"))
diff --git a/crates/cli/src/subcommands/server.rs b/crates/cli/src/subcommands/server.rs
index 77e0e9b9ae8..611919a6385 100644
--- a/crates/cli/src/subcommands/server.rs
+++ b/crates/cli/src/subcommands/server.rs
@@ -17,7 +17,7 @@ pub fn cli() -> Command {
         .subcommand_required(true)
         .subcommands(get_subcommands())
         .about(format!(
-            "Manage the connection to the SpacetimeDB server.\n\n{}",
+            "Manage the connection to the SpacetimeDB server. {}",
             UNSTABLE_WARNING
         ))
 }
diff --git a/crates/cli/src/subcommands/sql.rs b/crates/cli/src/subcommands/sql.rs
index 6024ac099e1..31f08ee31a8 100644
--- a/crates/cli/src/subcommands/sql.rs
+++ b/crates/cli/src/subcommands/sql.rs
@@ -15,7 +15,7 @@ use crate::util::{database_identity, get_auth_header, ResponseExt, UNSTABLE_WARN
 
 pub fn cli() -> clap::Command {
     clap::Command::new("sql")
-        .about(format!("Runs a SQL query on the database.\n\n{}", UNSTABLE_WARNING))
+        .about(format!("Runs a SQL query on the database. {}", UNSTABLE_WARNING))
         .arg(
             Arg::new("database")
                 .required(true)
diff --git a/crates/cli/src/subcommands/subscribe.rs b/crates/cli/src/subcommands/subscribe.rs
index d9a993cfb36..6eb2039c787 100644
--- a/crates/cli/src/subcommands/subscribe.rs
+++ b/crates/cli/src/subcommands/subscribe.rs
@@ -23,7 +23,7 @@ use crate::Config;
 pub fn cli() -> clap::Command {
     clap::Command::new("subscribe")
         .about(format!(
-            "Subscribe to SQL queries on the database.\n\n{}",
+            "Subscribe to SQL queries on the database. {}",
             UNSTABLE_WARNING
         ))
         .arg(