diff --git a/assets/aws/Makefile b/assets/aws/Makefile
index e65933213f99b..d1861b76cb0c1 100644
--- a/assets/aws/Makefile
+++ b/assets/aws/Makefile
@@ -2,7 +2,7 @@
 # This must be a _released_ version of Teleport, i.e. one which has binaries
 # available for download on https://goteleport.com/download
 # Unreleased versions will fail to build.
-TELEPORT_VERSION ?= 16.4.6
+TELEPORT_VERSION ?= 16.4.7
 
 # 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 87ccac2e7b33e..4e39778b4eae9 100644
--- a/examples/aws/terraform/AMIS.md
+++ b/examples/aws/terraform/AMIS.md
@@ -6,116 +6,116 @@ This list is updated when new AMI versions are released.
 ### OSS
 
 ```
-# ap-northeast-1 v16.4.6 arm64 OSS: ami-0307b5460949a2d09
-# ap-northeast-1 v16.4.6 x86_64 OSS: ami-0dfab44a54daa6774
-# ap-northeast-2 v16.4.6 arm64 OSS: ami-0e55fd0db3d73dac8
-# ap-northeast-2 v16.4.6 x86_64 OSS: ami-0b8383b49bc5da0a3
-# ap-northeast-3 v16.4.6 arm64 OSS: ami-028c94128392137d3
-# ap-northeast-3 v16.4.6 x86_64 OSS: ami-0d125ae89b4371a18
-# ap-south-1 v16.4.6 arm64 OSS: ami-044c55ce57c90a643
-# ap-south-1 v16.4.6 x86_64 OSS: ami-0abbfcf08a8e28c0e
-# ap-southeast-1 v16.4.6 arm64 OSS: ami-0e49484dca4bb8fb4
-# ap-southeast-1 v16.4.6 x86_64 OSS: ami-0d23cc1ba5cc1ebea
-# ap-southeast-2 v16.4.6 arm64 OSS: ami-07ebd854df12f216a
-# ap-southeast-2 v16.4.6 x86_64 OSS: ami-0c22e4641198f8bec
-# ca-central-1 v16.4.6 arm64 OSS: ami-0c143a08dcf5ca3fd
-# ca-central-1 v16.4.6 x86_64 OSS: ami-0c16191afc3fb654a
-# eu-central-1 v16.4.6 arm64 OSS: ami-0551d4f5aeede709e
-# eu-central-1 v16.4.6 x86_64 OSS: ami-0cd3c4404ebac1b6d
-# eu-north-1 v16.4.6 arm64 OSS: ami-001a29d66d3f99d0c
-# eu-north-1 v16.4.6 x86_64 OSS: ami-099742a52e0243c12
-# eu-west-1 v16.4.6 arm64 OSS: ami-0f056146565210169
-# eu-west-1 v16.4.6 x86_64 OSS: ami-0bb1098e9061f3286
-# eu-west-2 v16.4.6 arm64 OSS: ami-0c41c8a9e6623cbeb
-# eu-west-2 v16.4.6 x86_64 OSS: ami-0ef2785710a394477
-# eu-west-3 v16.4.6 arm64 OSS: ami-01f68dd1652a01299
-# eu-west-3 v16.4.6 x86_64 OSS: ami-062cc20058012a2ac
-# sa-east-1 v16.4.6 arm64 OSS: ami-0448cf45899c4109b
-# sa-east-1 v16.4.6 x86_64 OSS: ami-00153f4b099207ba6
-# us-east-1 v16.4.6 arm64 OSS: ami-023856580215a2b43
-# us-east-1 v16.4.6 x86_64 OSS: ami-06cc987e0952a0378
-# us-east-2 v16.4.6 arm64 OSS: ami-0291a0a11bdd06c8d
-# us-east-2 v16.4.6 x86_64 OSS: ami-05435267916884c4e
-# us-west-1 v16.4.6 arm64 OSS: ami-06cf14c2b9bfa2fc3
-# us-west-1 v16.4.6 x86_64 OSS: ami-0646577553c25d2fb
-# us-west-2 v16.4.6 arm64 OSS: ami-04b773c97239cdc04
-# us-west-2 v16.4.6 x86_64 OSS: ami-015f89025eb9ab2dd
+# ap-northeast-1 v16.4.7 arm64 OSS: ami-07720ac45434b0b0a
+# ap-northeast-1 v16.4.7 x86_64 OSS: ami-006cf87e5928eedcb
+# ap-northeast-2 v16.4.7 arm64 OSS: ami-00175951a0f153979
+# ap-northeast-2 v16.4.7 x86_64 OSS: ami-0f6ae60b25d4f672f
+# ap-northeast-3 v16.4.7 arm64 OSS: ami-026c4368ba446bfff
+# ap-northeast-3 v16.4.7 x86_64 OSS: ami-0eed5c39a3735fb2d
+# ap-south-1 v16.4.7 arm64 OSS: ami-0b2465c80edef4c9f
+# ap-south-1 v16.4.7 x86_64 OSS: ami-09bd19153e072f2b5
+# ap-southeast-1 v16.4.7 arm64 OSS: ami-02017409113060eab
+# ap-southeast-1 v16.4.7 x86_64 OSS: ami-0f70109f925e59571
+# ap-southeast-2 v16.4.7 arm64 OSS: ami-0257504e7fe7dc031
+# ap-southeast-2 v16.4.7 x86_64 OSS: ami-0b3de56e8a640a682
+# ca-central-1 v16.4.7 arm64 OSS: ami-0a281ef779cf0b31b
+# ca-central-1 v16.4.7 x86_64 OSS: ami-044c74f91105c2117
+# eu-central-1 v16.4.7 arm64 OSS: ami-0f5250c1802ece05a
+# eu-central-1 v16.4.7 x86_64 OSS: ami-04ef8cd4efcef5d00
+# eu-north-1 v16.4.7 arm64 OSS: ami-0f68132a3e4d8efba
+# eu-north-1 v16.4.7 x86_64 OSS: ami-06a95b6ada5673fd6
+# eu-west-1 v16.4.7 arm64 OSS: ami-0ec8fbfe592a66b2d
+# eu-west-1 v16.4.7 x86_64 OSS: ami-0fd3e4a456105829c
+# eu-west-2 v16.4.7 arm64 OSS: ami-06cd1f40dac3dd11c
+# eu-west-2 v16.4.7 x86_64 OSS: ami-0a0fe8828b16d0587
+# eu-west-3 v16.4.7 arm64 OSS: ami-0bdb7b427fefed6a3
+# eu-west-3 v16.4.7 x86_64 OSS: ami-0da888b778aabf178
+# sa-east-1 v16.4.7 arm64 OSS: ami-02f22161252fcfd4d
+# sa-east-1 v16.4.7 x86_64 OSS: ami-0b323e9816bdd1218
+# us-east-1 v16.4.7 arm64 OSS: ami-06b07b36973445ce4
+# us-east-1 v16.4.7 x86_64 OSS: ami-0998dad150b3ec241
+# us-east-2 v16.4.7 arm64 OSS: ami-023a787dbf82d285e
+# us-east-2 v16.4.7 x86_64 OSS: ami-0618484d6262e98ef
+# us-west-1 v16.4.7 arm64 OSS: ami-0cd9f73d1aebeddc3
+# us-west-1 v16.4.7 x86_64 OSS: ami-01484de9b4921cd28
+# us-west-2 v16.4.7 arm64 OSS: ami-0a19dde514f6c04ff
+# us-west-2 v16.4.7 x86_64 OSS: ami-08b233762effc9374
 ```
 
 ### Enterprise
 
 ```
-# ap-northeast-1 v16.4.6 arm64 Enterprise: ami-05f137e5b9201f996
-# ap-northeast-1 v16.4.6 x86_64 Enterprise: ami-03212c4ccbf6eca85
-# ap-northeast-2 v16.4.6 arm64 Enterprise: ami-0924720d520fe8a11
-# ap-northeast-2 v16.4.6 x86_64 Enterprise: ami-0fb3f151c13f316f2
-# ap-northeast-3 v16.4.6 arm64 Enterprise: ami-04d7f1e045968880c
-# ap-northeast-3 v16.4.6 x86_64 Enterprise: ami-0a2f75caf6781d4f8
-# ap-south-1 v16.4.6 arm64 Enterprise: ami-0f9d46726c638e2d4
-# ap-south-1 v16.4.6 x86_64 Enterprise: ami-072c1bda7163cd497
-# ap-southeast-1 v16.4.6 arm64 Enterprise: ami-011f33a197bfe7e44
-# ap-southeast-1 v16.4.6 x86_64 Enterprise: ami-0fbc3bdaa3047315e
-# ap-southeast-2 v16.4.6 arm64 Enterprise: ami-058180b9c6d8cc471
-# ap-southeast-2 v16.4.6 x86_64 Enterprise: ami-0aa1b5b87840a1156
-# ca-central-1 v16.4.6 arm64 Enterprise: ami-05aadbead2b91af95
-# ca-central-1 v16.4.6 x86_64 Enterprise: ami-0d08f955e2eb4cce2
-# eu-central-1 v16.4.6 arm64 Enterprise: ami-068077fc8087e409c
-# eu-central-1 v16.4.6 x86_64 Enterprise: ami-0ec63c9cf4ec58ef1
-# eu-north-1 v16.4.6 arm64 Enterprise: ami-04116b37191302aec
-# eu-north-1 v16.4.6 x86_64 Enterprise: ami-0ff60c42661fd7ea6
-# eu-west-1 v16.4.6 arm64 Enterprise: ami-0b8f5a17eeecef1a2
-# eu-west-1 v16.4.6 x86_64 Enterprise: ami-05f6c12ade128ff2f
-# eu-west-2 v16.4.6 arm64 Enterprise: ami-0d23fa319e42572c1
-# eu-west-2 v16.4.6 x86_64 Enterprise: ami-0e6fb58e541932cf6
-# eu-west-3 v16.4.6 arm64 Enterprise: ami-0567bafa2392fe6da
-# eu-west-3 v16.4.6 x86_64 Enterprise: ami-01e39ed7e04cc3dd6
-# sa-east-1 v16.4.6 arm64 Enterprise: ami-08ba21a1168c24241
-# sa-east-1 v16.4.6 x86_64 Enterprise: ami-0b23038d8ed82c2a3
-# us-east-1 v16.4.6 arm64 Enterprise: ami-0e7d540c0ed15a0cc
-# us-east-1 v16.4.6 x86_64 Enterprise: ami-050d0ef0234295033
-# us-east-2 v16.4.6 arm64 Enterprise: ami-0c94bb5cd6d326f4a
-# us-east-2 v16.4.6 x86_64 Enterprise: ami-04fa696ef2b274943
-# us-west-1 v16.4.6 arm64 Enterprise: ami-0b43f032b82b354f0
-# us-west-1 v16.4.6 x86_64 Enterprise: ami-0f927c0e8705a2aaa
-# us-west-2 v16.4.6 arm64 Enterprise: ami-0379aa56700286ccd
-# us-west-2 v16.4.6 x86_64 Enterprise: ami-0606b81e192fa074d
+# ap-northeast-1 v16.4.7 arm64 Enterprise: ami-053f98998b7e5957b
+# ap-northeast-1 v16.4.7 x86_64 Enterprise: ami-015657b2890c95d27
+# ap-northeast-2 v16.4.7 arm64 Enterprise: ami-09939dd4f1f354429
+# ap-northeast-2 v16.4.7 x86_64 Enterprise: ami-061608c61ddfec0a5
+# ap-northeast-3 v16.4.7 arm64 Enterprise: ami-0cd31147effa5834f
+# ap-northeast-3 v16.4.7 x86_64 Enterprise: ami-05ab3baa29f06dfe4
+# ap-south-1 v16.4.7 arm64 Enterprise: ami-094e152e25ee003d5
+# ap-south-1 v16.4.7 x86_64 Enterprise: ami-0d4a9a53d6881dc0c
+# ap-southeast-1 v16.4.7 arm64 Enterprise: ami-018aa8c26a18380f0
+# ap-southeast-1 v16.4.7 x86_64 Enterprise: ami-0f2d6f9bfbcd75958
+# ap-southeast-2 v16.4.7 arm64 Enterprise: ami-0893ffe06e77fd385
+# ap-southeast-2 v16.4.7 x86_64 Enterprise: ami-04ce624d02a5bb90e
+# ca-central-1 v16.4.7 arm64 Enterprise: ami-0b09bed6ee54276b7
+# ca-central-1 v16.4.7 x86_64 Enterprise: ami-0ffea41522e151da8
+# eu-central-1 v16.4.7 arm64 Enterprise: ami-00dbf71fd824b75aa
+# eu-central-1 v16.4.7 x86_64 Enterprise: ami-09a453c15f5e74b9f
+# eu-north-1 v16.4.7 arm64 Enterprise: ami-0f202e0a1fdcb0cd4
+# eu-north-1 v16.4.7 x86_64 Enterprise: ami-0c17289e35ab0c3c1
+# eu-west-1 v16.4.7 arm64 Enterprise: ami-0b204add584484afb
+# eu-west-1 v16.4.7 x86_64 Enterprise: ami-0106063b74f3a7e61
+# eu-west-2 v16.4.7 arm64 Enterprise: ami-0164b22e8f0910c2d
+# eu-west-2 v16.4.7 x86_64 Enterprise: ami-0ca47a27c64e0193d
+# eu-west-3 v16.4.7 arm64 Enterprise: ami-054c89f025db36eba
+# eu-west-3 v16.4.7 x86_64 Enterprise: ami-0db0e2dce405fa96e
+# sa-east-1 v16.4.7 arm64 Enterprise: ami-0f357c0fe0ad29bc9
+# sa-east-1 v16.4.7 x86_64 Enterprise: ami-0eaf4d211509350b9
+# us-east-1 v16.4.7 arm64 Enterprise: ami-0c5bc482d9606044c
+# us-east-1 v16.4.7 x86_64 Enterprise: ami-0a812151b38691916
+# us-east-2 v16.4.7 arm64 Enterprise: ami-09e56b81b6f994082
+# us-east-2 v16.4.7 x86_64 Enterprise: ami-02089fdb7184fce6d
+# us-west-1 v16.4.7 arm64 Enterprise: ami-032fdf32de02ee9b0
+# us-west-1 v16.4.7 x86_64 Enterprise: ami-0689f6abbcb6b7462
+# us-west-2 v16.4.7 arm64 Enterprise: ami-0ab8daab2929bb1b8
+# us-west-2 v16.4.7 x86_64 Enterprise: ami-0967a612bc9a9b3df
 ```
 
 ### Enterprise FIPS
 
 ```
-# ap-northeast-1 v16.4.6 arm64 Enterprise FIPS: ami-03222719a3da72577
-# ap-northeast-1 v16.4.6 x86_64 Enterprise FIPS: ami-03b67fc78f15b9cb1
-# ap-northeast-2 v16.4.6 arm64 Enterprise FIPS: ami-07b1142c8d0a97142
-# ap-northeast-2 v16.4.6 x86_64 Enterprise FIPS: ami-0f5200769c8d1d528
-# ap-northeast-3 v16.4.6 arm64 Enterprise FIPS: ami-0c735142ffa7fe311
-# ap-northeast-3 v16.4.6 x86_64 Enterprise FIPS: ami-01f76396df08b2ea4
-# ap-south-1 v16.4.6 arm64 Enterprise FIPS: ami-0b151dab5123a1cde
-# ap-south-1 v16.4.6 x86_64 Enterprise FIPS: ami-0a548663132b1fbcc
-# ap-southeast-1 v16.4.6 arm64 Enterprise FIPS: ami-0ee14bd0e530b9802
-# ap-southeast-1 v16.4.6 x86_64 Enterprise FIPS: ami-02605938b8431df73
-# ap-southeast-2 v16.4.6 arm64 Enterprise FIPS: ami-0e1ab9036f0d741ee
-# ap-southeast-2 v16.4.6 x86_64 Enterprise FIPS: ami-0da24aa1dca222d28
-# ca-central-1 v16.4.6 arm64 Enterprise FIPS: ami-0168f83e25bab435d
-# ca-central-1 v16.4.6 x86_64 Enterprise FIPS: ami-0dd0f6a87b55bf122
-# eu-central-1 v16.4.6 arm64 Enterprise FIPS: ami-0be0fd9618583374b
-# eu-central-1 v16.4.6 x86_64 Enterprise FIPS: ami-0c87fd696f03d07be
-# eu-north-1 v16.4.6 arm64 Enterprise FIPS: ami-0165c744dd34b0367
-# eu-north-1 v16.4.6 x86_64 Enterprise FIPS: ami-0fc4ea5c96fe4b2a1
-# eu-west-1 v16.4.6 arm64 Enterprise FIPS: ami-064921542d826b418
-# eu-west-1 v16.4.6 x86_64 Enterprise FIPS: ami-03291e366b650c3bb
-# eu-west-2 v16.4.6 arm64 Enterprise FIPS: ami-0913a3fa04526977b
-# eu-west-2 v16.4.6 x86_64 Enterprise FIPS: ami-0f303317a7395c1da
-# eu-west-3 v16.4.6 arm64 Enterprise FIPS: ami-0403b9e814a93e163
-# eu-west-3 v16.4.6 x86_64 Enterprise FIPS: ami-0550f4d59db15f7d7
-# sa-east-1 v16.4.6 arm64 Enterprise FIPS: ami-04479f0cc8407de74
-# sa-east-1 v16.4.6 x86_64 Enterprise FIPS: ami-0ae361c5388c2e620
-# us-east-1 v16.4.6 arm64 Enterprise FIPS: ami-0d6a7504bf4c12471
-# us-east-1 v16.4.6 x86_64 Enterprise FIPS: ami-0184537bbd4a91c80
-# us-east-2 v16.4.6 arm64 Enterprise FIPS: ami-0ba3bdc20ee3911eb
-# us-east-2 v16.4.6 x86_64 Enterprise FIPS: ami-0deebe84e68d2ca33
-# us-west-1 v16.4.6 arm64 Enterprise FIPS: ami-04f75a751ff454fe0
-# us-west-1 v16.4.6 x86_64 Enterprise FIPS: ami-0dc241b1b82dcb44b
-# us-west-2 v16.4.6 arm64 Enterprise FIPS: ami-0bcc7e8ade2f96862
-# us-west-2 v16.4.6 x86_64 Enterprise FIPS: ami-0e396f7cd99e781ae
+# ap-northeast-1 v16.4.7 arm64 Enterprise FIPS: ami-0e4f6ad81e7ed057c
+# ap-northeast-1 v16.4.7 x86_64 Enterprise FIPS: ami-09b9523a4fa643fe6
+# ap-northeast-2 v16.4.7 arm64 Enterprise FIPS: ami-073ba4e1511562dda
+# ap-northeast-2 v16.4.7 x86_64 Enterprise FIPS: ami-0b0a6e6deef4ee6ae
+# ap-northeast-3 v16.4.7 arm64 Enterprise FIPS: ami-0d581951188af8ab2
+# ap-northeast-3 v16.4.7 x86_64 Enterprise FIPS: ami-066847b35ff828be1
+# ap-south-1 v16.4.7 arm64 Enterprise FIPS: ami-092c38533f669bbf2
+# ap-south-1 v16.4.7 x86_64 Enterprise FIPS: ami-0a2ffbfc996a8b731
+# ap-southeast-1 v16.4.7 arm64 Enterprise FIPS: ami-0a0c06fd23a0c2607
+# ap-southeast-1 v16.4.7 x86_64 Enterprise FIPS: ami-08e1a5aac8a3d87d3
+# ap-southeast-2 v16.4.7 arm64 Enterprise FIPS: ami-020f3541e8c9f9d0e
+# ap-southeast-2 v16.4.7 x86_64 Enterprise FIPS: ami-03873d797d3544fcf
+# ca-central-1 v16.4.7 arm64 Enterprise FIPS: ami-01116a8318dc7ee59
+# ca-central-1 v16.4.7 x86_64 Enterprise FIPS: ami-0a626260a6967fa0e
+# eu-central-1 v16.4.7 arm64 Enterprise FIPS: ami-09793970d1aaab2e0
+# eu-central-1 v16.4.7 x86_64 Enterprise FIPS: ami-097ebb89ac54417f8
+# eu-north-1 v16.4.7 arm64 Enterprise FIPS: ami-04724a57c6288e95e
+# eu-north-1 v16.4.7 x86_64 Enterprise FIPS: ami-062f01515823f32a6
+# eu-west-1 v16.4.7 arm64 Enterprise FIPS: ami-07c2ac9e4d2cdf80f
+# eu-west-1 v16.4.7 x86_64 Enterprise FIPS: ami-0ac1f3f341b23f278
+# eu-west-2 v16.4.7 arm64 Enterprise FIPS: ami-038554534c08a3f2b
+# eu-west-2 v16.4.7 x86_64 Enterprise FIPS: ami-0e2e2019de19aeada
+# eu-west-3 v16.4.7 arm64 Enterprise FIPS: ami-010f4626beda66370
+# eu-west-3 v16.4.7 x86_64 Enterprise FIPS: ami-0d9644fc5409b4380
+# sa-east-1 v16.4.7 arm64 Enterprise FIPS: ami-002432ab47560e6a3
+# sa-east-1 v16.4.7 x86_64 Enterprise FIPS: ami-0cb0dcb27559d943c
+# us-east-1 v16.4.7 arm64 Enterprise FIPS: ami-0575c402cdaf944cd
+# us-east-1 v16.4.7 x86_64 Enterprise FIPS: ami-051cde08e274f39e8
+# us-east-2 v16.4.7 arm64 Enterprise FIPS: ami-050937b39903b45f8
+# us-east-2 v16.4.7 x86_64 Enterprise FIPS: ami-0af4d75accbb2cf0f
+# us-west-1 v16.4.7 arm64 Enterprise FIPS: ami-0a18fa8abb544ae53
+# us-west-1 v16.4.7 x86_64 Enterprise FIPS: ami-0ee171271f976f7bb
+# us-west-2 v16.4.7 arm64 Enterprise FIPS: ami-0076ee4c10ce0f6f0
+# us-west-2 v16.4.7 x86_64 Enterprise FIPS: ami-0d2a275a454b91f64
 ```
diff --git a/examples/aws/terraform/ha-autoscale-cluster/README.md b/examples/aws/terraform/ha-autoscale-cluster/README.md
index fff741d817e46..6f07f3f649cd4 100644
--- a/examples/aws/terraform/ha-autoscale-cluster/README.md
+++ b/examples/aws/terraform/ha-autoscale-cluster/README.md
@@ -46,7 +46,7 @@ export TF_VAR_cluster_name="teleport.example.com"
 # OSS: aws ec2 describe-images --owners 146628656107 --filters 'Name=name,Values=teleport-oss-*'
 # Enterprise: aws ec2 describe-images --owners 146628656107 --filters 'Name=name,Values=teleport-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="teleport-ent-16.4.6-arm64"
+export TF_VAR_ami_name="teleport-ent-16.4.7-arm64"
 
 # Instance types used for authentication server auto scaling group
 # This should match to the AMI instance architecture type, ARM or x86
diff --git a/examples/aws/terraform/starter-cluster/README.md b/examples/aws/terraform/starter-cluster/README.md
index 5a7030487d616..11171522ceef8 100644
--- a/examples/aws/terraform/starter-cluster/README.md
+++ b/examples/aws/terraform/starter-cluster/README.md
@@ -98,7 +98,7 @@ TF_VAR_license_path ?= "/path/to/license"
 # OSS: aws ec2 describe-images --owners 146628656107 --filters 'Name=name,Values=teleport-oss-*'
 # Enterprise: aws ec2 describe-images --owners 146628656107 --filters 'Name=name,Values=teleport-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 ?= "teleport-ent-16.4.6-arm64"
+TF_VAR_ami_name ?= "teleport-ent-16.4.7-arm64"
 
 # Route 53 hosted zone to use, must be a root zone registered in AWS, e.g. example.com
 TF_VAR_route53_zone ?= "example.com"