diff --git a/os-images/AWS/fedora/fedora-39-arm64.pkrvars.hcl b/os-images/AWS/fedora/fedora-39-arm64.pkrvars.hcl
deleted file mode 100644
index 52cb5116b..000000000
--- a/os-images/AWS/fedora/fedora-39-arm64.pkrvars.hcl
+++ /dev/null
@@ -1,2 +0,0 @@
-ami_filter    = "Fedora-Cloud-Base-39-*.aarch64-hvm-*-gp3-0"
-instance_type = "m6g.large"
diff --git a/os-images/AWS/fedora/fedora-39-x86_64.pkrvars.hcl b/os-images/AWS/fedora/fedora-39-x86_64.pkrvars.hcl
deleted file mode 100644
index dc91c3192..000000000
--- a/os-images/AWS/fedora/fedora-39-x86_64.pkrvars.hcl
+++ /dev/null
@@ -1,2 +0,0 @@
-ami_filter    = "Fedora-Cloud-Base-39-*.x86_64-hvm-*-gp3-0"
-instance_type = "t3a.large"
diff --git a/os-images/AWS/fedora/fedora-40-arm64.pkrvars.hcl b/os-images/AWS/fedora/fedora-40-arm64.pkrvars.hcl
new file mode 100644
index 000000000..7bf014348
--- /dev/null
+++ b/os-images/AWS/fedora/fedora-40-arm64.pkrvars.hcl
@@ -0,0 +1,2 @@
+ami_filter    = "Fedora-Cloud-Base-AmazonEC2.aarch64-40-*-hvm-*-gp3-0"
+instance_type = "m6g.large"
diff --git a/os-images/AWS/fedora/fedora-40-x86_64.pkrvars.hcl b/os-images/AWS/fedora/fedora-40-x86_64.pkrvars.hcl
new file mode 100644
index 000000000..b8db245d1
--- /dev/null
+++ b/os-images/AWS/fedora/fedora-40-x86_64.pkrvars.hcl
@@ -0,0 +1,2 @@
+ami_filter    = "Fedora-Cloud-Base-AmazonEC2.x86_64-40-*-hvm-*-gp3-0"
+instance_type = "t3a.large"