diff --git a/src/bin/http_health_check.rs b/src/bin/http_health_check.rs
index d3f1767cb..d66d334df 100644
--- a/src/bin/http_health_check.rs
+++ b/src/bin/http_health_check.rs
@@ -11,7 +11,7 @@ async fn main() {
     let args: Vec<String> = env::args().collect();
     if args.len() != 2 {
         eprintln!("Usage:   cargo run --bin http_health_check <HEALTH_URL>");
-        eprintln!("Example: cargo run --bin http_health_check http://127.0.0.1:1212/api/health_check");
+        eprintln!("Example: cargo run --bin http_health_check http://127.0.0.1:1313/health_check");
         std::process::exit(1);
     }
 
diff --git a/src/bootstrap/jobs/health_check_api.rs b/src/bootstrap/jobs/health_check_api.rs
index 83eb77f6b..a49f612e8 100644
--- a/src/bootstrap/jobs/health_check_api.rs
+++ b/src/bootstrap/jobs/health_check_api.rs
@@ -55,7 +55,7 @@ pub async fn start_job(config: Arc<Configuration>) -> JoinHandle<()> {
 
     // Wait until the API server job is running
     match rx_start.await {
-        Ok(msg) => info!("Torrust Health Check API server started on socket: {}", msg.address),
+        Ok(msg) => info!("Torrust Health Check API server started on: http://{}", msg.address),
         Err(e) => panic!("the Health Check API server was dropped: {e}"),
     }
 
diff --git a/src/bootstrap/jobs/mod.rs b/src/bootstrap/jobs/mod.rs
index 3a9936882..2c12eb40e 100644
--- a/src/bootstrap/jobs/mod.rs
+++ b/src/bootstrap/jobs/mod.rs
@@ -22,7 +22,7 @@ pub struct Started {
 
 pub async fn make_rust_tls(enabled: bool, cert: &Option<String>, key: &Option<String>) -> Option<Result<RustlsConfig, Error>> {
     if !enabled {
-        info!("tls not enabled");
+        info!("TLS not enabled");
         return None;
     }
 
diff --git a/src/bootstrap/jobs/tracker_apis.rs b/src/bootstrap/jobs/tracker_apis.rs
index f454b017f..e50a83651 100644
--- a/src/bootstrap/jobs/tracker_apis.rs
+++ b/src/bootstrap/jobs/tracker_apis.rs
@@ -80,6 +80,7 @@ async fn start_v1(socket: SocketAddr, tls: Option<RustlsConfig>, tracker: Arc<co
         .expect("it should be able to start to the tracker api");
 
     tokio::spawn(async move {
+        assert!(!server.state.halt_task.is_closed(), "Halt channel should be open");
         server.state.task.await.expect("failed to close service");
     })
 }
diff --git a/src/servers/apis/server.rs b/src/servers/apis/server.rs
index a25e62c8f..5df1d76fd 100644
--- a/src/servers/apis/server.rs
+++ b/src/servers/apis/server.rs
@@ -30,6 +30,7 @@ use axum_server::tls_rustls::RustlsConfig;
 use axum_server::Handle;
 use derive_more::Constructor;
 use futures::future::BoxFuture;
+use log::{error, info};
 use tokio::sync::oneshot::{Receiver, Sender};
 
 use super::routes::router;
@@ -101,13 +102,22 @@ impl ApiServer<Stopped> {
             launcher
         });
 
-        Ok(ApiServer {
-            state: Running {
-                binding: rx_start.await.expect("unable to start service").address,
-                halt_task: tx_halt,
-                task,
+        let api_server = match rx_start.await {
+            Ok(started) => ApiServer {
+                state: Running {
+                    binding: started.address,
+                    halt_task: tx_halt,
+                    task,
+                },
             },
-        })
+            Err(err) => {
+                let msg = format!("Unable to start API server: {err}");
+                error!("{}", msg);
+                panic!("{}", msg);
+            }
+        };
+
+        Ok(api_server)
     }
 }
 
@@ -159,10 +169,11 @@ impl Launcher {
         tokio::task::spawn(graceful_shutdown(
             handle.clone(),
             rx_halt,
-            format!("shutting down http server on socket address: {address}"),
+            format!("Shutting down tracker API server on socket address: {address}"),
         ));
 
         let tls = self.tls.clone();
+        let protocol = if tls.is_some() { "https" } else { "http" };
 
         let running = Box::pin(async {
             match tls {
@@ -170,18 +181,20 @@ impl Launcher {
                     .handle(handle)
                     .serve(router.into_make_service_with_connect_info::<std::net::SocketAddr>())
                     .await
-                    .expect("Axum server crashed."),
+                    .expect("Axum server for tracker API crashed."),
                 None => axum_server::from_tcp(socket)
                     .handle(handle)
                     .serve(router.into_make_service_with_connect_info::<std::net::SocketAddr>())
                     .await
-                    .expect("Axum server crashed."),
+                    .expect("Axum server for tracker API crashed."),
             }
         });
 
+        info!(target: "API", "API server started on {protocol}://{}", address);
+
         tx_start
             .send(Started { address })
-            .expect("the HTTP(s) Tracker service should not be dropped");
+            .expect("the HTTP(s) Tracker API service should not be dropped");
 
         running
     }
diff --git a/src/servers/http/server.rs b/src/servers/http/server.rs
index aee2d0ac0..c3411ac06 100644
--- a/src/servers/http/server.rs
+++ b/src/servers/http/server.rs
@@ -47,7 +47,7 @@ impl Launcher {
         tokio::task::spawn(graceful_shutdown(
             handle.clone(),
             rx_halt,
-            format!("shutting down http server on socket address: {address}"),
+            format!("Shutting down http server on socket address: {address}"),
         ));
 
         let tls = self.tls.clone();
diff --git a/src/servers/signals.rs b/src/servers/signals.rs
index cb0675d65..42fd868e8 100644
--- a/src/servers/signals.rs
+++ b/src/servers/signals.rs
@@ -46,11 +46,16 @@ pub async fn global_shutdown_signal() {
 ///
 /// Will panic if the `stop_receiver` resolves with an error.
 pub async fn shutdown_signal(rx_halt: tokio::sync::oneshot::Receiver<Halted>) {
-    let halt = async { rx_halt.await.expect("Failed to install stop signal.") };
+    let halt = async {
+        match rx_halt.await {
+            Ok(signal) => signal,
+            Err(err) => panic!("Failed to install stop signal: {err}"),
+        }
+    };
 
     tokio::select! {
-        _ = halt => {},
-        () = global_shutdown_signal() => {}
+        signal = halt => { info!("Halt signal processed: {}", signal) },
+        () = global_shutdown_signal() => { info!("Global shutdown signal processed") }
     }
 }
 
@@ -64,7 +69,7 @@ pub async fn shutdown_signal_with_message(rx_halt: tokio::sync::oneshot::Receive
 pub async fn graceful_shutdown(handle: axum_server::Handle, rx_halt: tokio::sync::oneshot::Receiver<Halted>, message: String) {
     shutdown_signal_with_message(rx_halt, message).await;
 
-    info!("sending graceful shutdown signal");
+    info!("Sending graceful shutdown signal");
     handle.graceful_shutdown(Some(Duration::from_secs(90)));
 
     println!("!! shuting down in 90 seconds !!");