diff --git a/amis.txt b/amis.txt
index ef4a414a67..af4742f1e5 100644
--- a/amis.txt
+++ b/amis.txt
@@ -1,161 +1,161 @@
 ## x86_64
 # alinux2
-af-south-1: ami-0fa07fd3377e05f6a
-ap-east-1: ami-0ea82f7592e878f4c
-ap-northeast-1: ami-0c334d7e7f67b17ea
-ap-northeast-2: ami-01a75381340a8576a
+af-south-1: ami-078ba1b6834d887fb
+ap-east-1: ami-08ca5e0c3d231e229
+ap-northeast-1: ami-06ca34f360b3906ce
+ap-northeast-2: ami-003f399bbb1a0ede8
 ap-northeast-3: UNSUPPORTED
-ap-south-1: ami-0bf021cf880aa2378
-ap-southeast-1: ami-05cc344efdf5e3e6f
-ap-southeast-2: ami-07f6fe426f60665c5
-ca-central-1: ami-02d251fcff00ccaee
-cn-north-1: ami-0910878f7e4acbb26
-cn-northwest-1: ami-0f9d24c23314f1c35
-eu-central-1: ami-048335760473a3ebd
-eu-north-1: ami-0745e1f127bbe809a
-eu-south-1: ami-0e63cd7da7b6635ee
-eu-west-1: ami-022ac274688692560
-eu-west-2: ami-06b29a0312744e595
-eu-west-3: ami-03196c9c1c35534e9
-me-south-1: ami-0629baced6c174c94
-sa-east-1: ami-034913bfc570aadbe
-us-east-1: ami-09d7661c7ae96b199
-us-east-2: ami-0dd27340899857163
-us-gov-east-1: ami-07c0db459dd567a2e
-us-gov-west-1: ami-04e6de860eed3b533
-us-west-1: ami-0cf0acf624cb45af1
-us-west-2: ami-0436692c7b452bae4
+ap-south-1: ami-08fa00fef93aeb242
+ap-southeast-1: ami-0dfd7d7619bcf1058
+ap-southeast-2: ami-035f2eaf885b551db
+ca-central-1: ami-0f3e431196207ab18
+cn-north-1: ami-0d8443f2e6c9f8536
+cn-northwest-1: ami-07fdab96aae491c9b
+eu-central-1: ami-011a77a1a8c54aacc
+eu-north-1: ami-098804f697ec4e93b
+eu-south-1: ami-04d6fc7a0675a01cf
+eu-west-1: ami-025c26a35a242ab31
+eu-west-2: ami-027c61d6cc4627c23
+eu-west-3: ami-0dcc692e5ba8fdfd3
+me-south-1: ami-0c83b57f7947fb792
+sa-east-1: ami-0f91712a124d17445
+us-east-1: ami-05c34afa8785834ae
+us-east-2: ami-0868e3a46e728b22a
+us-gov-east-1: ami-00fa67893190e7912
+us-gov-west-1: ami-08616d8f8abebeb6b
+us-west-1: ami-0cc87d610e66862b0
+us-west-2: ami-0c22fa494106959c2
 # centos7
-af-south-1: ami-00cf0daeec4d4c2ac
-ap-east-1: ami-06e055df57c083a09
-ap-northeast-1: ami-0f3c0231197fcd4ba
-ap-northeast-2: ami-0a539ca12524867cc
+af-south-1: ami-0342c02ebeab81710
+ap-east-1: ami-02ff3b920e4e1e22a
+ap-northeast-1: ami-01232cfd188586a7f
+ap-northeast-2: ami-06bc550d0a9599a17
 ap-northeast-3: UNSUPPORTED
-ap-south-1: ami-00229cef9cc04e14a
-ap-southeast-1: ami-0f85d9fe7678c6612
-ap-southeast-2: ami-0ec52a8a7e7319cbf
-ca-central-1: ami-016ce0355f6db983f
+ap-south-1: ami-005c3cf8e657575ea
+ap-southeast-1: ami-0b56a847decfcf08c
+ap-southeast-2: ami-0c47b2c411e56b56c
+ca-central-1: ami-02de679bf9080c673
 cn-north-1: UNSUPPORTED
 cn-northwest-1: UNSUPPORTED
-eu-central-1: ami-04ff844c408506aa3
-eu-north-1: ami-082f96eb64483fa73
-eu-south-1: ami-06375c2ad1530a632
-eu-west-1: ami-0333f6a1c7b69be79
-eu-west-2: ami-0851dd86601b2ca8e
-eu-west-3: ami-03ec0f9173e22f131
-me-south-1: ami-0a3c71e11d8ebe416
-sa-east-1: ami-0bae120608f283026
-us-east-1: ami-0aa4844579c2c3c71
-us-east-2: ami-0be98a8c41dc078f5
+eu-central-1: ami-0b914529c99fa542d
+eu-north-1: ami-08dfc86123fcf5ab5
+eu-south-1: ami-012bff1f1b77fa93e
+eu-west-1: ami-091cd5c30e47d7b5d
+eu-west-2: ami-0f205e9fe6487450b
+eu-west-3: ami-01100d9f56c78b7fb
+me-south-1: ami-0edc968c4b1fbd02b
+sa-east-1: ami-061b917c5d84d4be4
+us-east-1: ami-018d562cb054256db
+us-east-2: ami-0a3c4042ff10054f7
 us-gov-east-1: UNSUPPORTED
 us-gov-west-1: UNSUPPORTED
-us-west-1: ami-08b92f5f62b4a8cbe
-us-west-2: ami-0bf5a647515379192
+us-west-1: ami-0f57b9803ccaa025e
+us-west-2: ami-04f94f12f112ff196
 # centos8
-af-south-1: ami-0de791d10858e4708
-ap-east-1: ami-089c893cecbac5844
-ap-northeast-1: ami-022a5de992839271b
-ap-northeast-2: ami-0de7ed6a5c981ca47
+af-south-1: ami-03e5fb33e44365be8
+ap-east-1: ami-0bc7cf529234077c3
+ap-northeast-1: ami-06763c77831a1b7d2
+ap-northeast-2: ami-07469dca75c1a77a4
 ap-northeast-3: UNSUPPORTED
-ap-south-1: ami-0f878dc5de9b6cea3
-ap-southeast-1: ami-041ec91fc54ad64e1
-ap-southeast-2: ami-0a0e7fd2c0354711f
-ca-central-1: ami-0eedd34ac05245df1
+ap-south-1: ami-080297d482541ba9f
+ap-southeast-1: ami-0d9bd556dbc3e5247
+ap-southeast-2: ami-0f1af0a7220f316a5
+ca-central-1: ami-0efd5f232bbf74be7
 cn-north-1: UNSUPPORTED
 cn-northwest-1: UNSUPPORTED
-eu-central-1: ami-05ae8cbfbd839a10e
-eu-north-1: ami-07e3334a75cdabc20
-eu-south-1: ami-0446532269854ec57
-eu-west-1: ami-0f8722d6bfb975f1d
-eu-west-2: ami-0c0f969ee9fe4fc3e
-eu-west-3: ami-01c744120eb0519fa
-me-south-1: ami-020d88369e97362d3
-sa-east-1: ami-021c7aaa731d8cd92
-us-east-1: ami-07c467738c590f28e
-us-east-2: ami-0c81705cc84dc7cd0
+eu-central-1: ami-0c9f635dbb127e7bf
+eu-north-1: ami-0209af1e13d5fe1fc
+eu-south-1: ami-0c9451f9cc3627a6b
+eu-west-1: ami-0708e48e98e4020fb
+eu-west-2: ami-0a8e5d338e9c5ac2b
+eu-west-3: ami-080ad5473770ed32c
+me-south-1: ami-0896668160781844f
+sa-east-1: ami-0f30b5d12b9616b25
+us-east-1: ami-033fadaad25e34140
+us-east-2: ami-0c97e51ec0c491c21
 us-gov-east-1: UNSUPPORTED
 us-gov-west-1: UNSUPPORTED
-us-west-1: ami-06e94642459c583ec
-us-west-2: ami-0d67365f19ed6443f
+us-west-1: ami-0efe504924c9443ef
+us-west-2: ami-05bcc430de513a0e7
 # ubuntu1804
-af-south-1: ami-0949d48c8a89c3aac
-ap-east-1: ami-0d6294f9e44acdb9f
-ap-northeast-1: ami-07cc9d38cd43d37b0
-ap-northeast-2: ami-06ca22940d78a00e1
+af-south-1: ami-0d11b1c4d5e8f547b
+ap-east-1: ami-0f2dc6d61e4ae454e
+ap-northeast-1: ami-0828756c1df1c988a
+ap-northeast-2: ami-059124e91afae9afb
 ap-northeast-3: UNSUPPORTED
-ap-south-1: ami-0a32b98e4115f7b8c
-ap-southeast-1: ami-0ae65b714814782f7
-ap-southeast-2: ami-00c3c2f1994d09ff7
-ca-central-1: ami-0f9fb4853a8625db8
-cn-north-1: ami-06456398fe626b037
-cn-northwest-1: ami-0f52380ce98d3e3af
-eu-central-1: ami-0a0cde77c001ed2bf
-eu-north-1: ami-0abeec634a99ed18d
-eu-south-1: ami-062b1506914e3b1a8
-eu-west-1: ami-060d738833cb8b95e
-eu-west-2: ami-088f458c70f14fbec
-eu-west-3: ami-074904c8ee3c3029c
-me-south-1: ami-0ad11aad582463fc5
-sa-east-1: ami-02667ba3a66e6ae05
-us-east-1: ami-04738311a4aee2f55
-us-east-2: ami-0ff7538d9fbf63b35
-us-gov-east-1: ami-0fed2ed5f4a927155
-us-gov-west-1: ami-0c642f50a33246104
-us-west-1: ami-082697bd7412068a3
-us-west-2: ami-0fa53dde45ac2b771
+ap-south-1: ami-0d60e6237f3eb5935
+ap-southeast-1: ami-07b1ec7b5d58c2254
+ap-southeast-2: ami-056de4a2945980ab1
+ca-central-1: ami-0c6854fd96f874a8b
+cn-north-1: ami-09e520c8a0a48d35b
+cn-northwest-1: ami-0290d75218aad6a93
+eu-central-1: ami-034058017f7d1671b
+eu-north-1: ami-0d6e0650f35900321
+eu-south-1: ami-07d9d9f423f864aa2
+eu-west-1: ami-0c0ee93cc2c16e041
+eu-west-2: ami-00d77b1a1004edb58
+eu-west-3: ami-026f5fb59ddb22499
+me-south-1: ami-053bd0bccac184d9d
+sa-east-1: ami-03ed35c152eb8a8ec
+us-east-1: ami-0ea2cd02460300e19
+us-east-2: ami-0ecaa47d99df4e6b6
+us-gov-east-1: ami-085bdc38173427e70
+us-gov-west-1: ami-0dffe80d11b9008f8
+us-west-1: ami-02e88f432a165bbff
+us-west-2: ami-091c76e60d0b02d8e
 # ubuntu2004
-af-south-1: ami-02e8f5de1e9f95a3e
-ap-east-1: ami-00683359e727cecec
-ap-northeast-1: ami-0ee512f6c63a2092a
-ap-northeast-2: ami-0dd7c72d993750270
+af-south-1: ami-000ad002154c9a1e6
+ap-east-1: ami-02cf6f1555b376f67
+ap-northeast-1: ami-05533bd40e6ba5eb7
+ap-northeast-2: ami-01501bc585eb13aea
 ap-northeast-3: UNSUPPORTED
-ap-south-1: ami-07a3bf81983a58da4
-ap-southeast-1: ami-0b0a1c6100fd9218d
-ap-southeast-2: ami-019d9feb4e6540e0a
-ca-central-1: ami-08017c5a69cea5c54
-cn-north-1: ami-098136bf48cc41ea3
-cn-northwest-1: ami-0c093d03dc9bcc654
-eu-central-1: ami-08b6b6d013301a410
-eu-north-1: ami-07af17c300413d1b7
-eu-south-1: ami-0b63dd8fecc7602f9
-eu-west-1: ami-0777eee1ef01f921c
-eu-west-2: ami-06e459f67053f02d5
-eu-west-3: ami-0932f1d96d12399b9
-me-south-1: ami-092add57f60170f0a
-sa-east-1: ami-0912ea590a89b15c6
-us-east-1: ami-0774f3a01df5da2b5
-us-east-2: ami-01dffc940a18e54db
-us-gov-east-1: ami-0140d4998c04240b9
-us-gov-west-1: ami-061b938884498d9ef
-us-west-1: ami-0b503c64d6cd3a9eb
-us-west-2: ami-086f385266889932c
+ap-south-1: ami-010922c8316bf7413
+ap-southeast-1: ami-05ed3a5c38d9aeb23
+ap-southeast-2: ami-0bef56ab22708fb32
+ca-central-1: ami-098078bb2e8a9ac73
+cn-north-1: ami-0d0e4a332f09ef2e1
+cn-northwest-1: ami-09d6e559ac91eb9ba
+eu-central-1: ami-0366592fae0ca34c7
+eu-north-1: ami-072697ad1f21d465b
+eu-south-1: ami-06a613b117f0449e0
+eu-west-1: ami-01057ed51e9f1f13c
+eu-west-2: ami-03b3427d4a788f53a
+eu-west-3: ami-0cf8e439e0997829b
+me-south-1: ami-03d9c308f1c6cd82b
+sa-east-1: ami-0cb94dbb4908c2bd2
+us-east-1: ami-094f72c711db030be
+us-east-2: ami-09b55f7d8195e33af
+us-gov-east-1: ami-0df82ada9b5b8b733
+us-gov-west-1: ami-0599cfd9bc3d4e3fc
+us-west-1: ami-0efc8d0ac3f69ec0d
+us-west-2: ami-0ce83f800de72fd5f
 ## arm64
 # alinux2
-af-south-1: ami-0853551519ef074aa
-ap-east-1: ami-0b24b991f25ee5d3f
-ap-northeast-1: ami-06b1c45ea24991ed1
-ap-northeast-2: ami-0b6c91ff3872974b5
+af-south-1: ami-0231e3496b6b2fda2
+ap-east-1: ami-0b04b8cead61d29dc
+ap-northeast-1: ami-01c43ed393bc72805
+ap-northeast-2: ami-08d5e3f7bc53dedd5
 ap-northeast-3: UNSUPPORTED
-ap-south-1: ami-082ca6657ce6ee5a2
-ap-southeast-1: ami-005b6e22cb49aa827
-ap-southeast-2: ami-0aec88697b069ba74
-ca-central-1: ami-08e43c35c8b73015c
-cn-north-1: ami-0c0f9ec86128e386c
-cn-northwest-1: ami-0b1b17049bcd2383b
-eu-central-1: ami-0be3b36d3940f6b43
-eu-north-1: ami-03d23123de5cac40d
-eu-south-1: ami-047c05ebf7061307a
-eu-west-1: ami-04e2ab6d71f1fd16c
-eu-west-2: ami-02a48038d99952de8
-eu-west-3: ami-0e40fef5b18f8d499
-me-south-1: ami-0994c6e6191bd9a0a
-sa-east-1: ami-08a27e6979917b9db
-us-east-1: ami-08834e366ff47f700
-us-east-2: ami-0c9a9b66296c05305
-us-gov-east-1: ami-0204e3c2cc4aa5e76
-us-gov-west-1: ami-00ec52865cf6c5d9f
-us-west-1: ami-0e19ce8540ffbdad8
-us-west-2: ami-0a05534c9bf66d94c
+ap-south-1: ami-05c1b1730ab33e923
+ap-southeast-1: ami-03161fbad27bc247c
+ap-southeast-2: ami-0b3b6cf5be89fa307
+ca-central-1: ami-0772eadbd45fa95da
+cn-north-1: ami-070bc0c6211550877
+cn-northwest-1: ami-05412d2e32a7c7883
+eu-central-1: ami-0c9f1f7d01a0c4118
+eu-north-1: ami-049353e3cb0f9f039
+eu-south-1: ami-0b6cea2da1787cb3a
+eu-west-1: ami-036bfe94a219c4323
+eu-west-2: ami-045135811fa07b6b3
+eu-west-3: ami-09640e4c3f72de54e
+me-south-1: ami-0fa75a0f46a52a058
+sa-east-1: ami-0412e161281d80b68
+us-east-1: ami-07c96a42d069ec0ca
+us-east-2: ami-0df22ca5a16590d29
+us-gov-east-1: ami-0b4c358f57604504c
+us-gov-west-1: ami-0adbde569682c2740
+us-west-1: ami-04055147c484ba2b6
+us-west-2: ami-024285da28e8491c5
 # centos7
 af-south-1: UNSUPPORTED
 ap-east-1: UNSUPPORTED
@@ -183,80 +183,80 @@ us-gov-west-1: UNSUPPORTED
 us-west-1: UNSUPPORTED
 us-west-2: UNSUPPORTED
 # centos8
-af-south-1: ami-0d742238103b49d27
-ap-east-1: ami-00319512ccf610ad6
-ap-northeast-1: ami-0987e731e450e1149
-ap-northeast-2: ami-01bd530cf1a02b774
+af-south-1: ami-0a8a20ec7863d71e0
+ap-east-1: ami-012118cdd4a2999d0
+ap-northeast-1: ami-00bf447bb4cd2e747
+ap-northeast-2: ami-02af39e1ec47ddc95
 ap-northeast-3: UNSUPPORTED
-ap-south-1: ami-0e5c8708f2ea493c8
-ap-southeast-1: ami-01d88d4d234c3d9ea
-ap-southeast-2: ami-0de45082e9c3a36de
-ca-central-1: ami-01d11c27965d640ae
+ap-south-1: ami-08652b83f1cd81f2e
+ap-southeast-1: ami-07226c326d81636a0
+ap-southeast-2: ami-08c4719a5f97665f5
+ca-central-1: ami-0c9b3c3361320a5f0
 cn-north-1: UNSUPPORTED
 cn-northwest-1: UNSUPPORTED
-eu-central-1: ami-0b83b99115aacb4d5
-eu-north-1: ami-0e800481dfa43bd1d
-eu-south-1: ami-01f895df751644a65
-eu-west-1: ami-0fc1f4272a10e48de
-eu-west-2: ami-05667e2a8051c2bb5
-eu-west-3: ami-04e826bb83710fa75
-me-south-1: ami-0adbff6d4b25dc114
-sa-east-1: ami-069b713ec2a05853a
-us-east-1: ami-09c3e64f32f611dbf
-us-east-2: ami-0ba7711971220d0cd
+eu-central-1: ami-0afaf704d06a3f52a
+eu-north-1: ami-0952cb29c0097e87a
+eu-south-1: ami-0f03a6fcebc0c8076
+eu-west-1: ami-0c240aa6c2790f26a
+eu-west-2: ami-0c902216df17b4013
+eu-west-3: ami-0bf8e93c818495b47
+me-south-1: ami-0bd79922b63e2605f
+sa-east-1: ami-0c52a0bbff58fdd1e
+us-east-1: ami-02b0ba5d6493cc6d1
+us-east-2: ami-06996d7ac38620e9b
 us-gov-east-1: UNSUPPORTED
 us-gov-west-1: UNSUPPORTED
-us-west-1: ami-0f70a963bf41341e8
-us-west-2: ami-042da30cf5e76f144
+us-west-1: ami-09712520844275993
+us-west-2: ami-0da42d705c05beaab
 # ubuntu1804
-af-south-1: ami-08d53a01f99a10ee2
-ap-east-1: ami-03a66e3477a4bf09a
-ap-northeast-1: ami-09ab3333e6eacd857
-ap-northeast-2: ami-068e34ddd2329292d
+af-south-1: ami-0dd5b8d1aa311975f
+ap-east-1: ami-018bbf7e915409ee2
+ap-northeast-1: ami-0c6152e34756c5b6c
+ap-northeast-2: ami-033bfdefb3f80d985
 ap-northeast-3: UNSUPPORTED
-ap-south-1: ami-0c0e12a84e3e60064
-ap-southeast-1: ami-0e19b35f58ba43890
-ap-southeast-2: ami-0e779961330688714
-ca-central-1: ami-055a875c44b588088
-cn-north-1: ami-0196a972594cf199f
-cn-northwest-1: ami-0e5d8c27167968932
-eu-central-1: ami-059a3e39fa5757e30
-eu-north-1: ami-0d1ad77d6db80c8c3
-eu-south-1: ami-08ad558b518803185
-eu-west-1: ami-01ff2cedb7f6a9dd5
-eu-west-2: ami-0d5fb88128f1baa7a
-eu-west-3: ami-0fd897fa5c7951840
-me-south-1: ami-0684cba2ec889894a
-sa-east-1: ami-060c58d65c3f162b6
-us-east-1: ami-09791cc9641a953dd
-us-east-2: ami-01e9b9616bb7e28d5
-us-gov-east-1: ami-01911e6d351fb56fc
-us-gov-west-1: ami-0d8bd14ef82be4407
-us-west-1: ami-08f1101a1e39e1296
-us-west-2: ami-08d53fa80f700b1c4
+ap-south-1: ami-06764f824ea59b091
+ap-southeast-1: ami-095fadf198f1d4295
+ap-southeast-2: ami-056bb857ebbd6d8ce
+ca-central-1: ami-05730490d25c1c27e
+cn-north-1: ami-0bd2de972bc5dca4c
+cn-northwest-1: ami-0efc32c1be41292d8
+eu-central-1: ami-0e29b5b10dc71dc5f
+eu-north-1: ami-09eb809b707e9cbc8
+eu-south-1: ami-03336805e55920c95
+eu-west-1: ami-00b67b4773fb4e624
+eu-west-2: ami-0e6ffc876624715b8
+eu-west-3: ami-09752a423f19987f4
+me-south-1: ami-0cb09296c4664a600
+sa-east-1: ami-08658ff85720107ad
+us-east-1: ami-026d985f5be3d7871
+us-east-2: ami-0aed0208ad52238c6
+us-gov-east-1: ami-0177d72ca11421e1d
+us-gov-west-1: ami-0073ae67ad5b418f6
+us-west-1: ami-0e173f211c4ea738d
+us-west-2: ami-031ee232f9757134a
 # ubuntu2004
-af-south-1: ami-011ca8819e0758f27
-ap-east-1: ami-069a5eea9658e7f02
-ap-northeast-1: ami-0207cb01316d437a1
-ap-northeast-2: ami-0972ccc63cba49af3
+af-south-1: ami-08413d810689e706f
+ap-east-1: ami-0bcc00ebf91b7c0cd
+ap-northeast-1: ami-056a406dcba84ed20
+ap-northeast-2: ami-0ccfaeb44d33e4e28
 ap-northeast-3: UNSUPPORTED
-ap-south-1: ami-04cfe3f4b9d466718
-ap-southeast-1: ami-0e955fdc1585696ac
-ap-southeast-2: ami-0473e61db453861f7
-ca-central-1: ami-0bdc10ce9be7b90e7
-cn-north-1: ami-05124c54aede8da02
-cn-northwest-1: ami-0e8a081981ef81cbe
-eu-central-1: ami-03842f4c5cf7e0ff0
-eu-north-1: ami-0a63e7739aa8699f7
-eu-south-1: ami-0bfa592e01c6728ed
-eu-west-1: ami-0fc54252114b2927f
-eu-west-2: ami-0d857758009a91d8b
-eu-west-3: ami-019eed76728ff3d6a
-me-south-1: ami-007ac2a543d6ae841
-sa-east-1: ami-0c80a886bfd124cc2
-us-east-1: ami-0d920d4d11d803aa9
-us-east-2: ami-033714d61c4352a05
-us-gov-east-1: ami-095c6c38d7bd832b3
-us-gov-west-1: ami-062a7716fb4e69098
-us-west-1: ami-0b260afafe9d1addc
-us-west-2: ami-026a909cdfbe9919b
+ap-south-1: ami-038c13e5dffee29b7
+ap-southeast-1: ami-0b04e54ac437944cd
+ap-southeast-2: ami-0bb9bdf13bd16357c
+ca-central-1: ami-04a2daefb059f6cfb
+cn-north-1: ami-0c06ca61adafbc04a
+cn-northwest-1: ami-0e1aa88dc2b333d6d
+eu-central-1: ami-02b7cb8ff682bd6ef
+eu-north-1: ami-0cfa8b35c0c839104
+eu-south-1: ami-0c88a32d8f35a9f3b
+eu-west-1: ami-09ac4fc4f947dfc5d
+eu-west-2: ami-037aadc2e5e469278
+eu-west-3: ami-0ef5b8da76db660df
+me-south-1: ami-07b98966bc3352a4b
+sa-east-1: ami-05a6ab129d7033fcb
+us-east-1: ami-0c6c487c31ec2e683
+us-east-2: ami-07e4e7bec7ce1f4ab
+us-gov-east-1: ami-0c5b6cac84875871f
+us-gov-west-1: ami-022944ac1a64f4aff
+us-west-1: ami-0c0c67998845b4748
+us-west-2: ami-02bc78ed101caad5b
diff --git a/cloudformation/aws-parallelcluster.cfn.json b/cloudformation/aws-parallelcluster.cfn.json
index 2b296a59f7..3cedd1b554 100644
--- a/cloudformation/aws-parallelcluster.cfn.json
+++ b/cloudformation/aws-parallelcluster.cfn.json
@@ -810,32 +810,32 @@
   "Mappings": {
     "AWSRegionOS2AMIarm64": {
       "af-south-1": {
-        "alinux2": "ami-0853551519ef074aa",
+        "alinux2": "ami-0231e3496b6b2fda2",
         "centos7": "UNSUPPORTED",
-        "centos8": "ami-0d742238103b49d27",
-        "ubuntu1804": "ami-08d53a01f99a10ee2",
-        "ubuntu2004": "ami-011ca8819e0758f27"
+        "centos8": "ami-0a8a20ec7863d71e0",
+        "ubuntu1804": "ami-0dd5b8d1aa311975f",
+        "ubuntu2004": "ami-08413d810689e706f"
       },
       "ap-east-1": {
-        "alinux2": "ami-0b24b991f25ee5d3f",
+        "alinux2": "ami-0b04b8cead61d29dc",
         "centos7": "UNSUPPORTED",
-        "centos8": "ami-00319512ccf610ad6",
-        "ubuntu1804": "ami-03a66e3477a4bf09a",
-        "ubuntu2004": "ami-069a5eea9658e7f02"
+        "centos8": "ami-012118cdd4a2999d0",
+        "ubuntu1804": "ami-018bbf7e915409ee2",
+        "ubuntu2004": "ami-0bcc00ebf91b7c0cd"
       },
       "ap-northeast-1": {
-        "alinux2": "ami-06b1c45ea24991ed1",
+        "alinux2": "ami-01c43ed393bc72805",
         "centos7": "UNSUPPORTED",
-        "centos8": "ami-0987e731e450e1149",
-        "ubuntu1804": "ami-09ab3333e6eacd857",
-        "ubuntu2004": "ami-0207cb01316d437a1"
+        "centos8": "ami-00bf447bb4cd2e747",
+        "ubuntu1804": "ami-0c6152e34756c5b6c",
+        "ubuntu2004": "ami-056a406dcba84ed20"
       },
       "ap-northeast-2": {
-        "alinux2": "ami-0b6c91ff3872974b5",
+        "alinux2": "ami-08d5e3f7bc53dedd5",
         "centos7": "UNSUPPORTED",
-        "centos8": "ami-01bd530cf1a02b774",
-        "ubuntu1804": "ami-068e34ddd2329292d",
-        "ubuntu2004": "ami-0972ccc63cba49af3"
+        "centos8": "ami-02af39e1ec47ddc95",
+        "ubuntu1804": "ami-033bfdefb3f80d985",
+        "ubuntu2004": "ami-0ccfaeb44d33e4e28"
       },
       "ap-northeast-3": {
         "alinux2": "UNSUPPORTED",
@@ -845,174 +845,174 @@
         "ubuntu2004": "UNSUPPORTED"
       },
       "ap-south-1": {
-        "alinux2": "ami-082ca6657ce6ee5a2",
+        "alinux2": "ami-05c1b1730ab33e923",
         "centos7": "UNSUPPORTED",
-        "centos8": "ami-0e5c8708f2ea493c8",
-        "ubuntu1804": "ami-0c0e12a84e3e60064",
-        "ubuntu2004": "ami-04cfe3f4b9d466718"
+        "centos8": "ami-08652b83f1cd81f2e",
+        "ubuntu1804": "ami-06764f824ea59b091",
+        "ubuntu2004": "ami-038c13e5dffee29b7"
       },
       "ap-southeast-1": {
-        "alinux2": "ami-005b6e22cb49aa827",
+        "alinux2": "ami-03161fbad27bc247c",
         "centos7": "UNSUPPORTED",
-        "centos8": "ami-01d88d4d234c3d9ea",
-        "ubuntu1804": "ami-0e19b35f58ba43890",
-        "ubuntu2004": "ami-0e955fdc1585696ac"
+        "centos8": "ami-07226c326d81636a0",
+        "ubuntu1804": "ami-095fadf198f1d4295",
+        "ubuntu2004": "ami-0b04e54ac437944cd"
       },
       "ap-southeast-2": {
-        "alinux2": "ami-0aec88697b069ba74",
+        "alinux2": "ami-0b3b6cf5be89fa307",
         "centos7": "UNSUPPORTED",
-        "centos8": "ami-0de45082e9c3a36de",
-        "ubuntu1804": "ami-0e779961330688714",
-        "ubuntu2004": "ami-0473e61db453861f7"
+        "centos8": "ami-08c4719a5f97665f5",
+        "ubuntu1804": "ami-056bb857ebbd6d8ce",
+        "ubuntu2004": "ami-0bb9bdf13bd16357c"
       },
       "ca-central-1": {
-        "alinux2": "ami-08e43c35c8b73015c",
+        "alinux2": "ami-0772eadbd45fa95da",
         "centos7": "UNSUPPORTED",
-        "centos8": "ami-01d11c27965d640ae",
-        "ubuntu1804": "ami-055a875c44b588088",
-        "ubuntu2004": "ami-0bdc10ce9be7b90e7"
+        "centos8": "ami-0c9b3c3361320a5f0",
+        "ubuntu1804": "ami-05730490d25c1c27e",
+        "ubuntu2004": "ami-04a2daefb059f6cfb"
       },
       "cn-north-1": {
-        "alinux2": "ami-0c0f9ec86128e386c",
+        "alinux2": "ami-070bc0c6211550877",
         "centos7": "UNSUPPORTED",
         "centos8": "UNSUPPORTED",
-        "ubuntu1804": "ami-0196a972594cf199f",
-        "ubuntu2004": "ami-05124c54aede8da02"
+        "ubuntu1804": "ami-0bd2de972bc5dca4c",
+        "ubuntu2004": "ami-0c06ca61adafbc04a"
       },
       "cn-northwest-1": {
-        "alinux2": "ami-0b1b17049bcd2383b",
+        "alinux2": "ami-05412d2e32a7c7883",
         "centos7": "UNSUPPORTED",
         "centos8": "UNSUPPORTED",
-        "ubuntu1804": "ami-0e5d8c27167968932",
-        "ubuntu2004": "ami-0e8a081981ef81cbe"
+        "ubuntu1804": "ami-0efc32c1be41292d8",
+        "ubuntu2004": "ami-0e1aa88dc2b333d6d"
       },
       "eu-central-1": {
-        "alinux2": "ami-0be3b36d3940f6b43",
+        "alinux2": "ami-0c9f1f7d01a0c4118",
         "centos7": "UNSUPPORTED",
-        "centos8": "ami-0b83b99115aacb4d5",
-        "ubuntu1804": "ami-059a3e39fa5757e30",
-        "ubuntu2004": "ami-03842f4c5cf7e0ff0"
+        "centos8": "ami-0afaf704d06a3f52a",
+        "ubuntu1804": "ami-0e29b5b10dc71dc5f",
+        "ubuntu2004": "ami-02b7cb8ff682bd6ef"
       },
       "eu-north-1": {
-        "alinux2": "ami-03d23123de5cac40d",
+        "alinux2": "ami-049353e3cb0f9f039",
         "centos7": "UNSUPPORTED",
-        "centos8": "ami-0e800481dfa43bd1d",
-        "ubuntu1804": "ami-0d1ad77d6db80c8c3",
-        "ubuntu2004": "ami-0a63e7739aa8699f7"
+        "centos8": "ami-0952cb29c0097e87a",
+        "ubuntu1804": "ami-09eb809b707e9cbc8",
+        "ubuntu2004": "ami-0cfa8b35c0c839104"
       },
       "eu-south-1": {
-        "alinux2": "ami-047c05ebf7061307a",
+        "alinux2": "ami-0b6cea2da1787cb3a",
         "centos7": "UNSUPPORTED",
-        "centos8": "ami-01f895df751644a65",
-        "ubuntu1804": "ami-08ad558b518803185",
-        "ubuntu2004": "ami-0bfa592e01c6728ed"
+        "centos8": "ami-0f03a6fcebc0c8076",
+        "ubuntu1804": "ami-03336805e55920c95",
+        "ubuntu2004": "ami-0c88a32d8f35a9f3b"
       },
       "eu-west-1": {
-        "alinux2": "ami-04e2ab6d71f1fd16c",
+        "alinux2": "ami-036bfe94a219c4323",
         "centos7": "UNSUPPORTED",
-        "centos8": "ami-0fc1f4272a10e48de",
-        "ubuntu1804": "ami-01ff2cedb7f6a9dd5",
-        "ubuntu2004": "ami-0fc54252114b2927f"
+        "centos8": "ami-0c240aa6c2790f26a",
+        "ubuntu1804": "ami-00b67b4773fb4e624",
+        "ubuntu2004": "ami-09ac4fc4f947dfc5d"
       },
       "eu-west-2": {
-        "alinux2": "ami-02a48038d99952de8",
+        "alinux2": "ami-045135811fa07b6b3",
         "centos7": "UNSUPPORTED",
-        "centos8": "ami-05667e2a8051c2bb5",
-        "ubuntu1804": "ami-0d5fb88128f1baa7a",
-        "ubuntu2004": "ami-0d857758009a91d8b"
+        "centos8": "ami-0c902216df17b4013",
+        "ubuntu1804": "ami-0e6ffc876624715b8",
+        "ubuntu2004": "ami-037aadc2e5e469278"
       },
       "eu-west-3": {
-        "alinux2": "ami-0e40fef5b18f8d499",
+        "alinux2": "ami-09640e4c3f72de54e",
         "centos7": "UNSUPPORTED",
-        "centos8": "ami-04e826bb83710fa75",
-        "ubuntu1804": "ami-0fd897fa5c7951840",
-        "ubuntu2004": "ami-019eed76728ff3d6a"
+        "centos8": "ami-0bf8e93c818495b47",
+        "ubuntu1804": "ami-09752a423f19987f4",
+        "ubuntu2004": "ami-0ef5b8da76db660df"
       },
       "me-south-1": {
-        "alinux2": "ami-0994c6e6191bd9a0a",
+        "alinux2": "ami-0fa75a0f46a52a058",
         "centos7": "UNSUPPORTED",
-        "centos8": "ami-0adbff6d4b25dc114",
-        "ubuntu1804": "ami-0684cba2ec889894a",
-        "ubuntu2004": "ami-007ac2a543d6ae841"
+        "centos8": "ami-0bd79922b63e2605f",
+        "ubuntu1804": "ami-0cb09296c4664a600",
+        "ubuntu2004": "ami-07b98966bc3352a4b"
       },
       "sa-east-1": {
-        "alinux2": "ami-08a27e6979917b9db",
+        "alinux2": "ami-0412e161281d80b68",
         "centos7": "UNSUPPORTED",
-        "centos8": "ami-069b713ec2a05853a",
-        "ubuntu1804": "ami-060c58d65c3f162b6",
-        "ubuntu2004": "ami-0c80a886bfd124cc2"
+        "centos8": "ami-0c52a0bbff58fdd1e",
+        "ubuntu1804": "ami-08658ff85720107ad",
+        "ubuntu2004": "ami-05a6ab129d7033fcb"
       },
       "us-east-1": {
-        "alinux2": "ami-08834e366ff47f700",
+        "alinux2": "ami-07c96a42d069ec0ca",
         "centos7": "UNSUPPORTED",
-        "centos8": "ami-09c3e64f32f611dbf",
-        "ubuntu1804": "ami-09791cc9641a953dd",
-        "ubuntu2004": "ami-0d920d4d11d803aa9"
+        "centos8": "ami-02b0ba5d6493cc6d1",
+        "ubuntu1804": "ami-026d985f5be3d7871",
+        "ubuntu2004": "ami-0c6c487c31ec2e683"
       },
       "us-east-2": {
-        "alinux2": "ami-0c9a9b66296c05305",
+        "alinux2": "ami-0df22ca5a16590d29",
         "centos7": "UNSUPPORTED",
-        "centos8": "ami-0ba7711971220d0cd",
-        "ubuntu1804": "ami-01e9b9616bb7e28d5",
-        "ubuntu2004": "ami-033714d61c4352a05"
+        "centos8": "ami-06996d7ac38620e9b",
+        "ubuntu1804": "ami-0aed0208ad52238c6",
+        "ubuntu2004": "ami-07e4e7bec7ce1f4ab"
       },
       "us-gov-east-1": {
-        "alinux2": "ami-0204e3c2cc4aa5e76",
+        "alinux2": "ami-0b4c358f57604504c",
         "centos7": "UNSUPPORTED",
         "centos8": "UNSUPPORTED",
-        "ubuntu1804": "ami-01911e6d351fb56fc",
-        "ubuntu2004": "ami-095c6c38d7bd832b3"
+        "ubuntu1804": "ami-0177d72ca11421e1d",
+        "ubuntu2004": "ami-0c5b6cac84875871f"
       },
       "us-gov-west-1": {
-        "alinux2": "ami-00ec52865cf6c5d9f",
+        "alinux2": "ami-0adbde569682c2740",
         "centos7": "UNSUPPORTED",
         "centos8": "UNSUPPORTED",
-        "ubuntu1804": "ami-0d8bd14ef82be4407",
-        "ubuntu2004": "ami-062a7716fb4e69098"
+        "ubuntu1804": "ami-0073ae67ad5b418f6",
+        "ubuntu2004": "ami-022944ac1a64f4aff"
       },
       "us-west-1": {
-        "alinux2": "ami-0e19ce8540ffbdad8",
+        "alinux2": "ami-04055147c484ba2b6",
         "centos7": "UNSUPPORTED",
-        "centos8": "ami-0f70a963bf41341e8",
-        "ubuntu1804": "ami-08f1101a1e39e1296",
-        "ubuntu2004": "ami-0b260afafe9d1addc"
+        "centos8": "ami-09712520844275993",
+        "ubuntu1804": "ami-0e173f211c4ea738d",
+        "ubuntu2004": "ami-0c0c67998845b4748"
       },
       "us-west-2": {
-        "alinux2": "ami-0a05534c9bf66d94c",
+        "alinux2": "ami-024285da28e8491c5",
         "centos7": "UNSUPPORTED",
-        "centos8": "ami-042da30cf5e76f144",
-        "ubuntu1804": "ami-08d53fa80f700b1c4",
-        "ubuntu2004": "ami-026a909cdfbe9919b"
+        "centos8": "ami-0da42d705c05beaab",
+        "ubuntu1804": "ami-031ee232f9757134a",
+        "ubuntu2004": "ami-02bc78ed101caad5b"
       }
     },
     "AWSRegionOS2AMIx86": {
       "af-south-1": {
-        "alinux2": "ami-0fa07fd3377e05f6a",
-        "centos7": "ami-00cf0daeec4d4c2ac",
-        "centos8": "ami-0de791d10858e4708",
-        "ubuntu1804": "ami-0949d48c8a89c3aac",
-        "ubuntu2004": "ami-02e8f5de1e9f95a3e"
+        "alinux2": "ami-078ba1b6834d887fb",
+        "centos7": "ami-0342c02ebeab81710",
+        "centos8": "ami-03e5fb33e44365be8",
+        "ubuntu1804": "ami-0d11b1c4d5e8f547b",
+        "ubuntu2004": "ami-000ad002154c9a1e6"
       },
       "ap-east-1": {
-        "alinux2": "ami-0ea82f7592e878f4c",
-        "centos7": "ami-06e055df57c083a09",
-        "centos8": "ami-089c893cecbac5844",
-        "ubuntu1804": "ami-0d6294f9e44acdb9f",
-        "ubuntu2004": "ami-00683359e727cecec"
+        "alinux2": "ami-08ca5e0c3d231e229",
+        "centos7": "ami-02ff3b920e4e1e22a",
+        "centos8": "ami-0bc7cf529234077c3",
+        "ubuntu1804": "ami-0f2dc6d61e4ae454e",
+        "ubuntu2004": "ami-02cf6f1555b376f67"
       },
       "ap-northeast-1": {
-        "alinux2": "ami-0c334d7e7f67b17ea",
-        "centos7": "ami-0f3c0231197fcd4ba",
-        "centos8": "ami-022a5de992839271b",
-        "ubuntu1804": "ami-07cc9d38cd43d37b0",
-        "ubuntu2004": "ami-0ee512f6c63a2092a"
+        "alinux2": "ami-06ca34f360b3906ce",
+        "centos7": "ami-01232cfd188586a7f",
+        "centos8": "ami-06763c77831a1b7d2",
+        "ubuntu1804": "ami-0828756c1df1c988a",
+        "ubuntu2004": "ami-05533bd40e6ba5eb7"
       },
       "ap-northeast-2": {
-        "alinux2": "ami-01a75381340a8576a",
-        "centos7": "ami-0a539ca12524867cc",
-        "centos8": "ami-0de7ed6a5c981ca47",
-        "ubuntu1804": "ami-06ca22940d78a00e1",
-        "ubuntu2004": "ami-0dd7c72d993750270"
+        "alinux2": "ami-003f399bbb1a0ede8",
+        "centos7": "ami-06bc550d0a9599a17",
+        "centos8": "ami-07469dca75c1a77a4",
+        "ubuntu1804": "ami-059124e91afae9afb",
+        "ubuntu2004": "ami-01501bc585eb13aea"
       },
       "ap-northeast-3": {
         "alinux2": "UNSUPPORTED",
@@ -1022,144 +1022,144 @@
         "ubuntu2004": "UNSUPPORTED"
       },
       "ap-south-1": {
-        "alinux2": "ami-0bf021cf880aa2378",
-        "centos7": "ami-00229cef9cc04e14a",
-        "centos8": "ami-0f878dc5de9b6cea3",
-        "ubuntu1804": "ami-0a32b98e4115f7b8c",
-        "ubuntu2004": "ami-07a3bf81983a58da4"
+        "alinux2": "ami-08fa00fef93aeb242",
+        "centos7": "ami-005c3cf8e657575ea",
+        "centos8": "ami-080297d482541ba9f",
+        "ubuntu1804": "ami-0d60e6237f3eb5935",
+        "ubuntu2004": "ami-010922c8316bf7413"
       },
       "ap-southeast-1": {
-        "alinux2": "ami-05cc344efdf5e3e6f",
-        "centos7": "ami-0f85d9fe7678c6612",
-        "centos8": "ami-041ec91fc54ad64e1",
-        "ubuntu1804": "ami-0ae65b714814782f7",
-        "ubuntu2004": "ami-0b0a1c6100fd9218d"
+        "alinux2": "ami-0dfd7d7619bcf1058",
+        "centos7": "ami-0b56a847decfcf08c",
+        "centos8": "ami-0d9bd556dbc3e5247",
+        "ubuntu1804": "ami-07b1ec7b5d58c2254",
+        "ubuntu2004": "ami-05ed3a5c38d9aeb23"
       },
       "ap-southeast-2": {
-        "alinux2": "ami-07f6fe426f60665c5",
-        "centos7": "ami-0ec52a8a7e7319cbf",
-        "centos8": "ami-0a0e7fd2c0354711f",
-        "ubuntu1804": "ami-00c3c2f1994d09ff7",
-        "ubuntu2004": "ami-019d9feb4e6540e0a"
+        "alinux2": "ami-035f2eaf885b551db",
+        "centos7": "ami-0c47b2c411e56b56c",
+        "centos8": "ami-0f1af0a7220f316a5",
+        "ubuntu1804": "ami-056de4a2945980ab1",
+        "ubuntu2004": "ami-0bef56ab22708fb32"
       },
       "ca-central-1": {
-        "alinux2": "ami-02d251fcff00ccaee",
-        "centos7": "ami-016ce0355f6db983f",
-        "centos8": "ami-0eedd34ac05245df1",
-        "ubuntu1804": "ami-0f9fb4853a8625db8",
-        "ubuntu2004": "ami-08017c5a69cea5c54"
+        "alinux2": "ami-0f3e431196207ab18",
+        "centos7": "ami-02de679bf9080c673",
+        "centos8": "ami-0efd5f232bbf74be7",
+        "ubuntu1804": "ami-0c6854fd96f874a8b",
+        "ubuntu2004": "ami-098078bb2e8a9ac73"
       },
       "cn-north-1": {
-        "alinux2": "ami-0910878f7e4acbb26",
+        "alinux2": "ami-0d8443f2e6c9f8536",
         "centos7": "UNSUPPORTED",
         "centos8": "UNSUPPORTED",
-        "ubuntu1804": "ami-06456398fe626b037",
-        "ubuntu2004": "ami-098136bf48cc41ea3"
+        "ubuntu1804": "ami-09e520c8a0a48d35b",
+        "ubuntu2004": "ami-0d0e4a332f09ef2e1"
       },
       "cn-northwest-1": {
-        "alinux2": "ami-0f9d24c23314f1c35",
+        "alinux2": "ami-07fdab96aae491c9b",
         "centos7": "UNSUPPORTED",
         "centos8": "UNSUPPORTED",
-        "ubuntu1804": "ami-0f52380ce98d3e3af",
-        "ubuntu2004": "ami-0c093d03dc9bcc654"
+        "ubuntu1804": "ami-0290d75218aad6a93",
+        "ubuntu2004": "ami-09d6e559ac91eb9ba"
       },
       "eu-central-1": {
-        "alinux2": "ami-048335760473a3ebd",
-        "centos7": "ami-04ff844c408506aa3",
-        "centos8": "ami-05ae8cbfbd839a10e",
-        "ubuntu1804": "ami-0a0cde77c001ed2bf",
-        "ubuntu2004": "ami-08b6b6d013301a410"
+        "alinux2": "ami-011a77a1a8c54aacc",
+        "centos7": "ami-0b914529c99fa542d",
+        "centos8": "ami-0c9f635dbb127e7bf",
+        "ubuntu1804": "ami-034058017f7d1671b",
+        "ubuntu2004": "ami-0366592fae0ca34c7"
       },
       "eu-north-1": {
-        "alinux2": "ami-0745e1f127bbe809a",
-        "centos7": "ami-082f96eb64483fa73",
-        "centos8": "ami-07e3334a75cdabc20",
-        "ubuntu1804": "ami-0abeec634a99ed18d",
-        "ubuntu2004": "ami-07af17c300413d1b7"
+        "alinux2": "ami-098804f697ec4e93b",
+        "centos7": "ami-08dfc86123fcf5ab5",
+        "centos8": "ami-0209af1e13d5fe1fc",
+        "ubuntu1804": "ami-0d6e0650f35900321",
+        "ubuntu2004": "ami-072697ad1f21d465b"
       },
       "eu-south-1": {
-        "alinux2": "ami-0e63cd7da7b6635ee",
-        "centos7": "ami-06375c2ad1530a632",
-        "centos8": "ami-0446532269854ec57",
-        "ubuntu1804": "ami-062b1506914e3b1a8",
-        "ubuntu2004": "ami-0b63dd8fecc7602f9"
+        "alinux2": "ami-04d6fc7a0675a01cf",
+        "centos7": "ami-012bff1f1b77fa93e",
+        "centos8": "ami-0c9451f9cc3627a6b",
+        "ubuntu1804": "ami-07d9d9f423f864aa2",
+        "ubuntu2004": "ami-06a613b117f0449e0"
       },
       "eu-west-1": {
-        "alinux2": "ami-022ac274688692560",
-        "centos7": "ami-0333f6a1c7b69be79",
-        "centos8": "ami-0f8722d6bfb975f1d",
-        "ubuntu1804": "ami-060d738833cb8b95e",
-        "ubuntu2004": "ami-0777eee1ef01f921c"
+        "alinux2": "ami-025c26a35a242ab31",
+        "centos7": "ami-091cd5c30e47d7b5d",
+        "centos8": "ami-0708e48e98e4020fb",
+        "ubuntu1804": "ami-0c0ee93cc2c16e041",
+        "ubuntu2004": "ami-01057ed51e9f1f13c"
       },
       "eu-west-2": {
-        "alinux2": "ami-06b29a0312744e595",
-        "centos7": "ami-0851dd86601b2ca8e",
-        "centos8": "ami-0c0f969ee9fe4fc3e",
-        "ubuntu1804": "ami-088f458c70f14fbec",
-        "ubuntu2004": "ami-06e459f67053f02d5"
+        "alinux2": "ami-027c61d6cc4627c23",
+        "centos7": "ami-0f205e9fe6487450b",
+        "centos8": "ami-0a8e5d338e9c5ac2b",
+        "ubuntu1804": "ami-00d77b1a1004edb58",
+        "ubuntu2004": "ami-03b3427d4a788f53a"
       },
       "eu-west-3": {
-        "alinux2": "ami-03196c9c1c35534e9",
-        "centos7": "ami-03ec0f9173e22f131",
-        "centos8": "ami-01c744120eb0519fa",
-        "ubuntu1804": "ami-074904c8ee3c3029c",
-        "ubuntu2004": "ami-0932f1d96d12399b9"
+        "alinux2": "ami-0dcc692e5ba8fdfd3",
+        "centos7": "ami-01100d9f56c78b7fb",
+        "centos8": "ami-080ad5473770ed32c",
+        "ubuntu1804": "ami-026f5fb59ddb22499",
+        "ubuntu2004": "ami-0cf8e439e0997829b"
       },
       "me-south-1": {
-        "alinux2": "ami-0629baced6c174c94",
-        "centos7": "ami-0a3c71e11d8ebe416",
-        "centos8": "ami-020d88369e97362d3",
-        "ubuntu1804": "ami-0ad11aad582463fc5",
-        "ubuntu2004": "ami-092add57f60170f0a"
+        "alinux2": "ami-0c83b57f7947fb792",
+        "centos7": "ami-0edc968c4b1fbd02b",
+        "centos8": "ami-0896668160781844f",
+        "ubuntu1804": "ami-053bd0bccac184d9d",
+        "ubuntu2004": "ami-03d9c308f1c6cd82b"
       },
       "sa-east-1": {
-        "alinux2": "ami-034913bfc570aadbe",
-        "centos7": "ami-0bae120608f283026",
-        "centos8": "ami-021c7aaa731d8cd92",
-        "ubuntu1804": "ami-02667ba3a66e6ae05",
-        "ubuntu2004": "ami-0912ea590a89b15c6"
+        "alinux2": "ami-0f91712a124d17445",
+        "centos7": "ami-061b917c5d84d4be4",
+        "centos8": "ami-0f30b5d12b9616b25",
+        "ubuntu1804": "ami-03ed35c152eb8a8ec",
+        "ubuntu2004": "ami-0cb94dbb4908c2bd2"
       },
       "us-east-1": {
-        "alinux2": "ami-09d7661c7ae96b199",
-        "centos7": "ami-0aa4844579c2c3c71",
-        "centos8": "ami-07c467738c590f28e",
-        "ubuntu1804": "ami-04738311a4aee2f55",
-        "ubuntu2004": "ami-0774f3a01df5da2b5"
+        "alinux2": "ami-05c34afa8785834ae",
+        "centos7": "ami-018d562cb054256db",
+        "centos8": "ami-033fadaad25e34140",
+        "ubuntu1804": "ami-0ea2cd02460300e19",
+        "ubuntu2004": "ami-094f72c711db030be"
       },
       "us-east-2": {
-        "alinux2": "ami-0dd27340899857163",
-        "centos7": "ami-0be98a8c41dc078f5",
-        "centos8": "ami-0c81705cc84dc7cd0",
-        "ubuntu1804": "ami-0ff7538d9fbf63b35",
-        "ubuntu2004": "ami-01dffc940a18e54db"
+        "alinux2": "ami-0868e3a46e728b22a",
+        "centos7": "ami-0a3c4042ff10054f7",
+        "centos8": "ami-0c97e51ec0c491c21",
+        "ubuntu1804": "ami-0ecaa47d99df4e6b6",
+        "ubuntu2004": "ami-09b55f7d8195e33af"
       },
       "us-gov-east-1": {
-        "alinux2": "ami-07c0db459dd567a2e",
+        "alinux2": "ami-00fa67893190e7912",
         "centos7": "UNSUPPORTED",
         "centos8": "UNSUPPORTED",
-        "ubuntu1804": "ami-0fed2ed5f4a927155",
-        "ubuntu2004": "ami-0140d4998c04240b9"
+        "ubuntu1804": "ami-085bdc38173427e70",
+        "ubuntu2004": "ami-0df82ada9b5b8b733"
       },
       "us-gov-west-1": {
-        "alinux2": "ami-04e6de860eed3b533",
+        "alinux2": "ami-08616d8f8abebeb6b",
         "centos7": "UNSUPPORTED",
         "centos8": "UNSUPPORTED",
-        "ubuntu1804": "ami-0c642f50a33246104",
-        "ubuntu2004": "ami-061b938884498d9ef"
+        "ubuntu1804": "ami-0dffe80d11b9008f8",
+        "ubuntu2004": "ami-0599cfd9bc3d4e3fc"
       },
       "us-west-1": {
-        "alinux2": "ami-0cf0acf624cb45af1",
-        "centos7": "ami-08b92f5f62b4a8cbe",
-        "centos8": "ami-06e94642459c583ec",
-        "ubuntu1804": "ami-082697bd7412068a3",
-        "ubuntu2004": "ami-0b503c64d6cd3a9eb"
+        "alinux2": "ami-0cc87d610e66862b0",
+        "centos7": "ami-0f57b9803ccaa025e",
+        "centos8": "ami-0efe504924c9443ef",
+        "ubuntu1804": "ami-02e88f432a165bbff",
+        "ubuntu2004": "ami-0efc8d0ac3f69ec0d"
       },
       "us-west-2": {
-        "alinux2": "ami-0436692c7b452bae4",
-        "centos7": "ami-0bf5a647515379192",
-        "centos8": "ami-0d67365f19ed6443f",
-        "ubuntu1804": "ami-0fa53dde45ac2b771",
-        "ubuntu2004": "ami-086f385266889932c"
+        "alinux2": "ami-0c22fa494106959c2",
+        "centos7": "ami-04f94f12f112ff196",
+        "centos8": "ami-05bcc430de513a0e7",
+        "ubuntu1804": "ami-091c76e60d0b02d8e",
+        "ubuntu2004": "ami-0ce83f800de72fd5f"
       }
     },
     "OSFeatures": {