diff --git a/modules/scylla/testcontainers/scylla/__init__.py b/modules/scylla/testcontainers/scylla/__init__.py
index ca0f44afb..9ff941765 100644
--- a/modules/scylla/testcontainers/scylla/__init__.py
+++ b/modules/scylla/testcontainers/scylla/__init__.py
@@ -27,7 +27,7 @@ def __init__(self, image="scylladb/scylla:latest", ports_to_expose=(9042,)):
         self.with_exposed_ports(*self.ports_to_expose)
         self.with_command("--skip-wait-for-gossip-to-settle=0")
 
-    @wait_container_is_ready()
+    @wait_container_is_ready(OSError)
     def _connect(self):
         wait_for_logs(self, predicate="Starting listening for CQL clients", timeout=MAX_TRIES)
         cluster = self.get_cluster()
@@ -41,7 +41,6 @@ def start(self):
     def get_cluster(self, **kwargs):
         from cassandra.cluster import Cluster
 
-        container = self.get_wrapped_container()
-        container.reload()
-        hostname = container.attrs["NetworkSettings"]["IPAddress"]
-        return Cluster(contact_points=[hostname], **kwargs)
+        hostname = self.get_container_host_ip()
+        port = self.get_exposed_port(9042)
+        return Cluster(contact_points=[hostname], port=port, **kwargs)