diff --git a/e2e/cluster/cmx/cluster.go b/e2e/cluster/cmx/cluster.go
index 75d37e3f09..91694a9113 100644
--- a/e2e/cluster/cmx/cluster.go
+++ b/e2e/cluster/cmx/cluster.go
@@ -147,10 +147,6 @@ func NewNode(in *ClusterInput, index int, networkID string) (*Node, error) {
 	}
 	node := nodes[0]
 
-	// TODO (@salah): remove this once the bug is fixed in CMX
-	// note: the vm gets marked as ready before the services are actually running
-	time.Sleep(30 * time.Second)
-
 	sshEndpoint, err := getSSHEndpoint(node.ID)
 	if err != nil {
 		return nil, fmt.Errorf("get ssh endpoint for node %s: %v", nodeName, err)
@@ -288,7 +284,7 @@ func (c *Cluster) waitUntilAirgapped(node int) error {
 func (c *Cluster) WaitForReboot() {
 	time.Sleep(30 * time.Second)
 	for i := range c.Nodes {
-		c.refreshSSHEndpoint(i)
+		// c.refreshSSHEndpoint(i)
 		c.waitForClockSync(i)
 	}
 }