diff --git a/cmd/cofidectl/cmd/up.go b/cmd/cofidectl/cmd/up.go
index ee82685..45978de 100644
--- a/cmd/cofidectl/cmd/up.go
+++ b/cmd/cofidectl/cmd/up.go
@@ -69,6 +69,11 @@ func (u *UpCommand) UpCmd() *cobra.Command {
 				return err
 			}
 
+			// Wait for spire-server to be ready again.
+			if err := watchAndConfigure(cmd.Context(), ds, trustZones); err != nil {
+				return err
+			}
+
 			return nil
 		},
 	}