diff --git a/assets/aws/Makefile b/assets/aws/Makefile
index 7692e64c604..8ccf8b1ef6d 100644
--- a/assets/aws/Makefile
+++ b/assets/aws/Makefile
@@ -14,7 +14,7 @@ AWS_REGION ?= us-west-2
 # This must be a _released_ version of Teleport, i.e. one which has binaries
 # available for download on https://gravitational.com/teleport/download
 # Unreleased versions will fail to build.
-TELEPORT_VERSION ?= 12.0.2
+TELEPORT_VERSION ?= 12.0.4
 
 # Teleport UID is the UID of a non-privileged 'teleport' user
 TELEPORT_UID ?= 1007
diff --git a/examples/aws/terraform/AMIS.md b/examples/aws/terraform/AMIS.md
index 9a2e7cefbdf..789fabbfeef 100644
--- a/examples/aws/terraform/AMIS.md
+++ b/examples/aws/terraform/AMIS.md
@@ -6,65 +6,65 @@ is updated when new AMI versions are released.
 ### OSS
 
 ```
-# eu-north-1 v12.0.2 OSS: ami-04aa6fdce7edbf9b4
-# ap-south-1 v12.0.2 OSS: ami-097442ce7e1efe2bd
-# eu-west-1 v12.0.2 OSS: ami-0c2fa170aba09e305
-# eu-west-2 v12.0.2 OSS: ami-0c97756e25a15ac5a
-# eu-west-3 v12.0.2 OSS: ami-062ab5a698688922d
-# ap-northeast-1 v12.0.2 OSS: ami-0c55c6b488aea23f2
-# ap-northeast-2 v12.0.2 OSS: ami-0d70a6ff630ada2b1
-# ap-northeast-3 v12.0.2 OSS: ami-0c6349d46f13d287a
-# sa-east-1 v12.0.2 OSS: ami-04fafb4e57d99d0ba
-# ca-central-1 v12.0.2 OSS: ami-0ed25bd66177ad189
-# ap-southeast-1 v12.0.2 OSS: ami-02c08286635b18b2e
-# ap-southeast-2 v12.0.2 OSS: ami-0825b8238c22e0e1d
-# eu-central-1 v12.0.2 OSS: ami-0fce684f36adfe05e
-# us-east-1 v12.0.2 OSS: ami-0aff471d81d011275
-# us-east-2 v12.0.2 OSS: ami-048a29080848189fa
-# us-west-1 v12.0.2 OSS: ami-07ea31f1b049525a7
-# us-west-2 v12.0.2 OSS: ami-0ff7b11f5376a6d01
+# eu-north-1 v12.0.4 OSS: ami-0f71d8a502ebf6d37
+# ap-south-1 v12.0.4 OSS: ami-0020971aaf11c5385
+# eu-west-1 v12.0.4 OSS: ami-04d5221f8bbb2e9fb
+# eu-west-2 v12.0.4 OSS: ami-0b5fa78f736f49a27
+# eu-west-3 v12.0.4 OSS: ami-0c04f382583a350e3
+# ap-northeast-1 v12.0.4 OSS: ami-0558caa4287466f54
+# ap-northeast-2 v12.0.4 OSS: ami-0c791f4580d08596d
+# ap-northeast-3 v12.0.4 OSS: ami-01db047877df646f8
+# sa-east-1 v12.0.4 OSS: ami-05264ca4609ff4957
+# ca-central-1 v12.0.4 OSS: ami-0b9f5e945e7f149e1
+# ap-southeast-1 v12.0.4 OSS: ami-01b549a68dccf40f6
+# ap-southeast-2 v12.0.4 OSS: ami-04ebc1ba209e2f951
+# eu-central-1 v12.0.4 OSS: ami-0f15e267776d982ff
+# us-east-1 v12.0.4 OSS: ami-0cb56423d5a386af9
+# us-east-2 v12.0.4 OSS: ami-0c5e71f91c72b643c
+# us-west-1 v12.0.4 OSS: ami-025bc9c98f4455156
+# us-west-2 v12.0.4 OSS: ami-0514cfeb52926d0a2
 ```
 
 ### Enterprise
 
 ```
-# eu-north-1 v12.0.2 Enterprise: ami-0197941029f08d0c8
-# ap-south-1 v12.0.2 Enterprise: ami-0b16f6b18e39feb55
-# eu-west-1 v12.0.2 Enterprise: ami-0c3485c850b48ec81
-# eu-west-2 v12.0.2 Enterprise: ami-0a992f47e2c8fcf46
-# eu-west-3 v12.0.2 Enterprise: ami-0d077d40a464b0c59
-# ap-northeast-1 v12.0.2 Enterprise: ami-037cc340a14be59f4
-# ap-northeast-2 v12.0.2 Enterprise: ami-03594babd8af6fbf9
-# ap-northeast-3 v12.0.2 Enterprise: ami-0e05265ef10e22981
-# sa-east-1 v12.0.2 Enterprise: ami-0a8e140c5ef76cc44
-# ca-central-1 v12.0.2 Enterprise: ami-0b520f103e5e0f0a1
-# ap-southeast-1 v12.0.2 Enterprise: ami-0c6b5889f847154ea
-# ap-southeast-2 v12.0.2 Enterprise: ami-0c12087599135e943
-# eu-central-1 v12.0.2 Enterprise: ami-0c27577c9c713d0e7
-# us-east-1 v12.0.2 Enterprise: ami-0107529b8f43946e2
-# us-east-2 v12.0.2 Enterprise: ami-060ba59493d4a6b9a
-# us-west-1 v12.0.2 Enterprise: ami-02f957ab42d83fbc9
-# us-west-2 v12.0.2 Enterprise: ami-0f0eb204d4134a24f
+# eu-north-1 v12.0.4 Enterprise: ami-0a46efa56e03c6233
+# ap-south-1 v12.0.4 Enterprise: ami-02d2a7d945e1a7d08
+# eu-west-1 v12.0.4 Enterprise: ami-0e86ee9ad304729e3
+# eu-west-2 v12.0.4 Enterprise: ami-09c7f009c6fcb7c96
+# eu-west-3 v12.0.4 Enterprise: ami-032616dbfe09268d0
+# ap-northeast-1 v12.0.4 Enterprise: ami-0263fead9b1c5e775
+# ap-northeast-2 v12.0.4 Enterprise: ami-05e8cdecb2ccf5601
+# ap-northeast-3 v12.0.4 Enterprise: ami-07fc3abebd63d4c8b
+# sa-east-1 v12.0.4 Enterprise: ami-059435711e166d7be
+# ca-central-1 v12.0.4 Enterprise: ami-0271ebf2c70730970
+# ap-southeast-1 v12.0.4 Enterprise: ami-0e915db6d8f9b90a0
+# ap-southeast-2 v12.0.4 Enterprise: ami-0a5155ebc04f36107
+# eu-central-1 v12.0.4 Enterprise: ami-0da2036e1e1bc9935
+# us-east-1 v12.0.4 Enterprise: ami-05883c863ccbba494
+# us-east-2 v12.0.4 Enterprise: ami-083bec54225972d62
+# us-west-1 v12.0.4 Enterprise: ami-0b76c5d837edeb503
+# us-west-2 v12.0.4 Enterprise: ami-06c1aa5bda8ee34d2
 ```
 
 ### Enterprise FIPS
 
 ```
-# eu-north-1 v12.0.2 Enterprise FIPS: ami-08461f3ffa14689e6
-# ap-south-1 v12.0.2 Enterprise FIPS: ami-07ac97c9ba8c66510
-# eu-west-1 v12.0.2 Enterprise FIPS: ami-0637946dba7eacdc3
-# eu-west-2 v12.0.2 Enterprise FIPS: ami-033a8855ba01470e8
-# eu-west-3 v12.0.2 Enterprise FIPS: ami-06e1406a3748f1436
-# ap-northeast-1 v12.0.2 Enterprise FIPS: ami-03f42ed5df87244e9
-# ap-northeast-2 v12.0.2 Enterprise FIPS: ami-0d1b3e0694fcba714
-# ap-northeast-3 v12.0.2 Enterprise FIPS: ami-0f570b9b0466461d9
-# sa-east-1 v12.0.2 Enterprise FIPS: ami-0f6bef7bfdc53e361
-# ca-central-1 v12.0.2 Enterprise FIPS: ami-01892cd09abbe250c
-# ap-southeast-1 v12.0.2 Enterprise FIPS: ami-0e204d3bebb0eff2c
-# ap-southeast-2 v12.0.2 Enterprise FIPS: ami-079e4c41a6f78cb9d
-# eu-central-1 v12.0.2 Enterprise FIPS: ami-04d826dac2128d44f
-# us-east-1 v12.0.2 Enterprise FIPS: ami-0786ad10dbddd3dda
-# us-east-2 v12.0.2 Enterprise FIPS: ami-08650e825873bc3cf
-# us-west-1 v12.0.2 Enterprise FIPS: ami-073ac4cc7bfc5390b
-# us-west-2 v12.0.2 Enterprise FIPS: ami-0dd104bffd7c88f24
+# eu-north-1 v12.0.4 Enterprise FIPS: ami-016236e767c17519c
+# ap-south-1 v12.0.4 Enterprise FIPS: ami-0166c6373cee79d9f
+# eu-west-1 v12.0.4 Enterprise FIPS: ami-0ed673fd9786051e0
+# eu-west-2 v12.0.4 Enterprise FIPS: ami-0f646a839e7c394b7
+# eu-west-3 v12.0.4 Enterprise FIPS: ami-002eaba4717a5ed42
+# ap-northeast-1 v12.0.4 Enterprise FIPS: ami-0030ba3d91969e52c
+# ap-northeast-2 v12.0.4 Enterprise FIPS: ami-0c04e4d2eb60100f7
+# ap-northeast-3 v12.0.4 Enterprise FIPS: ami-060af51940a447f94
+# sa-east-1 v12.0.4 Enterprise FIPS: ami-04c164275b986f67c
+# ca-central-1 v12.0.4 Enterprise FIPS: ami-0841d323428991f83
+# ap-southeast-1 v12.0.4 Enterprise FIPS: ami-0f3bf8623f0c9c46c
+# ap-southeast-2 v12.0.4 Enterprise FIPS: ami-0a50bf394306e9e4b
+# eu-central-1 v12.0.4 Enterprise FIPS: ami-08f6a569409be1f4a
+# us-east-1 v12.0.4 Enterprise FIPS: ami-05afdcfaf01143a33
+# us-east-2 v12.0.4 Enterprise FIPS: ami-07da2a06244b28094
+# us-west-1 v12.0.4 Enterprise FIPS: ami-0232d20b8fd3c8822
+# us-west-2 v12.0.4 Enterprise FIPS: ami-0bb9277c656cd2338
 ```
diff --git a/examples/aws/terraform/ha-autoscale-cluster/README.md b/examples/aws/terraform/ha-autoscale-cluster/README.md
index d27a7f1dd1c..e9f3a714d4c 100644
--- a/examples/aws/terraform/ha-autoscale-cluster/README.md
+++ b/examples/aws/terraform/ha-autoscale-cluster/README.md
@@ -45,7 +45,7 @@ export TF_VAR_cluster_name="teleport.example.com"
 # OSS: aws ec2 describe-images --owners 126027368216 --filters 'Name=name,Values=gravitational-teleport-ami-oss*'
 # Enterprise: aws ec2 describe-images --owners 126027368216 --filters 'Name=name,Values=gravitational-teleport-ami-ent*'
 # FIPS 140-2 images are also available for Enterprise customers, look for '-fips' on the end of the AMI's name
-export TF_VAR_ami_name="gravitational-teleport-ami-ent-12.0.2"
+export TF_VAR_ami_name="gravitational-teleport-ami-ent-12.0.4"
 
 # AWS SSH key name to provision in installed instances, should be available in the region
 export TF_VAR_key_name="example"
diff --git a/examples/aws/terraform/starter-cluster/README.md b/examples/aws/terraform/starter-cluster/README.md
index 624e8592db1..aaaac35fc0d 100644
--- a/examples/aws/terraform/starter-cluster/README.md
+++ b/examples/aws/terraform/starter-cluster/README.md
@@ -86,7 +86,7 @@ TF_VAR_license_path ?= "/path/to/license"
 # OSS: aws ec2 describe-images --owners 126027368216 --filters 'Name=name,Values=gravitational-teleport-ami-oss*'
 # Enterprise: aws ec2 describe-images --owners 126027368216 --filters 'Name=name,Values=gravitational-teleport-ami-ent*'
 # FIPS 140-2 images are also available for Enterprise customers, look for '-fips' on the end of the AMI's name
-TF_VAR_ami_name ?= "gravitational-teleport-ami-ent-12.0.2"
+TF_VAR_ami_name ?= "gravitational-teleport-ami-ent-12.0.4"
 
 # Route 53 hosted zone to use, must be a root zone registered in AWS, e.g. example.com
 TF_VAR_route53_zone ?= "example.com"