diff --git a/enos/modules/docker_boundary/main.tf b/enos/modules/docker_boundary/main.tf
index 3a81a73d1..5cc7f3ccf 100644
--- a/enos/modules/docker_boundary/main.tf
+++ b/enos/modules/docker_boundary/main.tf
@@ -130,8 +130,9 @@ resource "docker_container" "boundary" {
     timeout  = "5s"
     retries  = 5
   }
-  wait     = true
-  must_run = true
+  wait         = true
+  must_run     = true
+  network_mode = "bridge"
   dynamic "networks_advanced" {
     for_each = var.network_name
     content {
diff --git a/enos/modules/docker_ldap/main.tf b/enos/modules/docker_ldap/main.tf
index 43bdba4cd..6b860f9ed 100644
--- a/enos/modules/docker_ldap/main.tf
+++ b/enos/modules/docker_ldap/main.tf
@@ -67,13 +67,12 @@ resource "docker_container" "ldap" {
     })
     file = "/tmp/ldap/group.ldif"
   }
-
-
   healthcheck {
     test = ["CMD", "ldapsearch", "-H", "ldap://localhost", "-b", "${local.domain_dn}", "-D", "${local.admin_dn}", "-w", "${local.admin_password}"]
   }
-  wait     = true
-  must_run = true
+  wait         = true
+  must_run     = true
+  network_mode = "bridge"
   dynamic "networks_advanced" {
     for_each = var.network_name
     content {
diff --git a/enos/modules/docker_minio/main.tf b/enos/modules/docker_minio/main.tf
index ca9c25f66..2d76c3950 100644
--- a/enos/modules/docker_minio/main.tf
+++ b/enos/modules/docker_minio/main.tf
@@ -115,7 +115,8 @@ resource "docker_container" "minio_server" {
     timeout  = "5s"
     retries  = 5
   }
-  wait = true
+  wait         = true
+  network_mode = "bridge"
   dynamic "networks_advanced" {
     for_each = var.network_name
     content {
diff --git a/enos/modules/docker_openssh_server/main.tf b/enos/modules/docker_openssh_server/main.tf
index e78a92ff0..6d81d2b0f 100644
--- a/enos/modules/docker_openssh_server/main.tf
+++ b/enos/modules/docker_openssh_server/main.tf
@@ -66,6 +66,7 @@ resource "docker_container" "openssh_server" {
     "USER_NAME=${var.target_user}",
     "PUBLIC_KEY=${local.public_key}",
   ]
+  network_mode = "bridge"
   dynamic "networks_advanced" {
     for_each = var.network_name
     content {
diff --git a/enos/modules/docker_openssh_server_ca_key/main.tf b/enos/modules/docker_openssh_server_ca_key/main.tf
index 9285271c1..c6cd4bab6 100644
--- a/enos/modules/docker_openssh_server_ca_key/main.tf
+++ b/enos/modules/docker_openssh_server_ca_key/main.tf
@@ -76,6 +76,7 @@ resource "docker_container" "openssh_server" {
     "USER_NAME=${var.target_user}",
     "PUBLIC_KEY=${local.ssh_public_key}",
   ]
+  network_mode = "bridge"
   dynamic "networks_advanced" {
     for_each = var.network_name
     content {
@@ -105,7 +106,7 @@ resource "enos_local_exec" "wait" {
     docker_container.openssh_server
   ]
 
-  inline = ["timeout 30s bash -c 'until ssh -t -t -i ${var.private_key_file_path} -p 2222 -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o IdentitiesOnly=yes ${var.target_user}@localhost hostname; do sleep 2; done'"]
+  inline = ["timeout 60s bash -c 'until ssh -t -t -i ${var.private_key_file_path} -p 2222 -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o IdentitiesOnly=yes ${var.target_user}@localhost hostname; do sleep 2; done'"]
 }
 
 output "user" {
diff --git a/enos/modules/docker_postgres/main.tf b/enos/modules/docker_postgres/main.tf
index 071308190..2a4df84b3 100644
--- a/enos/modules/docker_postgres/main.tf
+++ b/enos/modules/docker_postgres/main.tf
@@ -79,8 +79,9 @@ resource "docker_container" "postgres" {
     timeout  = "5s"
     retries  = 5
   }
-  wait     = true
-  must_run = true
+  wait         = true
+  must_run     = true
+  network_mode = "bridge"
   dynamic "networks_advanced" {
     for_each = var.network_name
     content {
diff --git a/enos/modules/docker_vault/main.tf b/enos/modules/docker_vault/main.tf
index cc09d4ad5..b94a24585 100644
--- a/enos/modules/docker_vault/main.tf
+++ b/enos/modules/docker_vault/main.tf
@@ -59,6 +59,7 @@ resource "docker_container" "vault" {
   capabilities {
     add = ["IPC_LOCK"]
   }
+  network_mode = "bridge"
   dynamic "networks_advanced" {
     for_each = var.network_name
     content {
diff --git a/enos/modules/docker_worker/main.tf b/enos/modules/docker_worker/main.tf
index 93fdc7b86..6ce317208 100644
--- a/enos/modules/docker_worker/main.tf
+++ b/enos/modules/docker_worker/main.tf
@@ -122,8 +122,9 @@ resource "docker_container" "worker" {
     timeout  = "5s"
     retries  = 5
   }
-  wait     = var.worker_led_registration ? false : true
-  must_run = true
+  wait         = var.worker_led_registration ? false : true
+  must_run     = true
+  network_mode = "bridge"
   dynamic "networks_advanced" {
     for_each = var.network_name
     content {