diff --git a/cmd/node/node.go b/cmd/node/node.go
index cc99c0e..9a335c6 100644
--- a/cmd/node/node.go
+++ b/cmd/node/node.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"log/slog"
 	"net"
 	"net/http"
@@ -31,35 +32,32 @@ func init() {
 
 	currentV, currentB, _ := update.NewUpdater(*log, cfg).GetCurrentVersion()
 
-	log.Info("Initializing server", slog.String("address", cfg.HTTPServer.Address), slog.String("version", string(currentV)+"-"+string(currentB)))
+	log.Info("Initializing GoSally server", slog.String("address", cfg.HTTPServer.Address), slog.String("version", string(currentV)+"-"+string(currentB)))
 	log.Debug("Server running in debug mode")
 }
 
-func UpdateDaemon(u *update.Updater, cfg config.ConfigConf) {
-	for {
-		isNewUpdate, err := u.CkeckUpdates()
-		if err != nil {
-			log.Error("Failed to check for updates", slog.String("error", err.Error()))
-		}
-		if isNewUpdate {
-			log.Info("New update available, starting update process...")
-			err = u.Update()
-			if err != nil {
-				log.Error("Failed to update", slog.String("error", err.Error()))
-			} else {
-				log.Info("Update completed successfully")
-			}
-		} else {
-			log.Info("No new updates available")
-		}
-		time.Sleep(cfg.CheckInterval)
+func UpdateDaemon(u *update.Updater, cfg config.ConfigConf, srv *http.Server) {
+	//time.Sleep(5 * time.Second)
+	log.Info("New update available, starting update process...")
+
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+
+	log.Info("Trying to down server gracefully before update")
+	if err := srv.Shutdown(ctx); err != nil {
+		log.Error("Failed to shutdown server gracefully", slog.String("error", err.Error()))
 	}
+
+	err := u.Update()
+	if err != nil {
+		log.Error("Failed to update", slog.String("error", err.Error()))
+	} else {
+		log.Info("Update completed successfully")
+	}
+
 }
 
 func main() {
-	updater := update.NewUpdater(*log, cfg)
-	go UpdateDaemon(updater, *cfg)
-
 	serverv1 := sv1.InitV1Server(&sv1.HandlerV1InitStruct{
 		Log:            *log,
 		Config:         cfg,
@@ -90,30 +88,55 @@ func main() {
 		})
 	})
 
-	address := cfg.Address
-	if cfg.TlsEnabled {
-		log.Info("HTTPS server started with TLS", slog.String("address", address))
-		listener, err := net.Listen("tcp", address)
-		if err != nil {
-			log.Error("Failed to start TLS listener", slog.String("error", err.Error()))
-			return
-		}
-		limitedListener := netutil.LimitListener(listener, 100)
-		err = http.ServeTLS(limitedListener, r, cfg.CertFile, cfg.KeyFile)
-		if err != nil {
-			log.Error("Failed to start HTTPS server", slog.String("error", err.Error()))
-		}
-	} else {
-		log.Info("HTTP server started", slog.String("address", address))
-		listener, err := net.Listen("tcp", address)
-		if err != nil {
-			log.Error("Failed to start listener", slog.String("error", err.Error()))
-			return
-		}
-		limitedListener := netutil.LimitListener(listener, 100)
-		err = http.Serve(limitedListener, r)
-		if err != nil {
-			log.Error("Failed to start HTTP server", slog.String("error", err.Error()))
-		}
+	srv := &http.Server{
+		Addr:    cfg.Address,
+		Handler: r,
 	}
+	go func() {
+		if cfg.TlsEnabled {
+			log.Info("HTTPS server started with TLS", slog.String("address", cfg.Address))
+			listener, err := net.Listen("tcp", cfg.Address)
+			if err != nil {
+				log.Error("Failed to start TLS listener", slog.String("error", err.Error()))
+				return
+			}
+			limitedListener := netutil.LimitListener(listener, 100)
+			err = http.ServeTLS(limitedListener, r, cfg.CertFile, cfg.KeyFile)
+			if err != nil {
+				log.Error("Failed to start HTTPS server", slog.String("error", err.Error()))
+			}
+		} else {
+			log.Info("HTTP server started", slog.String("address", cfg.Address))
+			listener, err := net.Listen("tcp", cfg.Address)
+			if err != nil {
+				log.Error("Failed to start listener", slog.String("error", err.Error()))
+				return
+			}
+			limitedListener := netutil.LimitListener(listener, 100)
+			err = http.Serve(limitedListener, r)
+			if err != nil {
+				log.Error("Failed to start HTTP server", slog.String("error", err.Error()))
+			}
+		}
+	}()
+
+	time.Sleep(5*time.Second)
+	updater := update.NewUpdater(*log, cfg)
+	go func() {
+		time.Sleep(6*time.Second)
+		for {
+			isNewUpdate, err := updater.CkeckUpdates()
+			if err != nil {
+				log.Error("Failed to check for updates", slog.String("error", err.Error()))
+			}
+			if isNewUpdate {
+				UpdateDaemon(updater, *cfg, srv)
+			} else {
+				log.Info("No new updates available")
+			}
+			time.Sleep(cfg.CheckInterval)
+		}
+	}()
+
+	select {}
 }
diff --git a/core/init/init.go b/core/init/init.go
index 20ebf79..eeea839 100644
--- a/core/init/init.go
+++ b/core/init/init.go
@@ -39,7 +39,7 @@ func init() {
 	output.Close()
 	runArgs := os.Args
 	runArgs[0] = runBinaryPath
-	if err := syscall.Exec(runBinaryPath, runArgs, append(os.Environ(), "GS_RUNTIME_PATH=" + runPath)); err != nil {
+	if err := syscall.Exec(runBinaryPath, runArgs, append(os.Environ(), "GS_RUNTIME_PATH="+runPath)); err != nil {
 		log.Fatalf("Failed to init node: %s", err)
 	}
 }
diff --git a/core/update/update.go b/core/update/update.go
index 902f7a9..80e57b6 100644
--- a/core/update/update.go
+++ b/core/update/update.go
@@ -10,6 +10,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"regexp"
 	"strconv"
 	"strings"
 
@@ -203,7 +204,6 @@ func (u *Updater) Update() error {
 	if err != nil {
 		return errors.New("failed to create temp dir " + err.Error())
 	}
-	//defer os.RemoveAll(downloadPath)
 	_, currentBranch, err := u.GetCurrentVersion()
 	if err != nil {
 		return errors.New("failed to get current version: " + err.Error())
@@ -287,7 +287,6 @@ func (u *Updater) InstallAndRestart(newBinaryPath string) error {
 	if err != nil {
 		return err
 	}
-	
 
 	if _, err := io.Copy(output, input); err != nil {
 		return err
@@ -298,6 +297,10 @@ func (u *Updater) InstallAndRestart(newBinaryPath string) error {
 	}
 
 	input.Close()
+	toClean := regexp.MustCompile(`^(/tmp/\d+-gs-up/)`).FindStringSubmatch(newBinaryPath)
+	if len(toClean) > 1 {
+		os.RemoveAll(toClean[0])
+	}
 	output.Close()
 	// Запускаем новый процесс
 	u.Log.Info("Launching new version...", slog.String("path", targetPath))
@@ -310,10 +313,6 @@ func (u *Updater) InstallAndRestart(newBinaryPath string) error {
 	if err = cmd.Start(); err != nil {
 		return err
 	}
-	// if err := syscall.Exec(targetPath, os.Args, os.Environ()); err != nil {
-	// 	u.Log.Error("Failed to run new version automatickly", slog.String("err", err.Error()))
-	// 	return err
-	// }
 	u.Log.Info("Shutting down")
 	os.Exit(0)
 	return errors.New("failed to shutdown the process")