diff --git a/walkeeper/src/receive_wal.rs b/walkeeper/src/receive_wal.rs
index 71000b1764..8665fd224e 100644
--- a/walkeeper/src/receive_wal.rs
+++ b/walkeeper/src/receive_wal.rs
@@ -133,9 +133,12 @@ impl<'pg> ReceiveWalConn<'pg> {
             // Add far as replication in postgres is initiated by receiver, we should use callme mechanism
             let conf = swh.conf.clone();
             let timelineid = swh.timeline.get().timelineid;
-            thread::spawn(move || {
-                request_callback(conf, timelineid, tenant_id);
-            });
+            let _ = thread::Builder::new()
+                .name("request_callback thread".into())
+                .spawn(move || {
+                    request_callback(conf, timelineid, tenant_id);
+                })
+                .unwrap();
         }
 
         loop {
diff --git a/walkeeper/src/replication.rs b/walkeeper/src/replication.rs
index 6152265159..1975f91ac4 100644
--- a/walkeeper/src/replication.rs
+++ b/walkeeper/src/replication.rs
@@ -173,11 +173,14 @@ impl ReplicationConn {
         let bg_timeline = Arc::clone(swh.timeline.get());
         let bg_stream_in = self.stream_in.take().unwrap();
 
-        thread::spawn(move || {
-            if let Err(err) = Self::background_thread(bg_stream_in, bg_timeline) {
-                error!("Replication background thread failed: {}", err);
-            }
-        });
+        let _ = thread::Builder::new()
+            .name("HotStandbyFeedback thread".into())
+            .spawn(move || {
+                if let Err(err) = Self::background_thread(bg_stream_in, bg_timeline) {
+                    error!("Replication background thread failed: {}", err);
+                }
+            })
+            .unwrap();
 
         let (mut start_pos, mut stop_pos) = Self::parse_start_stop(cmd)?;
 
diff --git a/walkeeper/src/wal_service.rs b/walkeeper/src/wal_service.rs
index 0cd97ab220..fd066680ef 100644
--- a/walkeeper/src/wal_service.rs
+++ b/walkeeper/src/wal_service.rs
@@ -18,11 +18,15 @@ pub fn thread_main(conf: SafeKeeperConf, listener: TcpListener) -> Result<()> {
             Ok((socket, peer_addr)) => {
                 debug!("accepted connection from {}", peer_addr);
                 let conf = conf.clone();
-                thread::spawn(move || {
-                    if let Err(err) = handle_socket(socket, conf) {
-                        error!("connection handler exited: {}", err);
-                    }
-                });
+
+                let _ = thread::Builder::new()
+                    .name("WAL service thread".into())
+                    .spawn(move || {
+                        if let Err(err) = handle_socket(socket, conf) {
+                            error!("connection handler exited: {}", err);
+                        }
+                    })
+                    .unwrap();
             }
             Err(e) => error!("Failed to accept connection: {}", e),
         }