diff --git a/test_framework/terraform/aws/oracle/k3s_instances.tf b/test_framework/terraform/aws/oracle/k3s_instances.tf
index 8c8ff8f821..4a0269a120 100644
--- a/test_framework/terraform/aws/oracle/k3s_instances.tf
+++ b/test_framework/terraform/aws/oracle/k3s_instances.tf
@@ -42,6 +42,8 @@ resource "aws_instance" "lh_aws_instance_worker_k3s" {
 
   count = var.k8s_distro_name == "k3s" ? var.lh_aws_instance_count_worker : 0
 
+  associate_public_ip_address = true
+
   availability_zone = var.aws_availability_zone
 
   ami           = data.aws_ami.aws_ami_oraclelinux.id
diff --git a/test_framework/terraform/aws/oracle/main.tf b/test_framework/terraform/aws/oracle/main.tf
index 4b22f7a21f..46db0b0114 100644
--- a/test_framework/terraform/aws/oracle/main.tf
+++ b/test_framework/terraform/aws/oracle/main.tf
@@ -85,6 +85,14 @@ resource "aws_security_group" "lh_aws_secgrp_controlplane" {
     cidr_blocks = ["0.0.0.0/0"]
   }
 
+  ingress {
+    description = "Allow longhorn-ui nodeport"
+    from_port   = 30000
+    to_port     = 30000
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+
   ingress {
     description = "Allow UDP connection for longhorn-webhooks"
     from_port   = 0
@@ -114,13 +122,20 @@ resource "aws_security_group" "lh_aws_secgrp_controlplane" {
   }
 }
 
-
 # Create worker security group
 resource "aws_security_group" "lh_aws_secgrp_worker" {
   name        = "lh_aws_secgrp_worker"
   description = "Allow all inbound traffic"
   vpc_id      = aws_vpc.lh_aws_vpc.id
 
+  ingress {
+    description = "Allow SSH"
+    from_port   = 22
+    to_port     = 22
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+
   ingress {
     description = "Allow HTTP"
     from_port   = 80
@@ -158,7 +173,6 @@ resource "aws_security_group" "lh_aws_secgrp_worker" {
   }
 }
 
-
 # Create Public subnet
 resource "aws_subnet" "lh_aws_public_subnet" {
   vpc_id     = aws_vpc.lh_aws_vpc.id
@@ -183,35 +197,6 @@ resource "aws_subnet" "lh_aws_private_subnet" {
   }
 }
 
-# Create EIP for NATGW
-resource "aws_eip" "lh_aws_eip_nat_gw" {
-  vpc      = true
-
-  tags = {
-    Name = "lh_eip_nat_gw-${random_string.random_suffix.id}"
-    Owner = "longhorn-infra"
-  }
-}
-
-# Create nat gateway
-resource "aws_nat_gateway" "lh_aws_nat_gw" {
-  depends_on = [
-    aws_internet_gateway.lh_aws_igw,
-    aws_eip.lh_aws_eip_nat_gw,
-    aws_subnet.lh_aws_public_subnet,
-    aws_subnet.lh_aws_private_subnet
-  ]
-
-  allocation_id = aws_eip.lh_aws_eip_nat_gw.id
-  subnet_id     = aws_subnet.lh_aws_public_subnet.id
-
-  tags = {
-    Name = "lh_eip_nat_gw-${random_string.random_suffix.id}"
-    Owner = "longhorn-infra"
-  }
-}
-
-
 # Create route table for public subnets
 resource "aws_route_table" "lh_aws_public_rt" {
   depends_on = [
@@ -234,14 +219,14 @@ resource "aws_route_table" "lh_aws_public_rt" {
 # Create route table for private subnets
 resource "aws_route_table" "lh_aws_private_rt" {
   depends_on = [
-    aws_nat_gateway.lh_aws_nat_gw
+    aws_internet_gateway.lh_aws_igw,
   ]
 
   vpc_id = aws_vpc.lh_aws_vpc.id
 
   route {
     cidr_block = "0.0.0.0/0"
-    gateway_id = aws_nat_gateway.lh_aws_nat_gw.id
+    gateway_id = aws_internet_gateway.lh_aws_igw.id
   }
 
   tags = {
diff --git a/test_framework/terraform/aws/oracle/rke2_instances.tf b/test_framework/terraform/aws/oracle/rke2_instances.tf
index 618642d4b1..913b7e15b0 100644
--- a/test_framework/terraform/aws/oracle/rke2_instances.tf
+++ b/test_framework/terraform/aws/oracle/rke2_instances.tf
@@ -42,6 +42,8 @@ resource "aws_instance" "lh_aws_instance_worker_rke2" {
 
   count = var.k8s_distro_name == "rke2" ? var.lh_aws_instance_count_worker : 0
 
+  associate_public_ip_address = true
+
   availability_zone = var.aws_availability_zone
 
   ami           = data.aws_ami.aws_ami_oraclelinux.id
diff --git a/test_framework/terraform/aws/oracle/rke_instances.tf b/test_framework/terraform/aws/oracle/rke_instances.tf
index 3f8d3bafb0..fb2ddbc0fd 100644
--- a/test_framework/terraform/aws/oracle/rke_instances.tf
+++ b/test_framework/terraform/aws/oracle/rke_instances.tf
@@ -66,6 +66,8 @@ resource "aws_instance" "lh_aws_instance_worker_rke" {
 
   count = var.k8s_distro_name == "rke" ? var.lh_aws_instance_count_worker : 0
 
+  associate_public_ip_address = true
+
   availability_zone = var.aws_availability_zone
 
   ami           = data.aws_ami.aws_ami_oraclelinux.id
diff --git a/test_framework/terraform/aws/rhel/k3s_instances.tf b/test_framework/terraform/aws/rhel/k3s_instances.tf
index 649f1b0ed9..3735709223 100644
--- a/test_framework/terraform/aws/rhel/k3s_instances.tf
+++ b/test_framework/terraform/aws/rhel/k3s_instances.tf
@@ -42,6 +42,8 @@ resource "aws_instance" "lh_aws_instance_worker_k3s" {
 
   count = var.k8s_distro_name == "k3s" ? var.lh_aws_instance_count_worker : 0
 
+  associate_public_ip_address = true
+
   availability_zone = var.aws_availability_zone
 
   ami           = data.aws_ami.aws_ami_rhel.id
diff --git a/test_framework/terraform/aws/rhel/main.tf b/test_framework/terraform/aws/rhel/main.tf
index 4b22f7a21f..079a657d93 100644
--- a/test_framework/terraform/aws/rhel/main.tf
+++ b/test_framework/terraform/aws/rhel/main.tf
@@ -85,6 +85,14 @@ resource "aws_security_group" "lh_aws_secgrp_controlplane" {
     cidr_blocks = ["0.0.0.0/0"]
   }
 
+  ingress {
+    description = "Allow longhorn-ui nodeport"
+    from_port   = 30000
+    to_port     = 30000
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+
   ingress {
     description = "Allow UDP connection for longhorn-webhooks"
     from_port   = 0
@@ -121,6 +129,14 @@ resource "aws_security_group" "lh_aws_secgrp_worker" {
   description = "Allow all inbound traffic"
   vpc_id      = aws_vpc.lh_aws_vpc.id
 
+  ingress {
+    description = "Allow SSH"
+    from_port   = 22
+    to_port     = 22
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+
   ingress {
     description = "Allow HTTP"
     from_port   = 80
@@ -183,35 +199,6 @@ resource "aws_subnet" "lh_aws_private_subnet" {
   }
 }
 
-# Create EIP for NATGW
-resource "aws_eip" "lh_aws_eip_nat_gw" {
-  vpc      = true
-
-  tags = {
-    Name = "lh_eip_nat_gw-${random_string.random_suffix.id}"
-    Owner = "longhorn-infra"
-  }
-}
-
-# Create nat gateway
-resource "aws_nat_gateway" "lh_aws_nat_gw" {
-  depends_on = [
-    aws_internet_gateway.lh_aws_igw,
-    aws_eip.lh_aws_eip_nat_gw,
-    aws_subnet.lh_aws_public_subnet,
-    aws_subnet.lh_aws_private_subnet
-  ]
-
-  allocation_id = aws_eip.lh_aws_eip_nat_gw.id
-  subnet_id     = aws_subnet.lh_aws_public_subnet.id
-
-  tags = {
-    Name = "lh_eip_nat_gw-${random_string.random_suffix.id}"
-    Owner = "longhorn-infra"
-  }
-}
-
-
 # Create route table for public subnets
 resource "aws_route_table" "lh_aws_public_rt" {
   depends_on = [
@@ -234,14 +221,14 @@ resource "aws_route_table" "lh_aws_public_rt" {
 # Create route table for private subnets
 resource "aws_route_table" "lh_aws_private_rt" {
   depends_on = [
-    aws_nat_gateway.lh_aws_nat_gw
+    aws_internet_gateway.lh_aws_igw,
   ]
 
   vpc_id = aws_vpc.lh_aws_vpc.id
 
   route {
     cidr_block = "0.0.0.0/0"
-    gateway_id = aws_nat_gateway.lh_aws_nat_gw.id
+    gateway_id = aws_internet_gateway.lh_aws_igw.id
   }
 
   tags = {
diff --git a/test_framework/terraform/aws/rhel/rke2_instances.tf b/test_framework/terraform/aws/rhel/rke2_instances.tf
index ec2182cdd2..997433c1c9 100644
--- a/test_framework/terraform/aws/rhel/rke2_instances.tf
+++ b/test_framework/terraform/aws/rhel/rke2_instances.tf
@@ -42,6 +42,8 @@ resource "aws_instance" "lh_aws_instance_worker_rke2" {
 
   count = var.k8s_distro_name == "rke2" ? var.lh_aws_instance_count_worker : 0
 
+  associate_public_ip_address = true
+
   availability_zone = var.aws_availability_zone
 
   ami           = data.aws_ami.aws_ami_rhel.id
diff --git a/test_framework/terraform/aws/rhel/rke_instances.tf b/test_framework/terraform/aws/rhel/rke_instances.tf
index aa237826e8..964de73144 100644
--- a/test_framework/terraform/aws/rhel/rke_instances.tf
+++ b/test_framework/terraform/aws/rhel/rke_instances.tf
@@ -66,6 +66,8 @@ resource "aws_instance" "lh_aws_instance_worker_rke" {
 
   count = var.k8s_distro_name == "rke" ? var.lh_aws_instance_count_worker : 0
 
+  associate_public_ip_address = true
+
   availability_zone = var.aws_availability_zone
 
   ami           = data.aws_ami.aws_ami_rhel.id
diff --git a/test_framework/terraform/aws/rockylinux/k3s_instances.tf b/test_framework/terraform/aws/rockylinux/k3s_instances.tf
index 17836056e1..53c5511fc9 100644
--- a/test_framework/terraform/aws/rockylinux/k3s_instances.tf
+++ b/test_framework/terraform/aws/rockylinux/k3s_instances.tf
@@ -42,6 +42,8 @@ resource "aws_instance" "lh_aws_instance_worker_k3s" {
 
   count = var.k8s_distro_name == "k3s" ? var.lh_aws_instance_count_worker : 0
 
+  associate_public_ip_address = true
+
   availability_zone = var.aws_availability_zone
 
   ami           = data.aws_ami.aws_ami_rockylinux.id
diff --git a/test_framework/terraform/aws/rockylinux/main.tf b/test_framework/terraform/aws/rockylinux/main.tf
index 02cf5120a5..cf6abbbfe6 100644
--- a/test_framework/terraform/aws/rockylinux/main.tf
+++ b/test_framework/terraform/aws/rockylinux/main.tf
@@ -85,6 +85,14 @@ resource "aws_security_group" "lh_aws_secgrp_controlplane" {
     cidr_blocks = ["0.0.0.0/0"]
   }
 
+  ingress {
+    description = "Allow longhorn-ui nodeport"
+    from_port   = 30000
+    to_port     = 30000
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+
   ingress {
     description = "Allow UDP connection for longhorn-webhooks"
     from_port   = 0
@@ -122,6 +130,14 @@ resource "aws_security_group" "lh_aws_secgrp_worker" {
   description = "Allow all inbound traffic"
   vpc_id      = aws_vpc.lh_aws_vpc.id
 
+  ingress {
+    description = "Allow SSH"
+    from_port   = 22
+    to_port     = 22
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+
   ingress {
     description = "Allow HTTP"
     from_port   = 80
@@ -184,35 +200,6 @@ resource "aws_subnet" "lh_aws_private_subnet" {
   }
 }
 
-# Create EIP for NATGW
-resource "aws_eip" "lh_aws_eip_nat_gw" {
-  vpc      = true
-
-  tags = {
-    Name = "lh_eip_nat_gw-${random_string.random_suffix.id}"
-    Owner = "longhorn-infra"
-  }
-}
-
-# Create nat gateway
-resource "aws_nat_gateway" "lh_aws_nat_gw" {
-  depends_on = [
-    aws_internet_gateway.lh_aws_igw,
-    aws_eip.lh_aws_eip_nat_gw,
-    aws_subnet.lh_aws_public_subnet,
-    aws_subnet.lh_aws_private_subnet
-  ]
-
-  allocation_id = aws_eip.lh_aws_eip_nat_gw.id
-  subnet_id     = aws_subnet.lh_aws_public_subnet.id
-
-  tags = {
-    Name = "lh_eip_nat_gw-${random_string.random_suffix.id}"
-    Owner = "longhorn-infra"
-  }
-}
-
-
 # Create route table for public subnets
 resource "aws_route_table" "lh_aws_public_rt" {
   depends_on = [
@@ -235,14 +222,14 @@ resource "aws_route_table" "lh_aws_public_rt" {
 # Create route table for private subnets
 resource "aws_route_table" "lh_aws_private_rt" {
   depends_on = [
-    aws_nat_gateway.lh_aws_nat_gw
+    aws_internet_gateway.lh_aws_igw,
   ]
 
   vpc_id = aws_vpc.lh_aws_vpc.id
 
   route {
     cidr_block = "0.0.0.0/0"
-    gateway_id = aws_nat_gateway.lh_aws_nat_gw.id
+    gateway_id = aws_internet_gateway.lh_aws_igw.id
   }
 
   tags = {
diff --git a/test_framework/terraform/aws/rockylinux/rke2_instances.tf b/test_framework/terraform/aws/rockylinux/rke2_instances.tf
index c910cfb8d7..89c2492d8b 100644
--- a/test_framework/terraform/aws/rockylinux/rke2_instances.tf
+++ b/test_framework/terraform/aws/rockylinux/rke2_instances.tf
@@ -42,6 +42,8 @@ resource "aws_instance" "lh_aws_instance_worker_rke2" {
 
   count = var.k8s_distro_name == "rke2" ? var.lh_aws_instance_count_worker : 0
 
+  associate_public_ip_address = true
+
   availability_zone = var.aws_availability_zone
 
   ami           = data.aws_ami.aws_ami_rockylinux.id
diff --git a/test_framework/terraform/aws/rockylinux/rke_instances.tf b/test_framework/terraform/aws/rockylinux/rke_instances.tf
index 8c9efcd7d3..dc98e4b221 100644
--- a/test_framework/terraform/aws/rockylinux/rke_instances.tf
+++ b/test_framework/terraform/aws/rockylinux/rke_instances.tf
@@ -66,6 +66,8 @@ resource "aws_instance" "lh_aws_instance_worker_rke" {
 
   count = var.k8s_distro_name == "rke" ? var.lh_aws_instance_count_worker : 0
 
+  associate_public_ip_address = true
+
   availability_zone = var.aws_availability_zone
 
   ami           = data.aws_ami.aws_ami_rockylinux.id
diff --git a/test_framework/terraform/aws/sle-micro/main.tf b/test_framework/terraform/aws/sle-micro/main.tf
index 7134f62a2c..aaa7004271 100644
--- a/test_framework/terraform/aws/sle-micro/main.tf
+++ b/test_framework/terraform/aws/sle-micro/main.tf
@@ -85,6 +85,14 @@ resource "aws_security_group" "lh_aws_secgrp_public" {
     cidr_blocks = ["0.0.0.0/0"]
   }
 
+  ingress {
+    description = "Allow longhorn-ui nodeport"
+    from_port   = 30000
+    to_port     = 30000
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+
   ingress {
     description = "Allow UDP connection for longhorn-webhooks"
     from_port   = 0
diff --git a/test_framework/terraform/aws/sles/k3s_instances.tf b/test_framework/terraform/aws/sles/k3s_instances.tf
index f59f2e65ba..892b8ba7a5 100644
--- a/test_framework/terraform/aws/sles/k3s_instances.tf
+++ b/test_framework/terraform/aws/sles/k3s_instances.tf
@@ -41,6 +41,8 @@ resource "aws_instance" "lh_aws_instance_worker_k3s" {
 
   count = var.k8s_distro_name == "k3s" ? var.lh_aws_instance_count_worker : 0
 
+  associate_public_ip_address = true
+
   availability_zone = var.aws_availability_zone
 
   ami           = data.aws_ami.aws_ami_sles.id
diff --git a/test_framework/terraform/aws/sles/main.tf b/test_framework/terraform/aws/sles/main.tf
index 665dd5b946..63acd9c999 100644
--- a/test_framework/terraform/aws/sles/main.tf
+++ b/test_framework/terraform/aws/sles/main.tf
@@ -129,6 +129,14 @@ resource "aws_security_group" "lh_aws_secgrp_worker" {
   description = "Allow all inbound traffic"
   vpc_id      = aws_vpc.lh_aws_vpc.id
 
+  ingress {
+    description = "Allow SSH"
+    from_port   = 22
+    to_port     = 22
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+
   ingress {
     description = "Allow HTTP"
     from_port   = 80
@@ -191,35 +199,6 @@ resource "aws_subnet" "lh_aws_private_subnet" {
   }
 }
 
-# Create EIP for NATGW
-resource "aws_eip" "lh_aws_eip_nat_gw" {
-  vpc      = true
-
-  tags = {
-    Name = "lh_eip_nat_gw-${random_string.random_suffix.id}"
-    Owner = var.resources_owner
-  }
-}
-
-# Create nat gateway
-resource "aws_nat_gateway" "lh_aws_nat_gw" {
-  depends_on = [
-    aws_internet_gateway.lh_aws_igw,
-    aws_eip.lh_aws_eip_nat_gw,
-    aws_subnet.lh_aws_public_subnet,
-    aws_subnet.lh_aws_private_subnet
-  ]
-
-  allocation_id = aws_eip.lh_aws_eip_nat_gw.id
-  subnet_id     = aws_subnet.lh_aws_public_subnet.id
-
-  tags = {
-    Name = "lh_eip_nat_gw-${random_string.random_suffix.id}"
-    Owner = var.resources_owner
-  }
-}
-
-
 # Create route table for public subnets
 resource "aws_route_table" "lh_aws_public_rt" {
   depends_on = [
@@ -242,14 +221,14 @@ resource "aws_route_table" "lh_aws_public_rt" {
 # Create route table for private subnets
 resource "aws_route_table" "lh_aws_private_rt" {
   depends_on = [
-    aws_nat_gateway.lh_aws_nat_gw
+    aws_internet_gateway.lh_aws_igw,
   ]
 
   vpc_id = aws_vpc.lh_aws_vpc.id
 
   route {
     cidr_block = "0.0.0.0/0"
-    gateway_id = aws_nat_gateway.lh_aws_nat_gw.id
+    gateway_id = aws_internet_gateway.lh_aws_igw.id
   }
 
   tags = {
diff --git a/test_framework/terraform/aws/sles/rke2_instances.tf b/test_framework/terraform/aws/sles/rke2_instances.tf
index 3ed6cade16..984b7276b3 100644
--- a/test_framework/terraform/aws/sles/rke2_instances.tf
+++ b/test_framework/terraform/aws/sles/rke2_instances.tf
@@ -41,6 +41,8 @@ resource "aws_instance" "lh_aws_instance_worker_rke2" {
 
   count = var.k8s_distro_name == "rke2" ? var.lh_aws_instance_count_worker : 0
 
+  associate_public_ip_address = true
+
   availability_zone = var.aws_availability_zone
 
   ami           = data.aws_ami.aws_ami_sles.id
@@ -125,6 +127,6 @@ resource "null_resource" "rsync_kubeconfig_file_rke2" {
   }
 
   provisioner "local-exec" {
-    command = "rsync -aPvz --rsync-path=\"sudo rsync\" -e \"ssh -o StrictHostKeyChecking=no -l ec2-user -i ${var.aws_ssh_private_key_file_path}\" ${aws_eip.lh_aws_eip_controlplane[0].public_ip}:/etc/rancher/rke2/rke2.yaml .  && sed -i 's#https://127.0.0.1:6443#https://${aws_eip.lh_aws_eip_controlplane[0].public_ip}:6443#' rke2.yaml" 
+    command = "rsync -aPvz --rsync-path=\"sudo rsync\" -e \"ssh -o StrictHostKeyChecking=no -l ec2-user -i ${var.aws_ssh_private_key_file_path}\" ${aws_eip.lh_aws_eip_controlplane[0].public_ip}:/etc/rancher/rke2/rke2.yaml .  && sed -i 's#https://127.0.0.1:6443#https://${aws_eip.lh_aws_eip_controlplane[0].public_ip}:6443#' rke2.yaml"
   }
 }
diff --git a/test_framework/terraform/aws/sles/rke_instances.tf b/test_framework/terraform/aws/sles/rke_instances.tf
index b629d33037..da43986ace 100644
--- a/test_framework/terraform/aws/sles/rke_instances.tf
+++ b/test_framework/terraform/aws/sles/rke_instances.tf
@@ -65,6 +65,8 @@ resource "aws_instance" "lh_aws_instance_worker_rke" {
 
   count = var.k8s_distro_name == "rke" ? var.lh_aws_instance_count_worker : 0
 
+  associate_public_ip_address = true
+
   availability_zone = var.aws_availability_zone
 
   ami           = data.aws_ami.aws_ami_sles.id
diff --git a/test_framework/terraform/aws/sles/variables.tf b/test_framework/terraform/aws/sles/variables.tf
index 6e683a7d55..e7d76ec5e7 100644
--- a/test_framework/terraform/aws/sles/variables.tf
+++ b/test_framework/terraform/aws/sles/variables.tf
@@ -31,7 +31,7 @@ variable "arch" {
 
 variable "os_distro_version" {
   type        = string
-  default     = "15-sp4"
+  default     = "15-sp5"
 }
 
 variable "aws_ami_sles_account_number" {
diff --git a/test_framework/terraform/aws/ubuntu/k3s_instaces.tf b/test_framework/terraform/aws/ubuntu/k3s_instaces.tf
index b511f66173..3bbe2bbdc7 100644
--- a/test_framework/terraform/aws/ubuntu/k3s_instaces.tf
+++ b/test_framework/terraform/aws/ubuntu/k3s_instaces.tf
@@ -41,6 +41,8 @@ resource "aws_instance" "lh_aws_instance_worker_k3s" {
   ]
 
   count = var.k8s_distro_name == "k3s" ? var.lh_aws_instance_count_worker : 0
+
+  associate_public_ip_address = true
   
   availability_zone = var.aws_availability_zone
   
diff --git a/test_framework/terraform/aws/ubuntu/main.tf b/test_framework/terraform/aws/ubuntu/main.tf
index 5ce977a111..1177e2b243 100644
--- a/test_framework/terraform/aws/ubuntu/main.tf
+++ b/test_framework/terraform/aws/ubuntu/main.tf
@@ -77,6 +77,13 @@ resource "aws_security_group" "lh_aws_secgrp_controlplane" {
     cidr_blocks = ["0.0.0.0/0"]
   }
 
+  ingress {
+    description = "Allow longhorn-ui nodeport"
+    from_port   = 30000
+    to_port     = 30000
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
 
   ingress {
     description = "Allow k8s API server port"
@@ -123,6 +130,14 @@ resource "aws_security_group" "lh_aws_secgrp_worker" {
   description = "Allow all inbound traffic"
   vpc_id      = aws_vpc.lh_aws_vpc.id
 
+  ingress {
+    description = "Allow SSH"
+    from_port   = 22
+    to_port     = 22
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+
   ingress {
     description = "Allow HTTP"
     from_port   = 80
@@ -185,35 +200,6 @@ resource "aws_subnet" "lh_aws_private_subnet" {
   }
 }
 
-# Create EIP for NATGW
-resource "aws_eip" "lh_aws_eip_nat_gw" {
-  vpc      = true
-
-  tags = {
-    Name = "lh_eip_nat_gw-${random_string.random_suffix.id}"
-    Owner = "longhorn-infra"
-  }
-}
-
-# Create nat gateway
-resource "aws_nat_gateway" "lh_aws_nat_gw" {
-  depends_on = [
-    aws_internet_gateway.lh_aws_igw,
-    aws_eip.lh_aws_eip_nat_gw,
-    aws_subnet.lh_aws_public_subnet,
-    aws_subnet.lh_aws_private_subnet
-  ]
-
-  allocation_id = aws_eip.lh_aws_eip_nat_gw.id
-  subnet_id     = aws_subnet.lh_aws_public_subnet.id
-
-  tags = {
-    Name = "lh_eip_nat_gw-${random_string.random_suffix.id}"
-    Owner = "longhorn-infra"
-  }
-}
-
-
 # Create route table for public subnets
 resource "aws_route_table" "lh_aws_public_rt" {
   depends_on = [
@@ -236,14 +222,14 @@ resource "aws_route_table" "lh_aws_public_rt" {
 # Create route table for private subnets
 resource "aws_route_table" "lh_aws_private_rt" {
   depends_on = [
-    aws_nat_gateway.lh_aws_nat_gw
+    aws_internet_gateway.lh_aws_igw,
   ]
 
   vpc_id = aws_vpc.lh_aws_vpc.id
 
   route {
     cidr_block = "0.0.0.0/0"
-    gateway_id = aws_nat_gateway.lh_aws_nat_gw.id
+    gateway_id = aws_internet_gateway.lh_aws_igw.id
   }
 
   tags = {
diff --git a/test_framework/terraform/aws/ubuntu/rke2_instances.tf b/test_framework/terraform/aws/ubuntu/rke2_instances.tf
index 78db0b0844..3b65112e03 100644
--- a/test_framework/terraform/aws/ubuntu/rke2_instances.tf
+++ b/test_framework/terraform/aws/ubuntu/rke2_instances.tf
@@ -41,6 +41,8 @@ resource "aws_instance" "lh_aws_instance_worker_rke2" {
   ]
 
   count = var.k8s_distro_name == "rke2" ? var.lh_aws_instance_count_worker : 0
+
+  associate_public_ip_address = true
   
   availability_zone = var.aws_availability_zone
   
diff --git a/test_framework/terraform/aws/ubuntu/rke_instances.tf b/test_framework/terraform/aws/ubuntu/rke_instances.tf
index 56ea1888e9..3763c393a3 100644
--- a/test_framework/terraform/aws/ubuntu/rke_instances.tf
+++ b/test_framework/terraform/aws/ubuntu/rke_instances.tf
@@ -65,6 +65,8 @@ resource "aws_instance" "lh_aws_instance_worker_rke" {
   ]
 
   count = var.k8s_distro_name == "rke" ? var.lh_aws_instance_count_worker : 0
+
+  associate_public_ip_address = true
   
   availability_zone = var.aws_availability_zone