diff --git a/_data/aws-images.csv b/_data/aws-images.csv
index cadcdc0..4d6c7a9 100644
--- a/_data/aws-images.csv
+++ b/_data/aws-images.csv
@@ -1,50 +1,81 @@
 "Version","Region","Architecture","AMI ID","Deploy link"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
-"CentOS 8","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
+" CentOS Linux 8 ","us-east-1","x86_64","ami-01ca03df4a6012157","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-01ca03df4a6012157"
+" CentOS Linux 8 ","us-east-2","x86_64","ami-000e7ce4dd68e7a11","https://console.aws.amazon.com/ec2/v2/home?region=us-east-2#LaunchInstanceWizard:ami=ami-000e7ce4dd68e7a11"
+" CentOS Linux 8 ","us-west-1","x86_64","ami-04179d30492b778ad","https://console.aws.amazon.com/ec2/v2/home?region=us-west-1#LaunchInstanceWizard:ami=ami-04179d30492b778ad"
+" CentOS Linux 8 ","us-west-2","x86_64","ami-0157b1e4eefd91fd7","https://console.aws.amazon.com/ec2/v2/home?region=us-west-2#LaunchInstanceWizard:ami=ami-0157b1e4eefd91fd7"
+" CentOS Linux 8 ","af-south-1","x86_64","ami-059c85867d88036bf","https://console.aws.amazon.com/ec2/v2/home?region=af-south-1#LaunchInstanceWizard:ami=ami-059c85867d88036bf"
+" CentOS Linux 8 ","ap-east-1","x86_64","ami-0a5c028e5b48c5b03","https://console.aws.amazon.com/ec2/v2/home?region=ap-east-1#LaunchInstanceWizard:ami=ami-0a5c028e5b48c5b03"
+" CentOS Linux 8 ","ap-south-1","x86_64","ami-056940cb2a7bb6d71","https://console.aws.amazon.com/ec2/v2/home?region=ap-south-1#LaunchInstanceWizard:ami=ami-056940cb2a7bb6d71"
+" CentOS Linux 8 ","ap-northeast-1","x86_64","ami-089a156ea4f52a0a3","https://console.aws.amazon.com/ec2/v2/home?region=ap-northeast-1#LaunchInstanceWizard:ami=ami-089a156ea4f52a0a3"
+" CentOS Linux 8 ","ap-northeast-2","x86_64","ami-09cdc4034bbb65412","https://console.aws.amazon.com/ec2/v2/home?region=ap-northeast-2#LaunchInstanceWizard:ami=ami-09cdc4034bbb65412"
+" CentOS Linux 8 ","ap-southeast-1","x86_64","ami-0bfb8f6cdedb56577","https://console.aws.amazon.com/ec2/v2/home?region=ap-southeast-1#LaunchInstanceWizard:ami=ami-0bfb8f6cdedb56577"
+" CentOS Linux 8 ","ap-southeast-2","x86_64","ami-08a0839a09bbc6f20","https://console.aws.amazon.com/ec2/v2/home?region=ap-southeast-2#LaunchInstanceWizard:ami=ami-08a0839a09bbc6f20"
+" CentOS Linux 8 ","ca-central-1","x86_64","ami-07a182edcd7d04084","https://console.aws.amazon.com/ec2/v2/home?region=ca-central-1#LaunchInstanceWizard:ami=ami-07a182edcd7d04084"
+" CentOS Linux 8 ","eu-central-1","x86_64","ami-032025b3afcbb6b34","https://console.aws.amazon.com/ec2/v2/home?region=eu-central-1#LaunchInstanceWizard:ami=ami-032025b3afcbb6b34"
+" CentOS Linux 8 ","eu-west-1","x86_64","ami-0bfa4fefe067b7946","https://console.aws.amazon.com/ec2/v2/home?region=eu-west-1#LaunchInstanceWizard:ami=ami-0bfa4fefe067b7946"
+" CentOS Linux 8 ","eu-west-2","x86_64","ami-0eee2548cd75b4877","https://console.aws.amazon.com/ec2/v2/home?region=eu-west-2#LaunchInstanceWizard:ami=ami-0eee2548cd75b4877"
+" CentOS Linux 8 ","eu-west-3","x86_64","ami-05786aa5add3ca7c8","https://console.aws.amazon.com/ec2/v2/home?region=eu-west-3#LaunchInstanceWizard:ami=ami-05786aa5add3ca7c8"
+" CentOS Linux 8 ","eu-south-1","x86_64","ami-00fd0c9036a37a48e","https://console.aws.amazon.com/ec2/v2/home?region=eu-south-1#LaunchInstanceWizard:ami=ami-00fd0c9036a37a48e"
+" CentOS Linux 8 ","eu-north-1","x86_64","ami-0474ce84d449ee66f","https://console.aws.amazon.com/ec2/v2/home?region=eu-north-1#LaunchInstanceWizard:ami=ami-0474ce84d449ee66f"
+" CentOS Linux 8 ","me-south-1","x86_64","ami-06b01ecfde1a04811","https://console.aws.amazon.com/ec2/v2/home?region=me-south-1#LaunchInstanceWizard:ami=ami-06b01ecfde1a04811"
+" CentOS Linux 8 ","sa-east-1","x86_64","ami-005c6439e527f2704","https://console.aws.amazon.com/ec2/v2/home?region=sa-east-1#LaunchInstanceWizard:ami=ami-005c6439e527f2704"
+" CentOS Linux 8 ","us-east-2","aarch64","ami-0214a6c4345e2264b","https://console.aws.amazon.com/ec2/v2/home?region=us-east-2#LaunchInstanceWizard:ami=ami-0214a6c4345e2264b"
+" CentOS Linux 8 ","us-east-1","aarch64","ami-0c7ec43a152e9c107","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-0c7ec43a152e9c107"
+" CentOS Linux 8 ","us-west-1","aarch64","ami-047d7c7dc128d1c5b","https://console.aws.amazon.com/ec2/v2/home?region=us-west-1#LaunchInstanceWizard:ami=ami-047d7c7dc128d1c5b"
+" CentOS Linux 8 ","us-west-2","aarch64","ami-0b3f8f19279a5a1b1","https://console.aws.amazon.com/ec2/v2/home?region=us-west-2#LaunchInstanceWizard:ami=ami-0b3f8f19279a5a1b1"
+" CentOS Linux 8 ","af-south-1","aarch64","ami-03afc3488545494de","https://console.aws.amazon.com/ec2/v2/home?region=af-south-1#LaunchInstanceWizard:ami=ami-03afc3488545494de"
+" CentOS Linux 8 ","ap-east-1","aarch64","ami-0fa923323ef6c8525","https://console.aws.amazon.com/ec2/v2/home?region=ap-east-1#LaunchInstanceWizard:ami=ami-0fa923323ef6c8525"
+" CentOS Linux 8 ","ap-south-1","aarch64","ami-0e34f56c82b3291a6","https://console.aws.amazon.com/ec2/v2/home?region=ap-south-1#LaunchInstanceWizard:ami=ami-0e34f56c82b3291a6"
+" CentOS Linux 8 ","ap-northeast-1","aarch64","ami-0c54e9b4dd47f7208","https://console.aws.amazon.com/ec2/v2/home?region=ap-northeast-1#LaunchInstanceWizard:ami=ami-0c54e9b4dd47f7208"
+" CentOS Linux 8 ","ap-northeast-2","aarch64","ami-0f0f98b490f433dea","https://console.aws.amazon.com/ec2/v2/home?region=ap-northeast-2#LaunchInstanceWizard:ami=ami-0f0f98b490f433dea"
+" CentOS Linux 8 ","ap-southeast-1","aarch64","ami-041e3117b20032489","https://console.aws.amazon.com/ec2/v2/home?region=ap-southeast-1#LaunchInstanceWizard:ami=ami-041e3117b20032489"
+" CentOS Linux 8 ","ap-southeast-2","aarch64","ami-0384f25b471805fa7","https://console.aws.amazon.com/ec2/v2/home?region=ap-southeast-2#LaunchInstanceWizard:ami=ami-0384f25b471805fa7"
+" CentOS Linux 8 ","ca-central-1","aarch64","ami-0eb30e00afc5fd46d","https://console.aws.amazon.com/ec2/v2/home?region=ca-central-1#LaunchInstanceWizard:ami=ami-0eb30e00afc5fd46d"
+" CentOS Linux 8 ","eu-central-1","aarch64","ami-00ff26b9cf31eacd5","https://console.aws.amazon.com/ec2/v2/home?region=eu-central-1#LaunchInstanceWizard:ami=ami-00ff26b9cf31eacd5"
+" CentOS Linux 8 ","eu-west-1","aarch64","ami-01d2b21e37b37aaa7","https://console.aws.amazon.com/ec2/v2/home?region=eu-west-1#LaunchInstanceWizard:ami=ami-01d2b21e37b37aaa7"
+" CentOS Linux 8 ","eu-west-2","aarch64","ami-0fdf282fdf7421bdc","https://console.aws.amazon.com/ec2/v2/home?region=eu-west-2#LaunchInstanceWizard:ami=ami-0fdf282fdf7421bdc"
+" CentOS Linux 8 ","eu-west-3","aarch64","ami-07b920282200df554","https://console.aws.amazon.com/ec2/v2/home?region=eu-west-3#LaunchInstanceWizard:ami=ami-07b920282200df554"
+" CentOS Linux 8 ","eu-south-1","aarch64","ami-0d4528e62c5bb2d0b","https://console.aws.amazon.com/ec2/v2/home?region=eu-south-1#LaunchInstanceWizard:ami=ami-0d4528e62c5bb2d0b"
+" CentOS Linux 8 ","eu-north-1","aarch64","ami-02e921ca8f16f9ee4","https://console.aws.amazon.com/ec2/v2/home?region=eu-north-1#LaunchInstanceWizard:ami=ami-02e921ca8f16f9ee4"
+" CentOS Linux 8 ","me-south-1","aarch64","ami-0699d4d858abc9036","https://console.aws.amazon.com/ec2/v2/home?region=me-south-1#LaunchInstanceWizard:ami=ami-0699d4d858abc9036"
+" CentOS Linux 8 ","sa-east-1","aarch64","ami-0bf5003d05d784d3b","https://console.aws.amazon.com/ec2/v2/home?region=sa-east-1#LaunchInstanceWizard:ami=ami-0bf5003d05d784d3b"
+" CentOS Linux 7 ","us-east-2","x86_64","ami-0a75b786d9a7f8144","https://console.aws.amazon.com/ec2/v2/home?region=us-east-2#LaunchInstanceWizard:ami=ami-0a75b786d9a7f8144"
+" CentOS Linux 7 ","us-east-1","x86_64","ami-06cf02a98a61f9f5e","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-06cf02a98a61f9f5e"
+" CentOS Linux 7 ","us-west-1","x86_64","ami-02676464a065c9c05","https://console.aws.amazon.com/ec2/v2/home?region=us-west-1#LaunchInstanceWizard:ami=ami-02676464a065c9c05"
+" CentOS Linux 7 ","us-west-2","x86_64","ami-0a248ce88bcc7bd23","https://console.aws.amazon.com/ec2/v2/home?region=us-west-2#LaunchInstanceWizard:ami=ami-0a248ce88bcc7bd23"
+" CentOS Linux 7 ","af-south-1","x86_64","ami-03bfd033c9d776adc","https://console.aws.amazon.com/ec2/v2/home?region=af-south-1#LaunchInstanceWizard:ami=ami-03bfd033c9d776adc"
+" CentOS Linux 7 ","ap-east-1","x86_64","ami-09a8f7cf3b1b73e57","https://console.aws.amazon.com/ec2/v2/home?region=ap-east-1#LaunchInstanceWizard:ami=ami-09a8f7cf3b1b73e57"
+" CentOS Linux 7 ","ap-south-1","x86_64","ami-0dd861ee19fd50a16","https://console.aws.amazon.com/ec2/v2/home?region=ap-south-1#LaunchInstanceWizard:ami=ami-0dd861ee19fd50a16"
+" CentOS Linux 7 ","ap-northeast-1","x86_64","ami-0d09d267328197c99","https://console.aws.amazon.com/ec2/v2/home?region=ap-northeast-1#LaunchInstanceWizard:ami=ami-0d09d267328197c99"
+" CentOS Linux 7 ","ap-northeast-2","x86_64","ami-0cf8e67d10c823f2e","https://console.aws.amazon.com/ec2/v2/home?region=ap-northeast-2#LaunchInstanceWizard:ami=ami-0cf8e67d10c823f2e"
+" CentOS Linux 7 ","ap-southeast-1","x86_64","ami-056251cdd6fd1c8eb","https://console.aws.amazon.com/ec2/v2/home?region=ap-southeast-1#LaunchInstanceWizard:ami=ami-056251cdd6fd1c8eb"
+" CentOS Linux 7 ","ap-southeast-2","x86_64","ami-05f50d9ec7e4c3b02","https://console.aws.amazon.com/ec2/v2/home?region=ap-southeast-2#LaunchInstanceWizard:ami=ami-05f50d9ec7e4c3b02"
+" CentOS Linux 7 ","ca-central-1","x86_64","ami-0252eebc56636a56b","https://console.aws.amazon.com/ec2/v2/home?region=ca-central-1#LaunchInstanceWizard:ami=ami-0252eebc56636a56b"
+" CentOS Linux 7 ","eu-central-1","x86_64","ami-095e1a4d3d632d215","https://console.aws.amazon.com/ec2/v2/home?region=eu-central-1#LaunchInstanceWizard:ami=ami-095e1a4d3d632d215"
+" CentOS Linux 7 ","eu-west-1","x86_64","ami-0d4002a13019b7703","https://console.aws.amazon.com/ec2/v2/home?region=eu-west-1#LaunchInstanceWizard:ami=ami-0d4002a13019b7703"
+" CentOS Linux 7 ","eu-west-2","x86_64","ami-0aa3620fadad9198e","https://console.aws.amazon.com/ec2/v2/home?region=eu-west-2#LaunchInstanceWizard:ami=ami-0aa3620fadad9198e"
+" CentOS Linux 7 ","eu-west-3","x86_64","ami-04552009264cbe9f4","https://console.aws.amazon.com/ec2/v2/home?region=eu-west-3#LaunchInstanceWizard:ami=ami-04552009264cbe9f4"
+" CentOS Linux 7 ","eu-south-1","x86_64","ami-0a84267606bcea16b","https://console.aws.amazon.com/ec2/v2/home?region=eu-south-1#LaunchInstanceWizard:ami=ami-0a84267606bcea16b"
+" CentOS Linux 7 ","eu-north-1","x86_64","ami-026f0eb2e8006617d","https://console.aws.amazon.com/ec2/v2/home?region=eu-north-1#LaunchInstanceWizard:ami=ami-026f0eb2e8006617d"
+" CentOS Linux 7 ","me-south-1","x86_64","ami-0c49e56e4c204cc4c","https://console.aws.amazon.com/ec2/v2/home?region=me-south-1#LaunchInstanceWizard:ami=ami-0c49e56e4c204cc4c"
+" CentOS Linux 7 ","sa-east-1","x86_64","ami-0c52a0227804a4318","https://console.aws.amazon.com/ec2/v2/home?region=sa-east-1#LaunchInstanceWizard:ami=ami-0c52a0227804a4318"
+" CentOS Linux 7 ","us-east-2","aarch64","ami-05e20426c3de5c840","https://console.aws.amazon.com/ec2/v2/home?region=us-east-2#LaunchInstanceWizard:ami=ami-05e20426c3de5c840"
+" CentOS Linux 7 ","us-east-1","aarch64","ami-0271a6516c34c6be9","https://console.aws.amazon.com/ec2/v2/home?region=us-east-1#LaunchInstanceWizard:ami=ami-0271a6516c34c6be9"
+" CentOS Linux 7 ","us-west-1","aarch64","ami-0815ad15cb84deb02","https://console.aws.amazon.com/ec2/v2/home?region=us-west-1#LaunchInstanceWizard:ami=ami-0815ad15cb84deb02"
+" CentOS Linux 7 ","us-west-2","aarch64","ami-0e1df10018bb7643a","https://console.aws.amazon.com/ec2/v2/home?region=us-west-2#LaunchInstanceWizard:ami=ami-0e1df10018bb7643a"
+" CentOS Linux 7 ","af-south-1","aarch64","ami-0c734f80c70088ef5","https://console.aws.amazon.com/ec2/v2/home?region=af-south-1#LaunchInstanceWizard:ami=ami-0c734f80c70088ef5"
+" CentOS Linux 7 ","ap-east-1","aarch64","ami-01ffbb45590172869","https://console.aws.amazon.com/ec2/v2/home?region=ap-east-1#LaunchInstanceWizard:ami=ami-01ffbb45590172869"
+" CentOS Linux 7 ","ap-south-1","aarch64","ami-01659d468a45f99a6","https://console.aws.amazon.com/ec2/v2/home?region=ap-south-1#LaunchInstanceWizard:ami=ami-01659d468a45f99a6"
+" CentOS Linux 7 ","ap-northeast-1","aarch64","ami-016042a158845bded","https://console.aws.amazon.com/ec2/v2/home?region=ap-northeast-1#LaunchInstanceWizard:ami=ami-016042a158845bded"
+" CentOS Linux 7 ","ap-northeast-2","aarch64","ami-096048bf9ebc229f2","https://console.aws.amazon.com/ec2/v2/home?region=ap-northeast-2#LaunchInstanceWizard:ami=ami-096048bf9ebc229f2"
+" CentOS Linux 7 ","ap-southeast-1","aarch64","ami-068b6397ec95589b3","https://console.aws.amazon.com/ec2/v2/home?region=ap-southeast-1#LaunchInstanceWizard:ami=ami-068b6397ec95589b3"
+" CentOS Linux 7 ","ap-southeast-2","aarch64","ami-0b69b22733bc0fd0d","https://console.aws.amazon.com/ec2/v2/home?region=ap-southeast-2#LaunchInstanceWizard:ami=ami-0b69b22733bc0fd0d"
+" CentOS Linux 7 ","ca-central-1","aarch64","ami-010fe0364a21adf3a","https://console.aws.amazon.com/ec2/v2/home?region=ca-central-1#LaunchInstanceWizard:ami=ami-010fe0364a21adf3a"
+" CentOS Linux 7 ","eu-central-1","aarch64","ami-0d2648d797310dd77","https://console.aws.amazon.com/ec2/v2/home?region=eu-central-1#LaunchInstanceWizard:ami=ami-0d2648d797310dd77"
+" CentOS Linux 7 ","eu-west-1","aarch64","ami-03bdaa28257d12408","https://console.aws.amazon.com/ec2/v2/home?region=eu-west-1#LaunchInstanceWizard:ami=ami-03bdaa28257d12408"
+" CentOS Linux 7 ","eu-west-2","aarch64","ami-0ed28356578bd1043","https://console.aws.amazon.com/ec2/v2/home?region=eu-west-2#LaunchInstanceWizard:ami=ami-0ed28356578bd1043"
+" CentOS Linux 7 ","eu-west-3","aarch64","ami-02f5df548f8e2736c","https://console.aws.amazon.com/ec2/v2/home?region=eu-west-3#LaunchInstanceWizard:ami=ami-02f5df548f8e2736c"
+" CentOS Linux 7 ","eu-south-1","aarch64","ami-0e3c66281f91fbf43","https://console.aws.amazon.com/ec2/v2/home?region=eu-south-1#LaunchInstanceWizard:ami=ami-0e3c66281f91fbf43"
+" CentOS Linux 7 ","eu-north-1","aarch64","ami-039796a8874539bc1","https://console.aws.amazon.com/ec2/v2/home?region=eu-north-1#LaunchInstanceWizard:ami=ami-039796a8874539bc1"
+" CentOS Linux 7 ","me-south-1","aarch64","ami-0cbc94d74cf058844","https://console.aws.amazon.com/ec2/v2/home?region=me-south-1#LaunchInstanceWizard:ami=ami-0cbc94d74cf058844"
+" CentOS Linux 7 ","sa-east-1","aarch64","ami-09152f864c2cfe87c","https://console.aws.amazon.com/ec2/v2/home?region=sa-east-1#LaunchInstanceWizard:ami=ami-09152f864c2cfe87c"
diff --git a/download.md b/download.md
index a3ad953..0eea3bb 100644
--- a/download.md
+++ b/download.md
@@ -7,8 +7,18 @@ toc: true
 
 ## Cloud and container images
 
-* [Amazon Web Services](https://aws.amazon.com/marketplace/seller-profile?id=16cb8b03-256e-4dde-8f34-1b0f377efe89)
-* [Docker Registry](https://registry.hub.docker.com/_/centos/)
+We build, maintain and update Cloud images that you can find on our [Cloud Images server](https://cloud.centos.org/centos).
+
+These images are built and made available for all the architectures that corresponding version supports.
+
+People interested in importing 'GenericCloud' images into their own cloud solution can find corresponding images on the link above.
+
+Worth knowing that you can also import (through Skopeo or other methods) container images the same way, and such .tar.xz files can be found on the same mirror.
+
+Parallel to that, we have also official images that are available directly to be deployed for the following solutions:
+
+ * [Amazon Web Services](/download/aws-images)
+ * [Docker Registry](https://registry.hub.docker.com/_/centos/)
 
 If the above is not for you, [alternative downloads](http://wiki.centos.org/Download) might be.
 
diff --git a/download/aws-images.md b/download/aws-images.md
new file mode 100644
index 0000000..11aab8b
--- /dev/null
+++ b/download/aws-images.md
@@ -0,0 +1,48 @@
+---
+title:      "CentOS AWS AMI Cloud Images"
+markdown:   basic
+is_dynamic: true
+has_toc:    true
+layout: page-download-mirror
+permalink: /:path/:basename/index.html
+
+---
+CentOS Amazon AMI images
+===========================
+
+Here is the list of current/up2date AMI images IDs that we made public.
+
+So far we build/update/maintain the following CentOS variants and architecures:
+
+ * CentOS Linux 8 (x86_64 and aarch64)
+ * CentOS Linux 7 (x86_64 and aarch64)
+
+You can search for architecture or region through search bar.
+
+Please note that you can also directly use then the "Deploy Link" function to deploy in specific region, one click away. 
+
+<input type="text" id="myInput" onkeyup="myFunction()" placeholder="Search for image...">
+
+<table id="myTable" class="table table-borderless">
+<thead class="thead-dark">
+  <tr>
+    <th class="col-1">Version</th>
+    <th class="col-1">Region</th>
+    <th class="col-1">Architecture</th>
+    <th class="col-7">AMI ID</th>
+    <th class="col-1 text-nowrap">Deploy link</th>
+  </tr>
+</thead>
+<tbody>
+{% for row in site.data.aws-images %}
+  <tr>
+    <td>{{ row["Version"] }}</td>
+    <td>{{ row["Region"] }}</td>
+    <td>{{ row["Architecture"] }}</td>
+    <td>{{ row["AMI ID"] }}</td>
+    <td class="text-nowrap"><a href="{{ row["Deploy link"] }}"><i class="fab fa-aws"></i> Deploy link</a></td>
+  </tr>
+{% endfor %}
+</tbody>
+</table>
+
diff --git a/download/cloud.md b/download/cloud.md
deleted file mode 100644
index c771fca..0000000
--- a/download/cloud.md
+++ /dev/null
@@ -1,39 +0,0 @@
----
-title:      "CentOS Cloud Images"
-markdown:   basic
-is_dynamic: true
-has_toc:    true
-layout: page-download-mirror
-permalink: /:path/:basename/index.html
-
----
-Amazon AMI information here
-===========================
-
-Basic info on Amazon images here
-
-<input type="text" id="myInput" onkeyup="myFunction()" placeholder="Search for image...">
-
-<table id="myTable" class="table table-borderless">
-<thead class="thead-dark">
-  <tr>
-    <th class="col-1">Version</th>
-    <th class="col-1">Region</th>
-    <th class="col-1">Architecture</th>
-    <th class="col-7">AMI ID</th>
-    <th class="col-1 text-nowrap">Deploy link</th>
-  </tr>
-</thead>
-<tbody>
-{% for row in site.data.aws-images %}
-  <tr>
-    <td>{{ row["Version"] }}</td>
-    <td>{{ row["Region"] }}</td>
-    <td>{{ row["Architecture"] }}</td>
-    <td>{{ row["AMI ID"] }}</td>
-    <td class="text-nowrap"><a href="{{ row["Deploy link"] }}"><i class="fab fa-aws"></i> Deploy link</a></td>
-  </tr>
-{% endfor %}
-</tbody>
-</table>
-