diff --git a/CHANGES.md b/CHANGES.md
index 66fa3e2ec..cc2e337cf 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -22,6 +22,11 @@ Notable changes between versions.
 * Deprecate `asset_dir` variable and remove docs ([#678](https://github.com/poseidon/typhoon/pull/678))
 * Deprecate support for [gitRepo](https://kubernetes.io/docs/concepts/storage/volumes/#gitrepo) volumes. A future release will drop support.
 
+#### AWS
+
+* Fix Fedora CoreOS AMI to filter for stable images ([#685](https://github.com/poseidon/typhoon/pull/685))
+  * Latest Fedora CoreOS `testing` or `bodhi-update` images could be chosen depending on the region
+
 #### DigitalOcean
 
 * Rename `image` variable to `os_image` for consistency ([#677](https://github.com/poseidon/typhoon/pull/677)) (action required)
diff --git a/aws/fedora-coreos/kubernetes/ami.tf b/aws/fedora-coreos/kubernetes/ami.tf
index c6da3b368..e32ce159f 100644
--- a/aws/fedora-coreos/kubernetes/ami.tf
+++ b/aws/fedora-coreos/kubernetes/ami.tf
@@ -18,6 +18,11 @@ data "aws_ami" "fedora-coreos" {
     values = ["fedora-coreos-31.*.*.*-hvm"]
   }
 
+  filter {
+    name   = "description"
+    values = ["Fedora CoreOS stable*"]
+  }
+
   # try to filter out dev images (AWS filters can't)
   name_regex = "^fedora-coreos-31.[0-9]*.[0-9]*.[0-9]*-hvm*"
 }
diff --git a/aws/fedora-coreos/kubernetes/workers/ami.tf b/aws/fedora-coreos/kubernetes/workers/ami.tf
index c6da3b368..e32ce159f 100644
--- a/aws/fedora-coreos/kubernetes/workers/ami.tf
+++ b/aws/fedora-coreos/kubernetes/workers/ami.tf
@@ -18,6 +18,11 @@ data "aws_ami" "fedora-coreos" {
     values = ["fedora-coreos-31.*.*.*-hvm"]
   }
 
+  filter {
+    name   = "description"
+    values = ["Fedora CoreOS stable*"]
+  }
+
   # try to filter out dev images (AWS filters can't)
   name_regex = "^fedora-coreos-31.[0-9]*.[0-9]*.[0-9]*-hvm*"
 }