diff --git a/aws/fedora-40-aarch64/main.tf b/aws/fedora-40-aarch64/main.tf
index 6a174ca..e6373c5 100644
--- a/aws/fedora-40-aarch64/main.tf
+++ b/aws/fedora-40-aarch64/main.tf
@@ -2,7 +2,7 @@ module "aws" {
   source = "../_base"
 
   name                 = "fedora-40-aarch64"
-  ami                  = "ami-0d3e0038228315b8f"
+  ami                  = "ami-0303e6ec7a784bad8"
   instance_types       = ["m6g.large", "m6gd.large", "m7g.large", "m7gd.large"]
   internal_network     = var.internal_network
   job_name             = var.job_name
diff --git a/aws/fedora-40-x86_64/main.tf b/aws/fedora-40-x86_64/main.tf
index 7cc82f4..e1f3ee9 100644
--- a/aws/fedora-40-x86_64/main.tf
+++ b/aws/fedora-40-x86_64/main.tf
@@ -2,7 +2,7 @@ module "aws" {
   source = "../_base"
 
   name                 = "fedora-40-x86_64"
-  ami                  = "ami-062e54a8a8d3a1f62"
+  ami                  = "ami-0e8cd0df8d3374a24"
   instance_types       = ["m5.large", "m5d.large", "m5a.large", "m5ad.large", "m6a.large", "m6i.large", "m6id.large", "m7i.large", "m7a.large"]
   internal_network     = var.internal_network
   job_name             = var.job_name
diff --git a/rhos-01/fedora-40-x86_64-large/main.tf b/rhos-01/fedora-40-x86_64-large/main.tf
index f024e9c..bc0982a 100644
--- a/rhos-01/fedora-40-x86_64-large/main.tf
+++ b/rhos-01/fedora-40-x86_64-large/main.tf
@@ -2,7 +2,7 @@ module "openstack" {
   source = "../_base"
 
   name      = "fedora-40"
-  image_id  = "7c48753e-bac0-4526-aec2-07a1d3e8eaf3"
+  image_id  = "d60860fe-1596-4481-a36f-bfaeb536b8c7"
   flavor_id = "2c6908ed-bb2b-43c7-8f9d-de790df5a4c0"
 }
 
diff --git a/rhos-01/fedora-40-x86_64/main.tf b/rhos-01/fedora-40-x86_64/main.tf
index a478eaf..081fd95 100644
--- a/rhos-01/fedora-40-x86_64/main.tf
+++ b/rhos-01/fedora-40-x86_64/main.tf
@@ -2,7 +2,7 @@ module "openstack" {
   source = "../_base"
 
   name      = "fedora-40"
-  image_id  = "7c48753e-bac0-4526-aec2-07a1d3e8eaf3"
+  image_id  = "d60860fe-1596-4481-a36f-bfaeb536b8c7"
   flavor_id = "bca7d8ab-b1a4-4883-b4c6-a9536d51ebdd"
 }