From b732dd5d74b298fa27d43db211469dee85101a87 Mon Sep 17 00:00:00 2001
From: Michael Li <michael.li@hashicorp.com>
Date: Fri, 20 Mar 2026 09:39:07 -0400
Subject: [PATCH] chore(e2e): Use approved base image (#6448)

---
 enos/modules/aws_vpc/main.tf      | 10 +++++++---
 enos/modules/aws_vpc_ipv6/main.tf | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/enos/modules/aws_vpc/main.tf b/enos/modules/aws_vpc/main.tf
index 5190f558c..e517c00b0 100644
--- a/enos/modules/aws_vpc/main.tf
+++ b/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" {
diff --git a/enos/modules/aws_vpc_ipv6/main.tf b/enos/modules/aws_vpc_ipv6/main.tf
index 524169a70..a9ed14b94 100644
--- a/enos/modules/aws_vpc_ipv6/main.tf
+++ b/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" {