diff --git a/cmd/spinifex/cmd/admin.go b/cmd/spinifex/cmd/admin.go
index c4d37991b..7c4208480 100644
--- a/cmd/spinifex/cmd/admin.go
+++ b/cmd/spinifex/cmd/admin.go
@@ -1753,7 +1753,7 @@ func runAdminJoin(cmd *cobra.Command, args []string) {
 		}
 
 		fmt.Printf("   Waiting for cluster formation... (%d/%d nodes joined)\n", statusResp.Joined, statusResp.Expected)
-		time.Sleep(2 * time.Second)
+		time.Sleep(500 * time.Millisecond)
 	}
 
 	fmt.Printf("✅ Cluster formation complete! (%d nodes)\n\n", statusResp.Expected)
diff --git a/cmd/spinifex/cmd/cluster.go b/cmd/spinifex/cmd/cluster.go
index 1dd6dd1f2..2a08c1b99 100644
--- a/cmd/spinifex/cmd/cluster.go
+++ b/cmd/spinifex/cmd/cluster.go
@@ -98,7 +98,7 @@ func runClusterShutdown(cmd *cobra.Command, args []string) {
 			}
 			nc.Flush()
 			// Wait briefly for messages to propagate
-			time.Sleep(2 * time.Second)
+			time.Sleep(200 * time.Millisecond)
 			fmt.Printf("[INFRA] Complete\n")
 			break
 		}
diff --git a/spinifex/daemon/shutdown.go b/spinifex/daemon/shutdown.go
index 0a2fac620..eb9a88e89 100644
--- a/spinifex/daemon/shutdown.go
+++ b/spinifex/daemon/shutdown.go
@@ -7,7 +7,6 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"time"
 
 	"github.com/mulgadc/spinifex/spinifex/utils"
 	"github.com/nats-io/nats.go"
@@ -263,8 +262,6 @@ func (d *Daemon) handleShutdownInfra(msg *nats.Msg) {
 
 	slog.Info("Shutdown INFRA phase complete, exiting", "node", d.node)
 
-	// Give a moment for log flush
-	time.Sleep(500 * time.Millisecond)
 	os.Exit(0)
 }