backport of commit 00ffef1e90 (#6510)

Co-authored-by: Michael Li <michael.li@hashicorp.com>

enos/modules/aws_vpc/main.tf

@@ -70,10 +70,14 @@ data "aws_ami" "ubuntu" {
   most_recent = true
   count       = length(local.architecture_filters)
 
-  # Currently latest LTS-1
   filter {
     name   = "name"
-    values = ["ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-*-server-*"]
+    values = ["hc-base-ubuntu-2404-*"]
+  }
+
+  filter {
+    name   = "state"
+    values = ["available"]
   }
 
   filter {
@@ -86,7 +90,7 @@ data "aws_ami" "ubuntu" {
     values = [local.architecture_filters[count.index]]
   }
 
-  owners = ["099720109477"] # Canonical
+  owners = ["888995627335"] # ami-prod account
 }
 
 data "aws_ami" "rhel" {

enos/modules/aws_vpc_ipv6/main.tf

@@ -107,10 +107,14 @@ data "aws_ami" "ubuntu" {
   most_recent = true
   count       = length(local.architecture_filters)
 
-  # Currently latest LTS-1
   filter {
     name   = "name"
-    values = ["ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-*-server-*"]
+    values = ["hc-base-ubuntu-2204-*"]
+  }
+
+  filter {
+    name   = "state"
+    values = ["available"]
   }
 
   filter {
@@ -123,7 +127,7 @@ data "aws_ami" "ubuntu" {
     values = [local.architecture_filters[count.index]]
   }
 
-  owners = ["099720109477"] # Canonical
+  owners = ["888995627335"] # ami-prod account
 }
 
 data "aws_ami" "rhel" {