diff --git a/amis.txt b/amis.txt
index 2d14a2e557..934867f9c4 100644
--- a/amis.txt
+++ b/amis.txt
@@ -1,135 +1,135 @@
 ## x86_64
 # alinux2
-af-south-1: ami-03ffa299762b68e7a
-ap-east-1: ami-0e7024947984c7c88
-ap-northeast-1: ami-0f60e3417f75ea9c3
-ap-northeast-2: ami-0390f1f7c07b8bbca
+af-south-1: ami-09723f9246b83cbd4
+ap-east-1: ami-0b6d8f7bea20df884
+ap-northeast-1: ami-03cc9f34d086944e8
+ap-northeast-2: ami-0bc40b626929eb6c4
 ap-northeast-3: UNSUPPORTED
-ap-south-1: ami-0f62b5800c827ea7c
-ap-southeast-1: ami-0cfc182f7f1fa7e25
-ap-southeast-2: ami-016f034449b053a08
-ca-central-1: ami-077c7fb83c339b747
-cn-north-1: ami-03bf5e0ac043c4ed4
-cn-northwest-1: ami-04167fbc3b0fb4f0d
-eu-central-1: ami-0662e2c6943321b39
-eu-north-1: ami-07ae17926d82c3166
-eu-south-1: ami-0ae6877c33581cda8
-eu-west-1: ami-0a2d3cbf1b5ec5c9a
-eu-west-2: ami-0ef556e64de679108
-eu-west-3: ami-07b31a9ecbd12563b
-me-south-1: ami-04e87b814e81c4383
-sa-east-1: ami-01d7b73f7b9a7be6c
-us-east-1: ami-03dd9a454711cb08d
-us-east-2: ami-0a6f718f75667aa7b
-us-gov-east-1: ami-06ffeb9d465d39f7c
-us-gov-west-1: ami-068ab9de856b5a709
-us-west-1: ami-0024b19ee4d26af09
-us-west-2: ami-0e05fc7dab55cf3c6
+ap-south-1: ami-01bbac10fd20905ea
+ap-southeast-1: ami-08214dcea431f2880
+ap-southeast-2: ami-0b6c9cce51a38331b
+ca-central-1: ami-0ce86638a3db0b02f
+cn-north-1: ami-004872e5929e6713f
+cn-northwest-1: ami-007bbed296a44627b
+eu-central-1: ami-098eda3d212bd8859
+eu-north-1: ami-02d75886c4f341afa
+eu-south-1: ami-05de8d0b874252b30
+eu-west-1: ami-08e65ca779cdef1ed
+eu-west-2: ami-0de57d1e2a075381f
+eu-west-3: ami-0ee000b268b55b592
+me-south-1: ami-06124a3a524a8a03a
+sa-east-1: ami-084bb499bd6603bfe
+us-east-1: ami-04fdccb8febb61334
+us-east-2: ami-014789009ae67e5b9
+us-gov-east-1: ami-064d1bb1925930896
+us-gov-west-1: ami-0f2526fd6107f6110
+us-west-1: ami-0c57956c4072e02d0
+us-west-2: ami-09ad8a472f1da0247
 # centos7
-af-south-1: ami-0cca5d4d6437b9ba9
-ap-east-1: ami-0e848e372d366be35
-ap-northeast-1: ami-073c7f2265c113cc2
-ap-northeast-2: ami-07d6d9ff52b3aa70d
+af-south-1: ami-0974748ef51878e66
+ap-east-1: ami-0527b3c010b072fa0
+ap-northeast-1: ami-084a3a017a393f317
+ap-northeast-2: ami-0678a15f734b1a5c2
 ap-northeast-3: UNSUPPORTED
-ap-south-1: ami-0652e4fe3b0c3d60b
-ap-southeast-1: ami-0239c041bfad0491d
-ap-southeast-2: ami-012e9be419bf6eb9a
-ca-central-1: ami-0c4bfd1317bb2de35
+ap-south-1: ami-00f9531465ec8a112
+ap-southeast-1: ami-006fada10c492cdb1
+ap-southeast-2: ami-0d0d870ecbfda7d7a
+ca-central-1: ami-0992e9e27c4c60bf1
 cn-north-1: UNSUPPORTED
 cn-northwest-1: UNSUPPORTED
-eu-central-1: ami-0be38fdd538735e2d
-eu-north-1: ami-07de5b0f08353016d
-eu-south-1: ami-0ae9bc8017735ba36
-eu-west-1: ami-0c7db484686b03385
-eu-west-2: ami-09df47dc7632d9a0b
-eu-west-3: ami-0f43d0cf65b43e60c
-me-south-1: ami-0d5965bde61986089
-sa-east-1: ami-06da4816ca5646b80
-us-east-1: ami-00eee4ef9f0772651
-us-east-2: ami-0d1ec5d59780a3408
+eu-central-1: ami-0fc04650c254b8aa5
+eu-north-1: ami-0ca7c73260c1a73eb
+eu-south-1: ami-0c8cf93deb4135699
+eu-west-1: ami-089afcd4b3c523c42
+eu-west-2: ami-0aba35f17c343b1bb
+eu-west-3: ami-0cd78eed39863ebcc
+me-south-1: ami-0a445b92c5db55ddc
+sa-east-1: ami-0822c6351308daf7a
+us-east-1: ami-0b6d3c7603a807bbe
+us-east-2: ami-06e00c6de38f71096
 us-gov-east-1: UNSUPPORTED
 us-gov-west-1: UNSUPPORTED
-us-west-1: ami-0d9829f52308a685f
-us-west-2: ami-08a660f322183d62c
+us-west-1: ami-03aeb034f5bc0694f
+us-west-2: ami-08a504f78ca0e88c6
 # ubuntu1804
-af-south-1: ami-072992fe42d60057e
-ap-east-1: ami-0c9d6feacfcc46720
-ap-northeast-1: ami-0af2e09c776cd6971
-ap-northeast-2: ami-0ac0cc7aa742acd1e
+af-south-1: ami-08325c8a9f371045f
+ap-east-1: ami-0aaacd118ea2eba1b
+ap-northeast-1: ami-00b21acbc46f68cf1
+ap-northeast-2: ami-042da98b9da8bf8e3
 ap-northeast-3: UNSUPPORTED
-ap-south-1: ami-0c3457e7ea9b2aa9b
-ap-southeast-1: ami-074c03fa1cf62c016
-ap-southeast-2: ami-007bbb8b1f24db6c5
-ca-central-1: ami-0aa63de94909b8f93
-cn-north-1: ami-0ef094914d7872947
-cn-northwest-1: ami-0900eaf306ccb9ab6
-eu-central-1: ami-0dbc726cee661519e
-eu-north-1: ami-0564be393703e55c7
-eu-south-1: ami-0f8fb48d51df4e524
-eu-west-1: ami-0f032fcd7bf63964f
-eu-west-2: ami-0de59e64bb1bc1cfd
-eu-west-3: ami-0e15fad8c6d473979
-me-south-1: ami-068372d451fac2404
-sa-east-1: ami-06ce2ac13a376b92f
-us-east-1: ami-0942b9e26848e970a
-us-east-2: ami-085e113f23a28d6ec
-us-gov-east-1: ami-0163b392af385c1c0
-us-gov-west-1: ami-03905eaa012fc4bfd
-us-west-1: ami-051f1a3fb15a700a8
-us-west-2: ami-00f435f9f2d2b5739
+ap-south-1: ami-0015cd86053d1956a
+ap-southeast-1: ami-07745260e0519d488
+ap-southeast-2: ami-081c524916459af12
+ca-central-1: ami-0bbd8ec233bd5def5
+cn-north-1: ami-0f3ce487606fb8283
+cn-northwest-1: ami-0b696e4f5d4ee9820
+eu-central-1: ami-0e6299f16fc40d694
+eu-north-1: ami-00c4be663eaf3031d
+eu-south-1: ami-062cb508942efc18e
+eu-west-1: ami-069edc03534cd40e5
+eu-west-2: ami-0173487cfc49fe57a
+eu-west-3: ami-0d24dc6e73192c8af
+me-south-1: ami-0f5e29954e9573724
+sa-east-1: ami-0dd43a463e11a5124
+us-east-1: ami-0d8972e7ca8787f56
+us-east-2: ami-03a2861629f0e7a6f
+us-gov-east-1: ami-0e8b6cfd39059457f
+us-gov-west-1: ami-079ccd2d7493e1523
+us-west-1: ami-01dd3a8cd7a09c97f
+us-west-2: ami-093a30dd310773a58
 # ubuntu2004
-af-south-1: ami-0dc23cf8eab42bf66
-ap-east-1: ami-055b808abc638c76f
-ap-northeast-1: ami-0c8ad38779f800523
-ap-northeast-2: ami-00fd7b9423f73b5a0
+af-south-1: ami-07f755b7f86ccff9a
+ap-east-1: ami-02aa72f33498de412
+ap-northeast-1: ami-0d3188de18578ba9a
+ap-northeast-2: ami-0174fc82e7aeb93fe
 ap-northeast-3: UNSUPPORTED
-ap-south-1: ami-06e7d669f51721a64
-ap-southeast-1: ami-0dc143f69c9047143
-ap-southeast-2: ami-0b3ed6b90b874ab9e
-ca-central-1: ami-05d975aac020e1bbe
-cn-north-1: ami-08fc8f82c3771f05d
-cn-northwest-1: ami-0071b35d274d86d81
-eu-central-1: ami-0f77775d7ee4e4827
-eu-north-1: ami-0f389a44b21688649
-eu-south-1: ami-021e6c7ef8caea1c6
-eu-west-1: ami-04c5d4d286438bfe1
-eu-west-2: ami-0d70d9dff361c2c1a
-eu-west-3: ami-0d1dfcaf2000f2970
-me-south-1: ami-09696eac5608a23a5
-sa-east-1: ami-05712e98e43098f94
-us-east-1: ami-02e4099f21d40f7d8
-us-east-2: ami-046e3716e8ecae2a6
-us-gov-east-1: ami-0342ab789350d80d1
-us-gov-west-1: ami-0f8bdec6f62c6087e
-us-west-1: ami-049d37bc11d51b5ab
-us-west-2: ami-0bef4809a635ae3df
+ap-south-1: ami-007210cfb0f2ac832
+ap-southeast-1: ami-06359701d48fcca4e
+ap-southeast-2: ami-0a2101db6c4aa6785
+ca-central-1: ami-0dc454aef29f1a6dc
+cn-north-1: ami-0050c9bb976aef862
+cn-northwest-1: ami-031bd96985f1696c5
+eu-central-1: ami-08f6a9b906694eaee
+eu-north-1: ami-0e38e5577f7296be7
+eu-south-1: ami-01724d3afaf5423f5
+eu-west-1: ami-0021dbee6532b6b28
+eu-west-2: ami-0cf35b7532071f698
+eu-west-3: ami-0f37e523233f4fff2
+me-south-1: ami-0326aeebde57ab225
+sa-east-1: ami-03c2a6e86aaccb55a
+us-east-1: ami-01d9a3a5e233388c5
+us-east-2: ami-01448aa1fedd90bbe
+us-gov-east-1: ami-00a106286754de119
+us-gov-west-1: ami-09f2a99ae7732ce23
+us-west-1: ami-095a20cccb382c6a9
+us-west-2: ami-0c9486c7712b3756e
 ## arm64
 # alinux2
-af-south-1: ami-0c9a76fe83f9b660f
-ap-east-1: ami-0e1b883ce2fa28a49
-ap-northeast-1: ami-0e22d7bc40d7caa83
-ap-northeast-2: ami-07d553786d019109f
+af-south-1: ami-0e1732486a055367c
+ap-east-1: ami-0cb0da4f6f2684923
+ap-northeast-1: ami-08fe6a4b7df2da29c
+ap-northeast-2: ami-0fe97a69392b67cce
 ap-northeast-3: UNSUPPORTED
-ap-south-1: ami-03507cd07674ddb44
-ap-southeast-1: ami-041b75a18afe24418
-ap-southeast-2: ami-0badb0cb51eeada29
-ca-central-1: ami-046c5fb75c08097c9
-cn-north-1: ami-0242233365192a710
-cn-northwest-1: ami-030637f9c9dd8f598
-eu-central-1: ami-0b40a7cadd3f8d983
-eu-north-1: ami-09305a7de3952d5dd
-eu-south-1: ami-044adb7c012ca04cd
-eu-west-1: ami-093fc82b5a5e9d1a9
-eu-west-2: ami-014bf95d4e7542867
-eu-west-3: ami-0e067391904dbbcbd
-me-south-1: ami-019fef8f016d1289f
-sa-east-1: ami-05d626c24ea8dd943
-us-east-1: ami-026bea9963211488d
-us-east-2: ami-002dafc8b0c4bce86
-us-gov-east-1: ami-008f17ad4baf3737d
-us-gov-west-1: ami-0ebd5830b69480ab7
-us-west-1: ami-079441b7393fa5c74
-us-west-2: ami-0d506ae39ddf5a2d1
+ap-south-1: ami-072d7e0abe0d45fc5
+ap-southeast-1: ami-0d4f32544d4c60a17
+ap-southeast-2: ami-08ac0154339a3011d
+ca-central-1: ami-038057da8131253fb
+cn-north-1: ami-045327af1211f706d
+cn-northwest-1: ami-0b9fdb802fea2b72f
+eu-central-1: ami-00b75d41545128afb
+eu-north-1: ami-028510c5f2d1c5666
+eu-south-1: ami-0cffeee3332bce326
+eu-west-1: ami-0f7afd86f9d4150a2
+eu-west-2: ami-09742a79c6e9b0a3b
+eu-west-3: ami-0892e6fca5dc70e81
+me-south-1: ami-0b544bacb34fde137
+sa-east-1: ami-0704c589d03879f2c
+us-east-1: ami-06fca9052756a8d4f
+us-east-2: ami-0b5bb46aa1cbb4fe5
+us-gov-east-1: ami-0f682a897f428296a
+us-gov-west-1: ami-08b73b25951d64293
+us-west-1: ami-00bd5cdbf45b25891
+us-west-2: ami-037413b7c36d867ae
 # centos7
 af-south-1: UNSUPPORTED
 ap-east-1: UNSUPPORTED
@@ -157,54 +157,54 @@ us-gov-west-1: UNSUPPORTED
 us-west-1: UNSUPPORTED
 us-west-2: UNSUPPORTED
 # ubuntu1804
-af-south-1: ami-0c8716bef94a218f4
-ap-east-1: ami-042331525f54bf0e1
-ap-northeast-1: ami-06d973c5b21ea7bf5
-ap-northeast-2: ami-0a8e152df1f69efaf
+af-south-1: ami-057de8a76884a5460
+ap-east-1: ami-0c6c85eba32a68592
+ap-northeast-1: ami-004746da8948e2244
+ap-northeast-2: ami-0946de536e49d0aee
 ap-northeast-3: UNSUPPORTED
-ap-south-1: ami-050cb933ab14ba6eb
-ap-southeast-1: ami-040ace8e0da82e1a4
-ap-southeast-2: ami-0f7fd1a1a17a8b3a9
-ca-central-1: ami-0e1015ce73d4c5c1e
-cn-north-1: ami-084986d813c6d156c
-cn-northwest-1: ami-0e0978c7d80b88593
-eu-central-1: ami-0a1770834049f2403
-eu-north-1: ami-04a8c1f090dd92719
-eu-south-1: ami-0e183575c7b071a38
-eu-west-1: ami-0dce870da686a7f72
-eu-west-2: ami-0e63a96c9c9766900
-eu-west-3: ami-013c01d6c2fc4bab7
-me-south-1: ami-03e126e6d8b75e1a5
-sa-east-1: ami-025c476403ca1408d
-us-east-1: ami-020cb037342d0e447
-us-east-2: ami-0ec2d3ed02283381a
-us-gov-east-1: ami-058850f32ff4574ef
-us-gov-west-1: ami-05e3e4296616eee96
-us-west-1: ami-0865a3108ae0eb4b3
-us-west-2: ami-0d879a7c133ce2d48
+ap-south-1: ami-0c4cc39bb0b4ba4c4
+ap-southeast-1: ami-0e5f2bb58fcd00cea
+ap-southeast-2: ami-0388537de643d10a3
+ca-central-1: ami-0092520ff9fe18321
+cn-north-1: ami-0d85be78b92b1d0e7
+cn-northwest-1: ami-09bcaa02ab511a00b
+eu-central-1: ami-015164e9e809ba274
+eu-north-1: ami-037dd293065b8be29
+eu-south-1: ami-07065a6cc212f5bc0
+eu-west-1: ami-06104fac9df81080c
+eu-west-2: ami-0398fa6308cde1faa
+eu-west-3: ami-0225f3dd9906738f1
+me-south-1: ami-0b209acb2d82048d9
+sa-east-1: ami-018b67e207010cf31
+us-east-1: ami-0dee947669aa0bfaa
+us-east-2: ami-08efaa4fc2ff8de07
+us-gov-east-1: ami-0337822dcce91f4aa
+us-gov-west-1: ami-0b2cf2802d1b78f30
+us-west-1: ami-0baf6864071bc1a36
+us-west-2: ami-05b4dd2b02664a544
 # ubuntu2004
-af-south-1: ami-07e091052f651b136
-ap-east-1: ami-067c79f8e307b08e8
-ap-northeast-1: ami-05d23b73f858daa23
-ap-northeast-2: ami-06117ef405baac040
+af-south-1: ami-0d539e85a10e1dad6
+ap-east-1: ami-0349a40b38f579513
+ap-northeast-1: ami-05ec952c256022bf1
+ap-northeast-2: ami-03cf15a1366271256
 ap-northeast-3: UNSUPPORTED
-ap-south-1: ami-0dcf05d9fa03d2723
-ap-southeast-1: ami-07981b50c66629fa2
-ap-southeast-2: ami-0ecb8178bc8f4f785
-ca-central-1: ami-01fe2270fbd572605
-cn-north-1: ami-074d978c4f87050be
-cn-northwest-1: ami-06c8c7fbc55e4e601
-eu-central-1: ami-0d146bf976211940d
-eu-north-1: ami-0d3c02bb0d0562fa4
-eu-south-1: ami-026516bdbe4fcd4fe
-eu-west-1: ami-012d3dfc2801d7145
-eu-west-2: ami-069a2f4d894608307
-eu-west-3: ami-050f353a25797b002
-me-south-1: ami-08e42e987cfef7847
-sa-east-1: ami-069dd4db66108d240
-us-east-1: ami-04d8dd8e8170dc6d1
-us-east-2: ami-06f647d085aa5151c
-us-gov-east-1: ami-0201a3cb1571d845d
-us-gov-west-1: ami-0ccf210a4f8a10092
-us-west-1: ami-002306617064e09d6
-us-west-2: ami-01454ff5334f280eb
+ap-south-1: ami-0e05b15d6d02b386a
+ap-southeast-1: ami-003090c2fa6bbd131
+ap-southeast-2: ami-089303b3a178f6c0d
+ca-central-1: ami-0a3cdb8babd71a8a6
+cn-north-1: ami-00f4bedaba7b7df64
+cn-northwest-1: ami-04c70992e9f836eae
+eu-central-1: ami-0cb21210531f33fca
+eu-north-1: ami-0d9092b9954ca5d05
+eu-south-1: ami-0dcee5435499d6490
+eu-west-1: ami-054245c674ec561ae
+eu-west-2: ami-00bc7d9bf3b482d89
+eu-west-3: ami-01f8d4b5cafe6e816
+me-south-1: ami-09f82ed045a477d13
+sa-east-1: ami-0eb4bc208ae5f7563
+us-east-1: ami-0a0eb2c39d67494a5
+us-east-2: ami-09f956bc7ff7949e5
+us-gov-east-1: ami-02be616ebcafdd0dd
+us-gov-west-1: ami-0a1fff9fde3e17efc
+us-west-1: ami-0a181ee2be5c8e63b
+us-west-2: ami-003ecf9bbebc818c8
diff --git a/cloudformation/aws-parallelcluster.cfn.json b/cloudformation/aws-parallelcluster.cfn.json
index 5d5b15258a..e2af94e87a 100644
--- a/cloudformation/aws-parallelcluster.cfn.json
+++ b/cloudformation/aws-parallelcluster.cfn.json
@@ -778,28 +778,28 @@
   "Mappings": {
     "AWSRegionOS2AMIarm64": {
       "af-south-1": {
-        "alinux2": "ami-0c9a76fe83f9b660f",
+        "alinux2": "ami-0e1732486a055367c",
         "centos7": "UNSUPPORTED",
-        "ubuntu1804": "ami-0c8716bef94a218f4",
-        "ubuntu2004": "ami-07e091052f651b136"
+        "ubuntu1804": "ami-057de8a76884a5460",
+        "ubuntu2004": "ami-0d539e85a10e1dad6"
       },
       "ap-east-1": {
-        "alinux2": "ami-0e1b883ce2fa28a49",
+        "alinux2": "ami-0cb0da4f6f2684923",
         "centos7": "UNSUPPORTED",
-        "ubuntu1804": "ami-042331525f54bf0e1",
-        "ubuntu2004": "ami-067c79f8e307b08e8"
+        "ubuntu1804": "ami-0c6c85eba32a68592",
+        "ubuntu2004": "ami-0349a40b38f579513"
       },
       "ap-northeast-1": {
-        "alinux2": "ami-0e22d7bc40d7caa83",
+        "alinux2": "ami-08fe6a4b7df2da29c",
         "centos7": "UNSUPPORTED",
-        "ubuntu1804": "ami-06d973c5b21ea7bf5",
-        "ubuntu2004": "ami-05d23b73f858daa23"
+        "ubuntu1804": "ami-004746da8948e2244",
+        "ubuntu2004": "ami-05ec952c256022bf1"
       },
       "ap-northeast-2": {
-        "alinux2": "ami-07d553786d019109f",
+        "alinux2": "ami-0fe97a69392b67cce",
         "centos7": "UNSUPPORTED",
-        "ubuntu1804": "ami-0a8e152df1f69efaf",
-        "ubuntu2004": "ami-06117ef405baac040"
+        "ubuntu1804": "ami-0946de536e49d0aee",
+        "ubuntu2004": "ami-03cf15a1366271256"
       },
       "ap-northeast-3": {
         "alinux2": "UNSUPPORTED",
@@ -808,150 +808,150 @@
         "ubuntu2004": "UNSUPPORTED"
       },
       "ap-south-1": {
-        "alinux2": "ami-03507cd07674ddb44",
+        "alinux2": "ami-072d7e0abe0d45fc5",
         "centos7": "UNSUPPORTED",
-        "ubuntu1804": "ami-050cb933ab14ba6eb",
-        "ubuntu2004": "ami-0dcf05d9fa03d2723"
+        "ubuntu1804": "ami-0c4cc39bb0b4ba4c4",
+        "ubuntu2004": "ami-0e05b15d6d02b386a"
       },
       "ap-southeast-1": {
-        "alinux2": "ami-041b75a18afe24418",
+        "alinux2": "ami-0d4f32544d4c60a17",
         "centos7": "UNSUPPORTED",
-        "ubuntu1804": "ami-040ace8e0da82e1a4",
-        "ubuntu2004": "ami-07981b50c66629fa2"
+        "ubuntu1804": "ami-0e5f2bb58fcd00cea",
+        "ubuntu2004": "ami-003090c2fa6bbd131"
       },
       "ap-southeast-2": {
-        "alinux2": "ami-0badb0cb51eeada29",
+        "alinux2": "ami-08ac0154339a3011d",
         "centos7": "UNSUPPORTED",
-        "ubuntu1804": "ami-0f7fd1a1a17a8b3a9",
-        "ubuntu2004": "ami-0ecb8178bc8f4f785"
+        "ubuntu1804": "ami-0388537de643d10a3",
+        "ubuntu2004": "ami-089303b3a178f6c0d"
       },
       "ca-central-1": {
-        "alinux2": "ami-046c5fb75c08097c9",
+        "alinux2": "ami-038057da8131253fb",
         "centos7": "UNSUPPORTED",
-        "ubuntu1804": "ami-0e1015ce73d4c5c1e",
-        "ubuntu2004": "ami-01fe2270fbd572605"
+        "ubuntu1804": "ami-0092520ff9fe18321",
+        "ubuntu2004": "ami-0a3cdb8babd71a8a6"
       },
       "cn-north-1": {
-        "alinux2": "ami-0242233365192a710",
+        "alinux2": "ami-045327af1211f706d",
         "centos7": "UNSUPPORTED",
-        "ubuntu1804": "ami-084986d813c6d156c",
-        "ubuntu2004": "ami-074d978c4f87050be"
+        "ubuntu1804": "ami-0d85be78b92b1d0e7",
+        "ubuntu2004": "ami-00f4bedaba7b7df64"
       },
       "cn-northwest-1": {
-        "alinux2": "ami-030637f9c9dd8f598",
+        "alinux2": "ami-0b9fdb802fea2b72f",
         "centos7": "UNSUPPORTED",
-        "ubuntu1804": "ami-0e0978c7d80b88593",
-        "ubuntu2004": "ami-06c8c7fbc55e4e601"
+        "ubuntu1804": "ami-09bcaa02ab511a00b",
+        "ubuntu2004": "ami-04c70992e9f836eae"
       },
       "eu-central-1": {
-        "alinux2": "ami-0b40a7cadd3f8d983",
+        "alinux2": "ami-00b75d41545128afb",
         "centos7": "UNSUPPORTED",
-        "ubuntu1804": "ami-0a1770834049f2403",
-        "ubuntu2004": "ami-0d146bf976211940d"
+        "ubuntu1804": "ami-015164e9e809ba274",
+        "ubuntu2004": "ami-0cb21210531f33fca"
       },
       "eu-north-1": {
-        "alinux2": "ami-09305a7de3952d5dd",
+        "alinux2": "ami-028510c5f2d1c5666",
         "centos7": "UNSUPPORTED",
-        "ubuntu1804": "ami-04a8c1f090dd92719",
-        "ubuntu2004": "ami-0d3c02bb0d0562fa4"
+        "ubuntu1804": "ami-037dd293065b8be29",
+        "ubuntu2004": "ami-0d9092b9954ca5d05"
       },
       "eu-south-1": {
-        "alinux2": "ami-044adb7c012ca04cd",
+        "alinux2": "ami-0cffeee3332bce326",
         "centos7": "UNSUPPORTED",
-        "ubuntu1804": "ami-0e183575c7b071a38",
-        "ubuntu2004": "ami-026516bdbe4fcd4fe"
+        "ubuntu1804": "ami-07065a6cc212f5bc0",
+        "ubuntu2004": "ami-0dcee5435499d6490"
       },
       "eu-west-1": {
-        "alinux2": "ami-093fc82b5a5e9d1a9",
+        "alinux2": "ami-0f7afd86f9d4150a2",
         "centos7": "UNSUPPORTED",
-        "ubuntu1804": "ami-0dce870da686a7f72",
-        "ubuntu2004": "ami-012d3dfc2801d7145"
+        "ubuntu1804": "ami-06104fac9df81080c",
+        "ubuntu2004": "ami-054245c674ec561ae"
       },
       "eu-west-2": {
-        "alinux2": "ami-014bf95d4e7542867",
+        "alinux2": "ami-09742a79c6e9b0a3b",
         "centos7": "UNSUPPORTED",
-        "ubuntu1804": "ami-0e63a96c9c9766900",
-        "ubuntu2004": "ami-069a2f4d894608307"
+        "ubuntu1804": "ami-0398fa6308cde1faa",
+        "ubuntu2004": "ami-00bc7d9bf3b482d89"
       },
       "eu-west-3": {
-        "alinux2": "ami-0e067391904dbbcbd",
+        "alinux2": "ami-0892e6fca5dc70e81",
         "centos7": "UNSUPPORTED",
-        "ubuntu1804": "ami-013c01d6c2fc4bab7",
-        "ubuntu2004": "ami-050f353a25797b002"
+        "ubuntu1804": "ami-0225f3dd9906738f1",
+        "ubuntu2004": "ami-01f8d4b5cafe6e816"
       },
       "me-south-1": {
-        "alinux2": "ami-019fef8f016d1289f",
+        "alinux2": "ami-0b544bacb34fde137",
         "centos7": "UNSUPPORTED",
-        "ubuntu1804": "ami-03e126e6d8b75e1a5",
-        "ubuntu2004": "ami-08e42e987cfef7847"
+        "ubuntu1804": "ami-0b209acb2d82048d9",
+        "ubuntu2004": "ami-09f82ed045a477d13"
       },
       "sa-east-1": {
-        "alinux2": "ami-05d626c24ea8dd943",
+        "alinux2": "ami-0704c589d03879f2c",
         "centos7": "UNSUPPORTED",
-        "ubuntu1804": "ami-025c476403ca1408d",
-        "ubuntu2004": "ami-069dd4db66108d240"
+        "ubuntu1804": "ami-018b67e207010cf31",
+        "ubuntu2004": "ami-0eb4bc208ae5f7563"
       },
       "us-east-1": {
-        "alinux2": "ami-026bea9963211488d",
+        "alinux2": "ami-06fca9052756a8d4f",
         "centos7": "UNSUPPORTED",
-        "ubuntu1804": "ami-020cb037342d0e447",
-        "ubuntu2004": "ami-04d8dd8e8170dc6d1"
+        "ubuntu1804": "ami-0dee947669aa0bfaa",
+        "ubuntu2004": "ami-0a0eb2c39d67494a5"
       },
       "us-east-2": {
-        "alinux2": "ami-002dafc8b0c4bce86",
+        "alinux2": "ami-0b5bb46aa1cbb4fe5",
         "centos7": "UNSUPPORTED",
-        "ubuntu1804": "ami-0ec2d3ed02283381a",
-        "ubuntu2004": "ami-06f647d085aa5151c"
+        "ubuntu1804": "ami-08efaa4fc2ff8de07",
+        "ubuntu2004": "ami-09f956bc7ff7949e5"
       },
       "us-gov-east-1": {
-        "alinux2": "ami-008f17ad4baf3737d",
+        "alinux2": "ami-0f682a897f428296a",
         "centos7": "UNSUPPORTED",
-        "ubuntu1804": "ami-058850f32ff4574ef",
-        "ubuntu2004": "ami-0201a3cb1571d845d"
+        "ubuntu1804": "ami-0337822dcce91f4aa",
+        "ubuntu2004": "ami-02be616ebcafdd0dd"
       },
       "us-gov-west-1": {
-        "alinux2": "ami-0ebd5830b69480ab7",
+        "alinux2": "ami-08b73b25951d64293",
         "centos7": "UNSUPPORTED",
-        "ubuntu1804": "ami-05e3e4296616eee96",
-        "ubuntu2004": "ami-0ccf210a4f8a10092"
+        "ubuntu1804": "ami-0b2cf2802d1b78f30",
+        "ubuntu2004": "ami-0a1fff9fde3e17efc"
       },
       "us-west-1": {
-        "alinux2": "ami-079441b7393fa5c74",
+        "alinux2": "ami-00bd5cdbf45b25891",
         "centos7": "UNSUPPORTED",
-        "ubuntu1804": "ami-0865a3108ae0eb4b3",
-        "ubuntu2004": "ami-002306617064e09d6"
+        "ubuntu1804": "ami-0baf6864071bc1a36",
+        "ubuntu2004": "ami-0a181ee2be5c8e63b"
       },
       "us-west-2": {
-        "alinux2": "ami-0d506ae39ddf5a2d1",
+        "alinux2": "ami-037413b7c36d867ae",
         "centos7": "UNSUPPORTED",
-        "ubuntu1804": "ami-0d879a7c133ce2d48",
-        "ubuntu2004": "ami-01454ff5334f280eb"
+        "ubuntu1804": "ami-05b4dd2b02664a544",
+        "ubuntu2004": "ami-003ecf9bbebc818c8"
       }
     },
     "AWSRegionOS2AMIx86": {
       "af-south-1": {
-        "alinux2": "ami-03ffa299762b68e7a",
-        "centos7": "ami-0cca5d4d6437b9ba9",
-        "ubuntu1804": "ami-072992fe42d60057e",
-        "ubuntu2004": "ami-0dc23cf8eab42bf66"
+        "alinux2": "ami-09723f9246b83cbd4",
+        "centos7": "ami-0974748ef51878e66",
+        "ubuntu1804": "ami-08325c8a9f371045f",
+        "ubuntu2004": "ami-07f755b7f86ccff9a"
       },
       "ap-east-1": {
-        "alinux2": "ami-0e7024947984c7c88",
-        "centos7": "ami-0e848e372d366be35",
-        "ubuntu1804": "ami-0c9d6feacfcc46720",
-        "ubuntu2004": "ami-055b808abc638c76f"
+        "alinux2": "ami-0b6d8f7bea20df884",
+        "centos7": "ami-0527b3c010b072fa0",
+        "ubuntu1804": "ami-0aaacd118ea2eba1b",
+        "ubuntu2004": "ami-02aa72f33498de412"
       },
       "ap-northeast-1": {
-        "alinux2": "ami-0f60e3417f75ea9c3",
-        "centos7": "ami-073c7f2265c113cc2",
-        "ubuntu1804": "ami-0af2e09c776cd6971",
-        "ubuntu2004": "ami-0c8ad38779f800523"
+        "alinux2": "ami-03cc9f34d086944e8",
+        "centos7": "ami-084a3a017a393f317",
+        "ubuntu1804": "ami-00b21acbc46f68cf1",
+        "ubuntu2004": "ami-0d3188de18578ba9a"
       },
       "ap-northeast-2": {
-        "alinux2": "ami-0390f1f7c07b8bbca",
-        "centos7": "ami-07d6d9ff52b3aa70d",
-        "ubuntu1804": "ami-0ac0cc7aa742acd1e",
-        "ubuntu2004": "ami-00fd7b9423f73b5a0"
+        "alinux2": "ami-0bc40b626929eb6c4",
+        "centos7": "ami-0678a15f734b1a5c2",
+        "ubuntu1804": "ami-042da98b9da8bf8e3",
+        "ubuntu2004": "ami-0174fc82e7aeb93fe"
       },
       "ap-northeast-3": {
         "alinux2": "UNSUPPORTED",
@@ -960,124 +960,124 @@
         "ubuntu2004": "UNSUPPORTED"
       },
       "ap-south-1": {
-        "alinux2": "ami-0f62b5800c827ea7c",
-        "centos7": "ami-0652e4fe3b0c3d60b",
-        "ubuntu1804": "ami-0c3457e7ea9b2aa9b",
-        "ubuntu2004": "ami-06e7d669f51721a64"
+        "alinux2": "ami-01bbac10fd20905ea",
+        "centos7": "ami-00f9531465ec8a112",
+        "ubuntu1804": "ami-0015cd86053d1956a",
+        "ubuntu2004": "ami-007210cfb0f2ac832"
       },
       "ap-southeast-1": {
-        "alinux2": "ami-0cfc182f7f1fa7e25",
-        "centos7": "ami-0239c041bfad0491d",
-        "ubuntu1804": "ami-074c03fa1cf62c016",
-        "ubuntu2004": "ami-0dc143f69c9047143"
+        "alinux2": "ami-08214dcea431f2880",
+        "centos7": "ami-006fada10c492cdb1",
+        "ubuntu1804": "ami-07745260e0519d488",
+        "ubuntu2004": "ami-06359701d48fcca4e"
       },
       "ap-southeast-2": {
-        "alinux2": "ami-016f034449b053a08",
-        "centos7": "ami-012e9be419bf6eb9a",
-        "ubuntu1804": "ami-007bbb8b1f24db6c5",
-        "ubuntu2004": "ami-0b3ed6b90b874ab9e"
+        "alinux2": "ami-0b6c9cce51a38331b",
+        "centos7": "ami-0d0d870ecbfda7d7a",
+        "ubuntu1804": "ami-081c524916459af12",
+        "ubuntu2004": "ami-0a2101db6c4aa6785"
       },
       "ca-central-1": {
-        "alinux2": "ami-077c7fb83c339b747",
-        "centos7": "ami-0c4bfd1317bb2de35",
-        "ubuntu1804": "ami-0aa63de94909b8f93",
-        "ubuntu2004": "ami-05d975aac020e1bbe"
+        "alinux2": "ami-0ce86638a3db0b02f",
+        "centos7": "ami-0992e9e27c4c60bf1",
+        "ubuntu1804": "ami-0bbd8ec233bd5def5",
+        "ubuntu2004": "ami-0dc454aef29f1a6dc"
       },
       "cn-north-1": {
-        "alinux2": "ami-03bf5e0ac043c4ed4",
+        "alinux2": "ami-004872e5929e6713f",
         "centos7": "UNSUPPORTED",
-        "ubuntu1804": "ami-0ef094914d7872947",
-        "ubuntu2004": "ami-08fc8f82c3771f05d"
+        "ubuntu1804": "ami-0f3ce487606fb8283",
+        "ubuntu2004": "ami-0050c9bb976aef862"
       },
       "cn-northwest-1": {
-        "alinux2": "ami-04167fbc3b0fb4f0d",
+        "alinux2": "ami-007bbed296a44627b",
         "centos7": "UNSUPPORTED",
-        "ubuntu1804": "ami-0900eaf306ccb9ab6",
-        "ubuntu2004": "ami-0071b35d274d86d81"
+        "ubuntu1804": "ami-0b696e4f5d4ee9820",
+        "ubuntu2004": "ami-031bd96985f1696c5"
       },
       "eu-central-1": {
-        "alinux2": "ami-0662e2c6943321b39",
-        "centos7": "ami-0be38fdd538735e2d",
-        "ubuntu1804": "ami-0dbc726cee661519e",
-        "ubuntu2004": "ami-0f77775d7ee4e4827"
+        "alinux2": "ami-098eda3d212bd8859",
+        "centos7": "ami-0fc04650c254b8aa5",
+        "ubuntu1804": "ami-0e6299f16fc40d694",
+        "ubuntu2004": "ami-08f6a9b906694eaee"
       },
       "eu-north-1": {
-        "alinux2": "ami-07ae17926d82c3166",
-        "centos7": "ami-07de5b0f08353016d",
-        "ubuntu1804": "ami-0564be393703e55c7",
-        "ubuntu2004": "ami-0f389a44b21688649"
+        "alinux2": "ami-02d75886c4f341afa",
+        "centos7": "ami-0ca7c73260c1a73eb",
+        "ubuntu1804": "ami-00c4be663eaf3031d",
+        "ubuntu2004": "ami-0e38e5577f7296be7"
       },
       "eu-south-1": {
-        "alinux2": "ami-0ae6877c33581cda8",
-        "centos7": "ami-0ae9bc8017735ba36",
-        "ubuntu1804": "ami-0f8fb48d51df4e524",
-        "ubuntu2004": "ami-021e6c7ef8caea1c6"
+        "alinux2": "ami-05de8d0b874252b30",
+        "centos7": "ami-0c8cf93deb4135699",
+        "ubuntu1804": "ami-062cb508942efc18e",
+        "ubuntu2004": "ami-01724d3afaf5423f5"
       },
       "eu-west-1": {
-        "alinux2": "ami-0a2d3cbf1b5ec5c9a",
-        "centos7": "ami-0c7db484686b03385",
-        "ubuntu1804": "ami-0f032fcd7bf63964f",
-        "ubuntu2004": "ami-04c5d4d286438bfe1"
+        "alinux2": "ami-08e65ca779cdef1ed",
+        "centos7": "ami-089afcd4b3c523c42",
+        "ubuntu1804": "ami-069edc03534cd40e5",
+        "ubuntu2004": "ami-0021dbee6532b6b28"
       },
       "eu-west-2": {
-        "alinux2": "ami-0ef556e64de679108",
-        "centos7": "ami-09df47dc7632d9a0b",
-        "ubuntu1804": "ami-0de59e64bb1bc1cfd",
-        "ubuntu2004": "ami-0d70d9dff361c2c1a"
+        "alinux2": "ami-0de57d1e2a075381f",
+        "centos7": "ami-0aba35f17c343b1bb",
+        "ubuntu1804": "ami-0173487cfc49fe57a",
+        "ubuntu2004": "ami-0cf35b7532071f698"
       },
       "eu-west-3": {
-        "alinux2": "ami-07b31a9ecbd12563b",
-        "centos7": "ami-0f43d0cf65b43e60c",
-        "ubuntu1804": "ami-0e15fad8c6d473979",
-        "ubuntu2004": "ami-0d1dfcaf2000f2970"
+        "alinux2": "ami-0ee000b268b55b592",
+        "centos7": "ami-0cd78eed39863ebcc",
+        "ubuntu1804": "ami-0d24dc6e73192c8af",
+        "ubuntu2004": "ami-0f37e523233f4fff2"
       },
       "me-south-1": {
-        "alinux2": "ami-04e87b814e81c4383",
-        "centos7": "ami-0d5965bde61986089",
-        "ubuntu1804": "ami-068372d451fac2404",
-        "ubuntu2004": "ami-09696eac5608a23a5"
+        "alinux2": "ami-06124a3a524a8a03a",
+        "centos7": "ami-0a445b92c5db55ddc",
+        "ubuntu1804": "ami-0f5e29954e9573724",
+        "ubuntu2004": "ami-0326aeebde57ab225"
       },
       "sa-east-1": {
-        "alinux2": "ami-01d7b73f7b9a7be6c",
-        "centos7": "ami-06da4816ca5646b80",
-        "ubuntu1804": "ami-06ce2ac13a376b92f",
-        "ubuntu2004": "ami-05712e98e43098f94"
+        "alinux2": "ami-084bb499bd6603bfe",
+        "centos7": "ami-0822c6351308daf7a",
+        "ubuntu1804": "ami-0dd43a463e11a5124",
+        "ubuntu2004": "ami-03c2a6e86aaccb55a"
       },
       "us-east-1": {
-        "alinux2": "ami-03dd9a454711cb08d",
-        "centos7": "ami-00eee4ef9f0772651",
-        "ubuntu1804": "ami-0942b9e26848e970a",
-        "ubuntu2004": "ami-02e4099f21d40f7d8"
+        "alinux2": "ami-04fdccb8febb61334",
+        "centos7": "ami-0b6d3c7603a807bbe",
+        "ubuntu1804": "ami-0d8972e7ca8787f56",
+        "ubuntu2004": "ami-01d9a3a5e233388c5"
       },
       "us-east-2": {
-        "alinux2": "ami-0a6f718f75667aa7b",
-        "centos7": "ami-0d1ec5d59780a3408",
-        "ubuntu1804": "ami-085e113f23a28d6ec",
-        "ubuntu2004": "ami-046e3716e8ecae2a6"
+        "alinux2": "ami-014789009ae67e5b9",
+        "centos7": "ami-06e00c6de38f71096",
+        "ubuntu1804": "ami-03a2861629f0e7a6f",
+        "ubuntu2004": "ami-01448aa1fedd90bbe"
       },
       "us-gov-east-1": {
-        "alinux2": "ami-06ffeb9d465d39f7c",
+        "alinux2": "ami-064d1bb1925930896",
         "centos7": "UNSUPPORTED",
-        "ubuntu1804": "ami-0163b392af385c1c0",
-        "ubuntu2004": "ami-0342ab789350d80d1"
+        "ubuntu1804": "ami-0e8b6cfd39059457f",
+        "ubuntu2004": "ami-00a106286754de119"
       },
       "us-gov-west-1": {
-        "alinux2": "ami-068ab9de856b5a709",
+        "alinux2": "ami-0f2526fd6107f6110",
         "centos7": "UNSUPPORTED",
-        "ubuntu1804": "ami-03905eaa012fc4bfd",
-        "ubuntu2004": "ami-0f8bdec6f62c6087e"
+        "ubuntu1804": "ami-079ccd2d7493e1523",
+        "ubuntu2004": "ami-09f2a99ae7732ce23"
       },
       "us-west-1": {
-        "alinux2": "ami-0024b19ee4d26af09",
-        "centos7": "ami-0d9829f52308a685f",
-        "ubuntu1804": "ami-051f1a3fb15a700a8",
-        "ubuntu2004": "ami-049d37bc11d51b5ab"
+        "alinux2": "ami-0c57956c4072e02d0",
+        "centos7": "ami-03aeb034f5bc0694f",
+        "ubuntu1804": "ami-01dd3a8cd7a09c97f",
+        "ubuntu2004": "ami-095a20cccb382c6a9"
       },
       "us-west-2": {
-        "alinux2": "ami-0e05fc7dab55cf3c6",
-        "centos7": "ami-08a660f322183d62c",
-        "ubuntu1804": "ami-00f435f9f2d2b5739",
-        "ubuntu2004": "ami-0bef4809a635ae3df"
+        "alinux2": "ami-09ad8a472f1da0247",
+        "centos7": "ami-08a504f78ca0e88c6",
+        "ubuntu1804": "ami-093a30dd310773a58",
+        "ubuntu2004": "ami-0c9486c7712b3756e"
       }
     },
     "OSFeatures": {