diff --git a/letstest/targets/apache2_targets.yaml b/letstest/targets/apache2_targets.yaml
index b81507e8b..fd99c6494 100644
--- a/letstest/targets/apache2_targets.yaml
+++ b/letstest/targets/apache2_targets.yaml
@@ -30,7 +30,7 @@ targets:
     user: admin
   #-----------------------------------------------------------------------------
   # CentOS
-  - ami: ami-9887c6e7
+  - ami: ami-00e87074e52e6c9f9
     name: centos7
     type: centos
     virt: hvm
diff --git a/letstest/targets/targets.yaml b/letstest/targets/targets.yaml
index e83fca6de..27bf1e2b6 100644
--- a/letstest/targets/targets.yaml
+++ b/letstest/targets/targets.yaml
@@ -45,15 +45,13 @@ targets:
     user: ec2-user
   #-----------------------------------------------------------------------------
   # CentOS
-  # These Marketplace AMIs must, irritatingly, have their terms manually
-  # agreed to on the AWS marketplace site for any new AWS account using them...
-  - ami: ami-9887c6e7
+  - ami: ami-00e87074e52e6c9f9
     name: centos7
     type: centos
     virt: hvm
     user: centos
-  - ami: ami-05d7cb15bfbf13b6d
-    name: centos8
+  - ami: ami-0ee70e88eed976a1b
+    name: centos_stream8
     type: centos
     virt: hvm
     user: centos