diff --git a/pkg/api/helpers.go b/pkg/api/helpers.go
index 876799d5e0..13d4fcbb61 100644
--- a/pkg/api/helpers.go
+++ b/pkg/api/helpers.go
@@ -566,7 +566,11 @@ func WaitForServerReady(api *ScalewayAPI, serverID, gateway string) (*ScalewaySe
 		}
 
 		if gateway == "" {
-			dest := fmt.Sprintf("%s:22", server.PublicAddress.IP)
+			ip := server.PublicAddress.IP
+			if ip == "" && server.EnableIPV6 {
+				ip = fmt.Sprintf("[%s]", server.IPV6.Address)
+			}
+			dest := fmt.Sprintf("%s:22", ip)
 			log.Debugf("Waiting for server SSH port %s", dest)
 			err = utils.WaitForTCPPortOpen(dest)
 			if err != nil {