diff --git a/nixos/modules/virtualisation/amazon-ec2-amis.nix b/nixos/modules/virtualisation/amazon-ec2-amis.nix
new file mode 100644
index 000000000000..6905080f6352
--- /dev/null
+++ b/nixos/modules/virtualisation/amazon-ec2-amis.nix
@@ -0,0 +1,371 @@
+let self = {
+  "14.04".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-71c6f470";
+  "14.04".ap-northeast-1.x86_64-linux.pv-ebs = "ami-4dcbf84c";
+  "14.04".ap-northeast-1.x86_64-linux.pv-s3 = "ami-8fc4f68e";
+  "14.04".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-da280888";
+  "14.04".ap-southeast-1.x86_64-linux.pv-ebs = "ami-7a9dbc28";
+  "14.04".ap-southeast-1.x86_64-linux.pv-s3 = "ami-c4290996";
+  "14.04".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-ab523e91";
+  "14.04".ap-southeast-2.x86_64-linux.pv-ebs = "ami-6769055d";
+  "14.04".ap-southeast-2.x86_64-linux.pv-s3 = "ami-15533f2f";
+  "14.04".eu-central-1.x86_64-linux.hvm-ebs = "ami-ba0234a7";
+  "14.04".eu-west-1.x86_64-linux.hvm-ebs = "ami-96cb63e1";
+  "14.04".eu-west-1.x86_64-linux.pv-ebs = "ami-b48c25c3";
+  "14.04".eu-west-1.x86_64-linux.pv-s3 = "ami-06cd6571";
+  "14.04".sa-east-1.x86_64-linux.hvm-ebs = "ami-01b90e1c";
+  "14.04".sa-east-1.x86_64-linux.pv-ebs = "ami-69e35474";
+  "14.04".sa-east-1.x86_64-linux.pv-s3 = "ami-61b90e7c";
+  "14.04".us-east-1.x86_64-linux.hvm-ebs = "ami-58ba3a30";
+  "14.04".us-east-1.x86_64-linux.pv-ebs = "ami-9e0583f6";
+  "14.04".us-east-1.x86_64-linux.pv-s3 = "ami-9cbe3ef4";
+  "14.04".us-west-1.x86_64-linux.hvm-ebs = "ami-0bc3d74e";
+  "14.04".us-west-1.x86_64-linux.pv-ebs = "ami-8b1703ce";
+  "14.04".us-west-1.x86_64-linux.pv-s3 = "ami-27ccd862";
+  "14.04".us-west-2.x86_64-linux.hvm-ebs = "ami-3bf1bf0b";
+  "14.04".us-west-2.x86_64-linux.pv-ebs = "ami-259bd515";
+  "14.04".us-west-2.x86_64-linux.pv-s3 = "ami-07094037";
+
+  "14.12".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-24435f25";
+  "14.12".ap-northeast-1.x86_64-linux.pv-ebs = "ami-b0425eb1";
+  "14.12".ap-northeast-1.x86_64-linux.pv-s3 = "ami-fed3c6ff";
+  "14.12".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-6c765d3e";
+  "14.12".ap-southeast-1.x86_64-linux.pv-ebs = "ami-6a765d38";
+  "14.12".ap-southeast-1.x86_64-linux.pv-s3 = "ami-d1bf9183";
+  "14.12".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-af86f395";
+  "14.12".ap-southeast-2.x86_64-linux.pv-ebs = "ami-b386f389";
+  "14.12".ap-southeast-2.x86_64-linux.pv-s3 = "ami-69c5ae53";
+  "14.12".eu-central-1.x86_64-linux.hvm-ebs = "ami-4a497a57";
+  "14.12".eu-central-1.x86_64-linux.pv-ebs = "ami-4c497a51";
+  "14.12".eu-central-1.x86_64-linux.pv-s3 = "ami-60f2c27d";
+  "14.12".eu-west-1.x86_64-linux.hvm-ebs = "ami-d126a5a6";
+  "14.12".eu-west-1.x86_64-linux.pv-ebs = "ami-0126a576";
+  "14.12".eu-west-1.x86_64-linux.pv-s3 = "ami-deda5fa9";
+  "14.12".sa-east-1.x86_64-linux.hvm-ebs = "ami-2d239e30";
+  "14.12".sa-east-1.x86_64-linux.pv-ebs = "ami-35239e28";
+  "14.12".sa-east-1.x86_64-linux.pv-s3 = "ami-81e3519c";
+  "14.12".us-east-1.x86_64-linux.hvm-ebs = "ami-0c463a64";
+  "14.12".us-east-1.x86_64-linux.pv-ebs = "ami-ac473bc4";
+  "14.12".us-east-1.x86_64-linux.pv-s3 = "ami-00e18a68";
+  "14.12".us-west-1.x86_64-linux.hvm-ebs = "ami-ca534a8f";
+  "14.12".us-west-1.x86_64-linux.pv-ebs = "ami-3e534a7b";
+  "14.12".us-west-1.x86_64-linux.pv-s3 = "ami-2905196c";
+  "14.12".us-west-2.x86_64-linux.hvm-ebs = "ami-fb9dc3cb";
+  "14.12".us-west-2.x86_64-linux.pv-ebs = "ami-899dc3b9";
+  "14.12".us-west-2.x86_64-linux.pv-s3 = "ami-cb7f2dfb";
+
+  "15.09".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-58cac236";
+  "15.09".ap-northeast-1.x86_64-linux.hvm-s3 = "ami-39c8c057";
+  "15.09".ap-northeast-1.x86_64-linux.pv-ebs = "ami-5ac9c134";
+  "15.09".ap-northeast-1.x86_64-linux.pv-s3 = "ami-03cec66d";
+  "15.09".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-2fc2094c";
+  "15.09".ap-southeast-1.x86_64-linux.hvm-s3 = "ami-9ec308fd";
+  "15.09".ap-southeast-1.x86_64-linux.pv-ebs = "ami-95c00bf6";
+  "15.09".ap-southeast-1.x86_64-linux.pv-s3 = "ami-bfc00bdc";
+  "15.09".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-996c4cfa";
+  "15.09".ap-southeast-2.x86_64-linux.hvm-s3 = "ami-3f6e4e5c";
+  "15.09".ap-southeast-2.x86_64-linux.pv-ebs = "ami-066d4d65";
+  "15.09".ap-southeast-2.x86_64-linux.pv-s3 = "ami-cc6e4eaf";
+  "15.09".eu-central-1.x86_64-linux.hvm-ebs = "ami-3f8c6b50";
+  "15.09".eu-central-1.x86_64-linux.hvm-s3 = "ami-5b836434";
+  "15.09".eu-central-1.x86_64-linux.pv-ebs = "ami-118c6b7e";
+  "15.09".eu-central-1.x86_64-linux.pv-s3 = "ami-2c977043";
+  "15.09".eu-west-1.x86_64-linux.hvm-ebs = "ami-9cf04aef";
+  "15.09".eu-west-1.x86_64-linux.hvm-s3 = "ami-2bea5058";
+  "15.09".eu-west-1.x86_64-linux.pv-ebs = "ami-c9e852ba";
+  "15.09".eu-west-1.x86_64-linux.pv-s3 = "ami-c6f64cb5";
+  "15.09".sa-east-1.x86_64-linux.hvm-ebs = "ami-6e52df02";
+  "15.09".sa-east-1.x86_64-linux.hvm-s3 = "ami-1852df74";
+  "15.09".sa-east-1.x86_64-linux.pv-ebs = "ami-4368e52f";
+  "15.09".sa-east-1.x86_64-linux.pv-s3 = "ami-f15ad79d";
+  "15.09".us-east-1.x86_64-linux.hvm-ebs = "ami-84a6a0ee";
+  "15.09".us-east-1.x86_64-linux.hvm-s3 = "ami-06a7a16c";
+  "15.09".us-east-1.x86_64-linux.pv-ebs = "ami-a4a1a7ce";
+  "15.09".us-east-1.x86_64-linux.pv-s3 = "ami-5ba8ae31";
+  "15.09".us-west-1.x86_64-linux.hvm-ebs = "ami-22c8bb42";
+  "15.09".us-west-1.x86_64-linux.hvm-s3 = "ami-a2ccbfc2";
+  "15.09".us-west-1.x86_64-linux.pv-ebs = "ami-10cebd70";
+  "15.09".us-west-1.x86_64-linux.pv-s3 = "ami-fa30429a";
+  "15.09".us-west-2.x86_64-linux.hvm-ebs = "ami-ce57b9ae";
+  "15.09".us-west-2.x86_64-linux.hvm-s3 = "ami-2956b849";
+  "15.09".us-west-2.x86_64-linux.pv-ebs = "ami-005fb160";
+  "15.09".us-west-2.x86_64-linux.pv-s3 = "ami-cd55bbad";
+
+  "16.03".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-40619d21";
+  "16.03".ap-northeast-1.x86_64-linux.hvm-s3 = "ami-ce629eaf";
+  "16.03".ap-northeast-1.x86_64-linux.pv-ebs = "ami-ef639f8e";
+  "16.03".ap-northeast-1.x86_64-linux.pv-s3 = "ami-a1609cc0";
+  "16.03".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-deca00b0";
+  "16.03".ap-northeast-2.x86_64-linux.hvm-s3 = "ami-a3b77dcd";
+  "16.03".ap-northeast-2.x86_64-linux.pv-ebs = "ami-7bcb0115";
+  "16.03".ap-northeast-2.x86_64-linux.pv-s3 = "ami-a2b77dcc";
+  "16.03".ap-south-1.x86_64-linux.hvm-ebs = "ami-0dff9562";
+  "16.03".ap-south-1.x86_64-linux.hvm-s3 = "ami-13f69c7c";
+  "16.03".ap-south-1.x86_64-linux.pv-ebs = "ami-0ef39961";
+  "16.03".ap-south-1.x86_64-linux.pv-s3 = "ami-e0c8a28f";
+  "16.03".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-5e964a3d";
+  "16.03".ap-southeast-1.x86_64-linux.hvm-s3 = "ami-4d964a2e";
+  "16.03".ap-southeast-1.x86_64-linux.pv-ebs = "ami-ec9b478f";
+  "16.03".ap-southeast-1.x86_64-linux.pv-s3 = "ami-999b47fa";
+  "16.03".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-9f7359fc";
+  "16.03".ap-southeast-2.x86_64-linux.hvm-s3 = "ami-987359fb";
+  "16.03".ap-southeast-2.x86_64-linux.pv-ebs = "ami-a2705ac1";
+  "16.03".ap-southeast-2.x86_64-linux.pv-s3 = "ami-a3705ac0";
+  "16.03".eu-central-1.x86_64-linux.hvm-ebs = "ami-17a45178";
+  "16.03".eu-central-1.x86_64-linux.hvm-s3 = "ami-f9a55096";
+  "16.03".eu-central-1.x86_64-linux.pv-ebs = "ami-c8a550a7";
+  "16.03".eu-central-1.x86_64-linux.pv-s3 = "ami-6ea45101";
+  "16.03".eu-west-1.x86_64-linux.hvm-ebs = "ami-b5b3d5c6";
+  "16.03".eu-west-1.x86_64-linux.hvm-s3 = "ami-c986e0ba";
+  "16.03".eu-west-1.x86_64-linux.pv-ebs = "ami-b083e5c3";
+  "16.03".eu-west-1.x86_64-linux.pv-s3 = "ami-3c83e54f";
+  "16.03".sa-east-1.x86_64-linux.hvm-ebs = "ami-f6eb7f9a";
+  "16.03".sa-east-1.x86_64-linux.hvm-s3 = "ami-93e773ff";
+  "16.03".sa-east-1.x86_64-linux.pv-ebs = "ami-cbb82ca7";
+  "16.03".sa-east-1.x86_64-linux.pv-s3 = "ami-abb82cc7";
+  "16.03".us-east-1.x86_64-linux.hvm-ebs = "ami-c123a3d6";
+  "16.03".us-east-1.x86_64-linux.hvm-s3 = "ami-bc25a5ab";
+  "16.03".us-east-1.x86_64-linux.pv-ebs = "ami-bd25a5aa";
+  "16.03".us-east-1.x86_64-linux.pv-s3 = "ami-a325a5b4";
+  "16.03".us-west-1.x86_64-linux.hvm-ebs = "ami-748bcd14";
+  "16.03".us-west-1.x86_64-linux.hvm-s3 = "ami-a68dcbc6";
+  "16.03".us-west-1.x86_64-linux.pv-ebs = "ami-048acc64";
+  "16.03".us-west-1.x86_64-linux.pv-s3 = "ami-208dcb40";
+  "16.03".us-west-2.x86_64-linux.hvm-ebs = "ami-8263a0e2";
+  "16.03".us-west-2.x86_64-linux.hvm-s3 = "ami-925c9ff2";
+  "16.03".us-west-2.x86_64-linux.pv-ebs = "ami-5e61a23e";
+  "16.03".us-west-2.x86_64-linux.pv-s3 = "ami-734c8f13";
+
+  # 16.09.1508.3909827
+  "16.09".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-68453b0f";
+  "16.09".ap-northeast-1.x86_64-linux.hvm-s3 = "ami-f9bec09e";
+  "16.09".ap-northeast-1.x86_64-linux.pv-ebs = "ami-254a3442";
+  "16.09".ap-northeast-1.x86_64-linux.pv-s3 = "ami-ef473988";
+  "16.09".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-18ae7f76";
+  "16.09".ap-northeast-2.x86_64-linux.hvm-s3 = "ami-9eac7df0";
+  "16.09".ap-northeast-2.x86_64-linux.pv-ebs = "ami-57aa7b39";
+  "16.09".ap-northeast-2.x86_64-linux.pv-s3 = "ami-5cae7f32";
+  "16.09".ap-south-1.x86_64-linux.hvm-ebs = "ami-b3f98fdc";
+  "16.09".ap-south-1.x86_64-linux.hvm-s3 = "ami-98e690f7";
+  "16.09".ap-south-1.x86_64-linux.pv-ebs = "ami-aef98fc1";
+  "16.09".ap-south-1.x86_64-linux.pv-s3 = "ami-caf88ea5";
+  "16.09".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-80fb51e3";
+  "16.09".ap-southeast-1.x86_64-linux.hvm-s3 = "ami-2df3594e";
+  "16.09".ap-southeast-1.x86_64-linux.pv-ebs = "ami-37f05a54";
+  "16.09".ap-southeast-1.x86_64-linux.pv-s3 = "ami-27f35944";
+  "16.09".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-57ece834";
+  "16.09".ap-southeast-2.x86_64-linux.hvm-s3 = "ami-87f4f0e4";
+  "16.09".ap-southeast-2.x86_64-linux.pv-ebs = "ami-d8ede9bb";
+  "16.09".ap-southeast-2.x86_64-linux.pv-s3 = "ami-a6ebefc5";
+  "16.09".ca-central-1.x86_64-linux.hvm-ebs = "ami-9f863bfb";
+  "16.09".ca-central-1.x86_64-linux.hvm-s3 = "ami-ea85388e";
+  "16.09".ca-central-1.x86_64-linux.pv-ebs = "ami-ce8a37aa";
+  "16.09".ca-central-1.x86_64-linux.pv-s3 = "ami-448a3720";
+  "16.09".eu-central-1.x86_64-linux.hvm-ebs = "ami-1b884774";
+  "16.09".eu-central-1.x86_64-linux.hvm-s3 = "ami-b08c43df";
+  "16.09".eu-central-1.x86_64-linux.pv-ebs = "ami-888946e7";
+  "16.09".eu-central-1.x86_64-linux.pv-s3 = "ami-06874869";
+  "16.09".eu-west-1.x86_64-linux.hvm-ebs = "ami-1ed3e76d";
+  "16.09".eu-west-1.x86_64-linux.hvm-s3 = "ami-73d1e500";
+  "16.09".eu-west-1.x86_64-linux.pv-ebs = "ami-44c0f437";
+  "16.09".eu-west-1.x86_64-linux.pv-s3 = "ami-f3d8ec80";
+  "16.09".eu-west-2.x86_64-linux.hvm-ebs = "ami-2c9c9648";
+  "16.09".eu-west-2.x86_64-linux.hvm-s3 = "ami-6b9e940f";
+  "16.09".eu-west-2.x86_64-linux.pv-ebs = "ami-f1999395";
+  "16.09".eu-west-2.x86_64-linux.pv-s3 = "ami-bb9f95df";
+  "16.09".sa-east-1.x86_64-linux.hvm-ebs = "ami-a11882cd";
+  "16.09".sa-east-1.x86_64-linux.hvm-s3 = "ami-7726bc1b";
+  "16.09".sa-east-1.x86_64-linux.pv-ebs = "ami-9725bffb";
+  "16.09".sa-east-1.x86_64-linux.pv-s3 = "ami-b027bddc";
+  "16.09".us-east-1.x86_64-linux.hvm-ebs = "ami-854ca593";
+  "16.09".us-east-1.x86_64-linux.hvm-s3 = "ami-2241a834";
+  "16.09".us-east-1.x86_64-linux.pv-ebs = "ami-a441a8b2";
+  "16.09".us-east-1.x86_64-linux.pv-s3 = "ami-e841a8fe";
+  "16.09".us-east-2.x86_64-linux.hvm-ebs = "ami-3f41645a";
+  "16.09".us-east-2.x86_64-linux.hvm-s3 = "ami-804065e5";
+  "16.09".us-east-2.x86_64-linux.pv-ebs = "ami-f1466394";
+  "16.09".us-east-2.x86_64-linux.pv-s3 = "ami-05426760";
+  "16.09".us-west-1.x86_64-linux.hvm-ebs = "ami-c2efbca2";
+  "16.09".us-west-1.x86_64-linux.hvm-s3 = "ami-d71042b7";
+  "16.09".us-west-1.x86_64-linux.pv-ebs = "ami-04e8bb64";
+  "16.09".us-west-1.x86_64-linux.pv-s3 = "ami-31e9ba51";
+  "16.09".us-west-2.x86_64-linux.hvm-ebs = "ami-6449f504";
+  "16.09".us-west-2.x86_64-linux.hvm-s3 = "ami-344af654";
+  "16.09".us-west-2.x86_64-linux.pv-ebs = "ami-6d4af60d";
+  "16.09".us-west-2.x86_64-linux.pv-s3 = "ami-de48f4be";
+
+  # 17.03.885.6024dd4067
+  "17.03".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-dbd0f7bc";
+  "17.03".ap-northeast-1.x86_64-linux.hvm-s3 = "ami-7cdff81b";
+  "17.03".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-c59a48ab";
+  "17.03".ap-northeast-2.x86_64-linux.hvm-s3 = "ami-0b944665";
+  "17.03".ap-south-1.x86_64-linux.hvm-ebs = "ami-4f413220";
+  "17.03".ap-south-1.x86_64-linux.hvm-s3 = "ami-864033e9";
+  "17.03".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-e08c3383";
+  "17.03".ap-southeast-1.x86_64-linux.hvm-s3 = "ami-c28f30a1";
+  "17.03".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-fca9a69f";
+  "17.03".ap-southeast-2.x86_64-linux.hvm-s3 = "ami-3daaa55e";
+  "17.03".ca-central-1.x86_64-linux.hvm-ebs = "ami-9b00bdff";
+  "17.03".ca-central-1.x86_64-linux.hvm-s3 = "ami-e800bd8c";
+  "17.03".eu-central-1.x86_64-linux.hvm-ebs = "ami-5450803b";
+  "17.03".eu-central-1.x86_64-linux.hvm-s3 = "ami-6e2efe01";
+  "17.03".eu-west-1.x86_64-linux.hvm-ebs = "ami-10754c76";
+  "17.03".eu-west-1.x86_64-linux.hvm-s3 = "ami-11734a77";
+  "17.03".eu-west-2.x86_64-linux.hvm-ebs = "ami-ff1d099b";
+  "17.03".eu-west-2.x86_64-linux.hvm-s3 = "ami-fe1d099a";
+  "17.03".sa-east-1.x86_64-linux.hvm-ebs = "ami-d95d3eb5";
+  "17.03".sa-east-1.x86_64-linux.hvm-s3 = "ami-fca2c190";
+  "17.03".us-east-1.x86_64-linux.hvm-ebs = "ami-0940c61f";
+  "17.03".us-east-1.x86_64-linux.hvm-s3 = "ami-674fc971";
+  "17.03".us-east-2.x86_64-linux.hvm-ebs = "ami-afc2e6ca";
+  "17.03".us-east-2.x86_64-linux.hvm-s3 = "ami-a1cde9c4";
+  "17.03".us-west-1.x86_64-linux.hvm-ebs = "ami-587b2138";
+  "17.03".us-west-1.x86_64-linux.hvm-s3 = "ami-70411b10";
+  "17.03".us-west-2.x86_64-linux.hvm-ebs = "ami-a93daac9";
+  "17.03".us-west-2.x86_64-linux.hvm-s3 = "ami-5139ae31";
+
+  # 17.09.2681.59661f21be6
+  "17.09".eu-west-1.x86_64-linux.hvm-ebs = "ami-a30192da";
+  "17.09".eu-west-2.x86_64-linux.hvm-ebs = "ami-295a414d";
+  "17.09".eu-west-3.x86_64-linux.hvm-ebs = "ami-8c0eb9f1";
+  "17.09".eu-central-1.x86_64-linux.hvm-ebs = "ami-266cfe49";
+  "17.09".us-east-1.x86_64-linux.hvm-ebs = "ami-40bee63a";
+  "17.09".us-east-2.x86_64-linux.hvm-ebs = "ami-9d84aff8";
+  "17.09".us-west-1.x86_64-linux.hvm-ebs = "ami-d14142b1";
+  "17.09".us-west-2.x86_64-linux.hvm-ebs = "ami-3eb40346";
+  "17.09".ca-central-1.x86_64-linux.hvm-ebs = "ami-ca8207ae";
+  "17.09".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-84bccff8";
+  "17.09".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-0dc5386f";
+  "17.09".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-89b921ef";
+  "17.09".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-179b3b79";
+  "17.09".sa-east-1.x86_64-linux.hvm-ebs = "ami-4762202b";
+  "17.09".ap-south-1.x86_64-linux.hvm-ebs = "ami-4e376021";
+
+  # 18.03.132946.1caae7247b8
+  "18.03".eu-west-1.x86_64-linux.hvm-ebs = "ami-065c46ec";
+  "18.03".eu-west-2.x86_64-linux.hvm-ebs = "ami-64f31903";
+  "18.03".eu-west-3.x86_64-linux.hvm-ebs = "ami-5a8d3d27";
+  "18.03".eu-central-1.x86_64-linux.hvm-ebs = "ami-09faf9e2";
+  "18.03".us-east-1.x86_64-linux.hvm-ebs = "ami-8b3538f4";
+  "18.03".us-east-2.x86_64-linux.hvm-ebs = "ami-150b3170";
+  "18.03".us-west-1.x86_64-linux.hvm-ebs = "ami-ce06ebad";
+  "18.03".us-west-2.x86_64-linux.hvm-ebs = "ami-586c3520";
+  "18.03".ca-central-1.x86_64-linux.hvm-ebs = "ami-aca72ac8";
+  "18.03".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-aa0b4d40";
+  "18.03".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-d0f254b2";
+  "18.03".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-456511a8";
+  "18.03".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-3366d15d";
+  "18.03".sa-east-1.x86_64-linux.hvm-ebs = "ami-163e1f7a";
+  "18.03".ap-south-1.x86_64-linux.hvm-ebs = "ami-6a390b05";
+
+  # 18.09.910.c15e342304a
+  "18.09".eu-west-1.x86_64-linux.hvm-ebs = "ami-0f412186fb8a0ec97";
+  "18.09".eu-west-2.x86_64-linux.hvm-ebs = "ami-0dada3805ce43c55e";
+  "18.09".eu-west-3.x86_64-linux.hvm-ebs = "ami-074df85565f2e02e2";
+  "18.09".eu-central-1.x86_64-linux.hvm-ebs = "ami-07c9b884e679df4f8";
+  "18.09".us-east-1.x86_64-linux.hvm-ebs = "ami-009c9c3f1af480ff3";
+  "18.09".us-east-2.x86_64-linux.hvm-ebs = "ami-08199961085ea8bc6";
+  "18.09".us-west-1.x86_64-linux.hvm-ebs = "ami-07aa7f56d612ddd38";
+  "18.09".us-west-2.x86_64-linux.hvm-ebs = "ami-01c84b7c368ac24d1";
+  "18.09".ca-central-1.x86_64-linux.hvm-ebs = "ami-04f66113f76198f6c";
+  "18.09".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-0892c7e24ebf2194f";
+  "18.09".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-010730f36424b0a2c";
+  "18.09".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-0cdba8e998f076547";
+  "18.09".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-0400a698e6a9f4a15";
+  "18.09".sa-east-1.x86_64-linux.hvm-ebs = "ami-0e4a8a47fd6db6112";
+  "18.09".ap-south-1.x86_64-linux.hvm-ebs = "ami-0880a678d3f555313";
+
+  # 19.03.172286.8ea36d73256
+  "19.03".eu-west-1.x86_64-linux.hvm-ebs = "ami-0fe40176548ff0940";
+  "19.03".eu-west-2.x86_64-linux.hvm-ebs = "ami-03a40fd3a02fe95ba";
+  "19.03".eu-west-3.x86_64-linux.hvm-ebs = "ami-0436f9da0f20a638e";
+  "19.03".eu-central-1.x86_64-linux.hvm-ebs = "ami-0022b8ea9efde5de4";
+  "19.03".us-east-1.x86_64-linux.hvm-ebs = "ami-0efc58fb70ae9a217";
+  "19.03".us-east-2.x86_64-linux.hvm-ebs = "ami-0abf711b1b34da1af";
+  "19.03".us-west-1.x86_64-linux.hvm-ebs = "ami-07d126e8838c40ec5";
+  "19.03".us-west-2.x86_64-linux.hvm-ebs = "ami-03f8a737546e47fb0";
+  "19.03".ca-central-1.x86_64-linux.hvm-ebs = "ami-03f9fd0ef2e035ede";
+  "19.03".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-0cff66114c652c262";
+  "19.03".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-054c73a7f8d773ea9";
+  "19.03".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-00db62688900456a4";
+  "19.03".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-0485cdd1a5fdd2117";
+  "19.03".sa-east-1.x86_64-linux.hvm-ebs = "ami-0c6a43c6e0ad1f4e2";
+  "19.03".ap-south-1.x86_64-linux.hvm-ebs = "ami-0303deb1b5890f878";
+
+  # 19.09.2243.84af403f54f
+  "19.09".eu-west-1.x86_64-linux.hvm-ebs = "ami-071082f0fa035374f";
+  "19.09".eu-west-2.x86_64-linux.hvm-ebs = "ami-0d9dc33c54d1dc4c3";
+  "19.09".eu-west-3.x86_64-linux.hvm-ebs = "ami-09566799591d1bfed";
+  "19.09".eu-central-1.x86_64-linux.hvm-ebs = "ami-015f8efc2be419b79";
+  "19.09".eu-north-1.x86_64-linux.hvm-ebs = "ami-07fc0a32d885e01ed";
+  "19.09".us-east-1.x86_64-linux.hvm-ebs = "ami-03330d8b51287412f";
+  "19.09".us-east-2.x86_64-linux.hvm-ebs = "ami-0518b4c84972e967f";
+  "19.09".us-west-1.x86_64-linux.hvm-ebs = "ami-06ad07e61a353b4a6";
+  "19.09".us-west-2.x86_64-linux.hvm-ebs = "ami-0e31e30925cf3ce4e";
+  "19.09".ca-central-1.x86_64-linux.hvm-ebs = "ami-07df50fc76702a36d";
+  "19.09".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-0f71ae5d4b0b78d95";
+  "19.09".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-057bbf2b4bd62d210";
+  "19.09".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-02a62555ca182fb5b";
+  "19.09".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-0219dde0e6b7b7b93";
+  "19.09".ap-south-1.x86_64-linux.hvm-ebs = "ami-066f7f2a895c821a1";
+  "19.09".ap-east-1.x86_64-linux.hvm-ebs = "ami-055b2348db2827ff1";
+  "19.09".sa-east-1.x86_64-linux.hvm-ebs = "ami-018aab68377227e06";
+
+  # 20.03.1554.94e39623a49
+  "20.03".eu-west-1.x86_64-linux.hvm-ebs = "ami-02c34db5766cc7013";
+  "20.03".eu-west-2.x86_64-linux.hvm-ebs = "ami-0e32bd8c7853883f1";
+  "20.03".eu-west-3.x86_64-linux.hvm-ebs = "ami-061edb1356c1d69fd";
+  "20.03".eu-central-1.x86_64-linux.hvm-ebs = "ami-0a1a94722dcbff94c";
+  "20.03".eu-north-1.x86_64-linux.hvm-ebs = "ami-02699abfacbb6464b";
+  "20.03".us-east-1.x86_64-linux.hvm-ebs = "ami-0c5e7760748b74e85";
+  "20.03".us-east-2.x86_64-linux.hvm-ebs = "ami-030296bb256764655";
+  "20.03".us-west-1.x86_64-linux.hvm-ebs = "ami-050be818e0266b741";
+  "20.03".us-west-2.x86_64-linux.hvm-ebs = "ami-06562f78dca68eda2";
+  "20.03".ca-central-1.x86_64-linux.hvm-ebs = "ami-02365684a173255c7";
+  "20.03".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-0dbf353e168d155f7";
+  "20.03".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-04c0f3a75f63daddd";
+  "20.03".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-093d9cc49c191eb6c";
+  "20.03".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-0087df91a7b6ebd45";
+  "20.03".ap-south-1.x86_64-linux.hvm-ebs = "ami-0a1a6b569af04af9d";
+  "20.03".ap-east-1.x86_64-linux.hvm-ebs = "ami-0d18fdd309cdefa86";
+  "20.03".sa-east-1.x86_64-linux.hvm-ebs = "ami-09859378158ae971d";
+
+  # 20.09.2016.19db3e5ea27
+  "20.09".eu-west-1.x86_64-linux.hvm-ebs = "ami-0057cb7d614329fa2";
+  "20.09".eu-west-2.x86_64-linux.hvm-ebs = "ami-0d46f16e0bb0ec8fd";
+  "20.09".eu-west-3.x86_64-linux.hvm-ebs = "ami-0e8985c3ea42f87fe";
+  "20.09".eu-central-1.x86_64-linux.hvm-ebs = "ami-0eed77c38432886d2";
+  "20.09".eu-north-1.x86_64-linux.hvm-ebs = "ami-0be5bcadd632bea14";
+  "20.09".us-east-1.x86_64-linux.hvm-ebs = "ami-0a2cce52b42daccc8";
+  "20.09".us-east-2.x86_64-linux.hvm-ebs = "ami-09378bf487b07a4d8";
+  "20.09".us-west-1.x86_64-linux.hvm-ebs = "ami-09b4337b2a9e77485";
+  "20.09".us-west-2.x86_64-linux.hvm-ebs = "ami-081d3bb5fbee0a1ac";
+  "20.09".ca-central-1.x86_64-linux.hvm-ebs = "ami-020c24c6c607e7ac7";
+  "20.09".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-08f648d5db009e67d";
+  "20.09".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-0be390efaccbd40f9";
+  "20.09".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-0c3311601cbe8f927";
+  "20.09".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-0020146701f4d56cf";
+  "20.09".ap-south-1.x86_64-linux.hvm-ebs = "ami-0117e2bd876bb40d1";
+  "20.09".ap-east-1.x86_64-linux.hvm-ebs = "ami-0c42f97e5b1fda92f";
+  "20.09".sa-east-1.x86_64-linux.hvm-ebs = "ami-021637976b094959d";
+
+  # 21.05.740.aa576357673
+  "21.05".eu-west-1.x86_64-linux.hvm-ebs = "ami-048dbc738074a3083";
+  "21.05".eu-west-2.x86_64-linux.hvm-ebs = "ami-0234cf81fec68315d";
+  "21.05".eu-west-3.x86_64-linux.hvm-ebs = "ami-020e459baf709107d";
+  "21.05".eu-central-1.x86_64-linux.hvm-ebs = "ami-0857d5d1309ab8b77";
+  "21.05".eu-north-1.x86_64-linux.hvm-ebs = "ami-05403e3ae53d3716f";
+  "21.05".us-east-1.x86_64-linux.hvm-ebs = "ami-0d3002ba40b5b9897";
+  "21.05".us-east-2.x86_64-linux.hvm-ebs = "ami-069a0ca1bde6dea52";
+  "21.05".us-west-1.x86_64-linux.hvm-ebs = "ami-0b415460a84bcf9bc";
+  "21.05".us-west-2.x86_64-linux.hvm-ebs = "ami-093cba49754abd7f8";
+  "21.05".ca-central-1.x86_64-linux.hvm-ebs = "ami-065c13e1d52d60b33";
+  "21.05".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-04f570c70ff9b665e";
+  "21.05".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-02a3d1df595df5ef6";
+  "21.05".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-027836fddb5c56012";
+  "21.05".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-0edacd41dc7700c39";
+  "21.05".ap-south-1.x86_64-linux.hvm-ebs = "ami-0b279b5bb55288059";
+  "21.05".ap-east-1.x86_64-linux.hvm-ebs = "ami-06dc98082bc55c1fc";
+  "21.05".sa-east-1.x86_64-linux.hvm-ebs = "ami-04737dd49b98936c6";
+
+  latest = self."21.05";
+}; in self
diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix
index d38f41ab39d7..1ffb326ba7a8 100644
--- a/nixos/modules/virtualisation/ec2-amis.nix
+++ b/nixos/modules/virtualisation/ec2-amis.nix
@@ -1,371 +1,9 @@
-let self = {
-  "14.04".ap-northeast-1.hvm-ebs = "ami-71c6f470";
-  "14.04".ap-northeast-1.pv-ebs = "ami-4dcbf84c";
-  "14.04".ap-northeast-1.pv-s3 = "ami-8fc4f68e";
-  "14.04".ap-southeast-1.hvm-ebs = "ami-da280888";
-  "14.04".ap-southeast-1.pv-ebs = "ami-7a9dbc28";
-  "14.04".ap-southeast-1.pv-s3 = "ami-c4290996";
-  "14.04".ap-southeast-2.hvm-ebs = "ami-ab523e91";
-  "14.04".ap-southeast-2.pv-ebs = "ami-6769055d";
-  "14.04".ap-southeast-2.pv-s3 = "ami-15533f2f";
-  "14.04".eu-central-1.hvm-ebs = "ami-ba0234a7";
-  "14.04".eu-west-1.hvm-ebs = "ami-96cb63e1";
-  "14.04".eu-west-1.pv-ebs = "ami-b48c25c3";
-  "14.04".eu-west-1.pv-s3 = "ami-06cd6571";
-  "14.04".sa-east-1.hvm-ebs = "ami-01b90e1c";
-  "14.04".sa-east-1.pv-ebs = "ami-69e35474";
-  "14.04".sa-east-1.pv-s3 = "ami-61b90e7c";
-  "14.04".us-east-1.hvm-ebs = "ami-58ba3a30";
-  "14.04".us-east-1.pv-ebs = "ami-9e0583f6";
-  "14.04".us-east-1.pv-s3 = "ami-9cbe3ef4";
-  "14.04".us-west-1.hvm-ebs = "ami-0bc3d74e";
-  "14.04".us-west-1.pv-ebs = "ami-8b1703ce";
-  "14.04".us-west-1.pv-s3 = "ami-27ccd862";
-  "14.04".us-west-2.hvm-ebs = "ami-3bf1bf0b";
-  "14.04".us-west-2.pv-ebs = "ami-259bd515";
-  "14.04".us-west-2.pv-s3 = "ami-07094037";
-
-  "14.12".ap-northeast-1.hvm-ebs = "ami-24435f25";
-  "14.12".ap-northeast-1.pv-ebs = "ami-b0425eb1";
-  "14.12".ap-northeast-1.pv-s3 = "ami-fed3c6ff";
-  "14.12".ap-southeast-1.hvm-ebs = "ami-6c765d3e";
-  "14.12".ap-southeast-1.pv-ebs = "ami-6a765d38";
-  "14.12".ap-southeast-1.pv-s3 = "ami-d1bf9183";
-  "14.12".ap-southeast-2.hvm-ebs = "ami-af86f395";
-  "14.12".ap-southeast-2.pv-ebs = "ami-b386f389";
-  "14.12".ap-southeast-2.pv-s3 = "ami-69c5ae53";
-  "14.12".eu-central-1.hvm-ebs = "ami-4a497a57";
-  "14.12".eu-central-1.pv-ebs = "ami-4c497a51";
-  "14.12".eu-central-1.pv-s3 = "ami-60f2c27d";
-  "14.12".eu-west-1.hvm-ebs = "ami-d126a5a6";
-  "14.12".eu-west-1.pv-ebs = "ami-0126a576";
-  "14.12".eu-west-1.pv-s3 = "ami-deda5fa9";
-  "14.12".sa-east-1.hvm-ebs = "ami-2d239e30";
-  "14.12".sa-east-1.pv-ebs = "ami-35239e28";
-  "14.12".sa-east-1.pv-s3 = "ami-81e3519c";
-  "14.12".us-east-1.hvm-ebs = "ami-0c463a64";
-  "14.12".us-east-1.pv-ebs = "ami-ac473bc4";
-  "14.12".us-east-1.pv-s3 = "ami-00e18a68";
-  "14.12".us-west-1.hvm-ebs = "ami-ca534a8f";
-  "14.12".us-west-1.pv-ebs = "ami-3e534a7b";
-  "14.12".us-west-1.pv-s3 = "ami-2905196c";
-  "14.12".us-west-2.hvm-ebs = "ami-fb9dc3cb";
-  "14.12".us-west-2.pv-ebs = "ami-899dc3b9";
-  "14.12".us-west-2.pv-s3 = "ami-cb7f2dfb";
-
-  "15.09".ap-northeast-1.hvm-ebs = "ami-58cac236";
-  "15.09".ap-northeast-1.hvm-s3 = "ami-39c8c057";
-  "15.09".ap-northeast-1.pv-ebs = "ami-5ac9c134";
-  "15.09".ap-northeast-1.pv-s3 = "ami-03cec66d";
-  "15.09".ap-southeast-1.hvm-ebs = "ami-2fc2094c";
-  "15.09".ap-southeast-1.hvm-s3 = "ami-9ec308fd";
-  "15.09".ap-southeast-1.pv-ebs = "ami-95c00bf6";
-  "15.09".ap-southeast-1.pv-s3 = "ami-bfc00bdc";
-  "15.09".ap-southeast-2.hvm-ebs = "ami-996c4cfa";
-  "15.09".ap-southeast-2.hvm-s3 = "ami-3f6e4e5c";
-  "15.09".ap-southeast-2.pv-ebs = "ami-066d4d65";
-  "15.09".ap-southeast-2.pv-s3 = "ami-cc6e4eaf";
-  "15.09".eu-central-1.hvm-ebs = "ami-3f8c6b50";
-  "15.09".eu-central-1.hvm-s3 = "ami-5b836434";
-  "15.09".eu-central-1.pv-ebs = "ami-118c6b7e";
-  "15.09".eu-central-1.pv-s3 = "ami-2c977043";
-  "15.09".eu-west-1.hvm-ebs = "ami-9cf04aef";
-  "15.09".eu-west-1.hvm-s3 = "ami-2bea5058";
-  "15.09".eu-west-1.pv-ebs = "ami-c9e852ba";
-  "15.09".eu-west-1.pv-s3 = "ami-c6f64cb5";
-  "15.09".sa-east-1.hvm-ebs = "ami-6e52df02";
-  "15.09".sa-east-1.hvm-s3 = "ami-1852df74";
-  "15.09".sa-east-1.pv-ebs = "ami-4368e52f";
-  "15.09".sa-east-1.pv-s3 = "ami-f15ad79d";
-  "15.09".us-east-1.hvm-ebs = "ami-84a6a0ee";
-  "15.09".us-east-1.hvm-s3 = "ami-06a7a16c";
-  "15.09".us-east-1.pv-ebs = "ami-a4a1a7ce";
-  "15.09".us-east-1.pv-s3 = "ami-5ba8ae31";
-  "15.09".us-west-1.hvm-ebs = "ami-22c8bb42";
-  "15.09".us-west-1.hvm-s3 = "ami-a2ccbfc2";
-  "15.09".us-west-1.pv-ebs = "ami-10cebd70";
-  "15.09".us-west-1.pv-s3 = "ami-fa30429a";
-  "15.09".us-west-2.hvm-ebs = "ami-ce57b9ae";
-  "15.09".us-west-2.hvm-s3 = "ami-2956b849";
-  "15.09".us-west-2.pv-ebs = "ami-005fb160";
-  "15.09".us-west-2.pv-s3 = "ami-cd55bbad";
-
-  "16.03".ap-northeast-1.hvm-ebs = "ami-40619d21";
-  "16.03".ap-northeast-1.hvm-s3 = "ami-ce629eaf";
-  "16.03".ap-northeast-1.pv-ebs = "ami-ef639f8e";
-  "16.03".ap-northeast-1.pv-s3 = "ami-a1609cc0";
-  "16.03".ap-northeast-2.hvm-ebs = "ami-deca00b0";
-  "16.03".ap-northeast-2.hvm-s3 = "ami-a3b77dcd";
-  "16.03".ap-northeast-2.pv-ebs = "ami-7bcb0115";
-  "16.03".ap-northeast-2.pv-s3 = "ami-a2b77dcc";
-  "16.03".ap-south-1.hvm-ebs = "ami-0dff9562";
-  "16.03".ap-south-1.hvm-s3 = "ami-13f69c7c";
-  "16.03".ap-south-1.pv-ebs = "ami-0ef39961";
-  "16.03".ap-south-1.pv-s3 = "ami-e0c8a28f";
-  "16.03".ap-southeast-1.hvm-ebs = "ami-5e964a3d";
-  "16.03".ap-southeast-1.hvm-s3 = "ami-4d964a2e";
-  "16.03".ap-southeast-1.pv-ebs = "ami-ec9b478f";
-  "16.03".ap-southeast-1.pv-s3 = "ami-999b47fa";
-  "16.03".ap-southeast-2.hvm-ebs = "ami-9f7359fc";
-  "16.03".ap-southeast-2.hvm-s3 = "ami-987359fb";
-  "16.03".ap-southeast-2.pv-ebs = "ami-a2705ac1";
-  "16.03".ap-southeast-2.pv-s3 = "ami-a3705ac0";
-  "16.03".eu-central-1.hvm-ebs = "ami-17a45178";
-  "16.03".eu-central-1.hvm-s3 = "ami-f9a55096";
-  "16.03".eu-central-1.pv-ebs = "ami-c8a550a7";
-  "16.03".eu-central-1.pv-s3 = "ami-6ea45101";
-  "16.03".eu-west-1.hvm-ebs = "ami-b5b3d5c6";
-  "16.03".eu-west-1.hvm-s3 = "ami-c986e0ba";
-  "16.03".eu-west-1.pv-ebs = "ami-b083e5c3";
-  "16.03".eu-west-1.pv-s3 = "ami-3c83e54f";
-  "16.03".sa-east-1.hvm-ebs = "ami-f6eb7f9a";
-  "16.03".sa-east-1.hvm-s3 = "ami-93e773ff";
-  "16.03".sa-east-1.pv-ebs = "ami-cbb82ca7";
-  "16.03".sa-east-1.pv-s3 = "ami-abb82cc7";
-  "16.03".us-east-1.hvm-ebs = "ami-c123a3d6";
-  "16.03".us-east-1.hvm-s3 = "ami-bc25a5ab";
-  "16.03".us-east-1.pv-ebs = "ami-bd25a5aa";
-  "16.03".us-east-1.pv-s3 = "ami-a325a5b4";
-  "16.03".us-west-1.hvm-ebs = "ami-748bcd14";
-  "16.03".us-west-1.hvm-s3 = "ami-a68dcbc6";
-  "16.03".us-west-1.pv-ebs = "ami-048acc64";
-  "16.03".us-west-1.pv-s3 = "ami-208dcb40";
-  "16.03".us-west-2.hvm-ebs = "ami-8263a0e2";
-  "16.03".us-west-2.hvm-s3 = "ami-925c9ff2";
-  "16.03".us-west-2.pv-ebs = "ami-5e61a23e";
-  "16.03".us-west-2.pv-s3 = "ami-734c8f13";
-
-  # 16.09.1508.3909827
-  "16.09".ap-northeast-1.hvm-ebs = "ami-68453b0f";
-  "16.09".ap-northeast-1.hvm-s3 = "ami-f9bec09e";
-  "16.09".ap-northeast-1.pv-ebs = "ami-254a3442";
-  "16.09".ap-northeast-1.pv-s3 = "ami-ef473988";
-  "16.09".ap-northeast-2.hvm-ebs = "ami-18ae7f76";
-  "16.09".ap-northeast-2.hvm-s3 = "ami-9eac7df0";
-  "16.09".ap-northeast-2.pv-ebs = "ami-57aa7b39";
-  "16.09".ap-northeast-2.pv-s3 = "ami-5cae7f32";
-  "16.09".ap-south-1.hvm-ebs = "ami-b3f98fdc";
-  "16.09".ap-south-1.hvm-s3 = "ami-98e690f7";
-  "16.09".ap-south-1.pv-ebs = "ami-aef98fc1";
-  "16.09".ap-south-1.pv-s3 = "ami-caf88ea5";
-  "16.09".ap-southeast-1.hvm-ebs = "ami-80fb51e3";
-  "16.09".ap-southeast-1.hvm-s3 = "ami-2df3594e";
-  "16.09".ap-southeast-1.pv-ebs = "ami-37f05a54";
-  "16.09".ap-southeast-1.pv-s3 = "ami-27f35944";
-  "16.09".ap-southeast-2.hvm-ebs = "ami-57ece834";
-  "16.09".ap-southeast-2.hvm-s3 = "ami-87f4f0e4";
-  "16.09".ap-southeast-2.pv-ebs = "ami-d8ede9bb";
-  "16.09".ap-southeast-2.pv-s3 = "ami-a6ebefc5";
-  "16.09".ca-central-1.hvm-ebs = "ami-9f863bfb";
-  "16.09".ca-central-1.hvm-s3 = "ami-ea85388e";
-  "16.09".ca-central-1.pv-ebs = "ami-ce8a37aa";
-  "16.09".ca-central-1.pv-s3 = "ami-448a3720";
-  "16.09".eu-central-1.hvm-ebs = "ami-1b884774";
-  "16.09".eu-central-1.hvm-s3 = "ami-b08c43df";
-  "16.09".eu-central-1.pv-ebs = "ami-888946e7";
-  "16.09".eu-central-1.pv-s3 = "ami-06874869";
-  "16.09".eu-west-1.hvm-ebs = "ami-1ed3e76d";
-  "16.09".eu-west-1.hvm-s3 = "ami-73d1e500";
-  "16.09".eu-west-1.pv-ebs = "ami-44c0f437";
-  "16.09".eu-west-1.pv-s3 = "ami-f3d8ec80";
-  "16.09".eu-west-2.hvm-ebs = "ami-2c9c9648";
-  "16.09".eu-west-2.hvm-s3 = "ami-6b9e940f";
-  "16.09".eu-west-2.pv-ebs = "ami-f1999395";
-  "16.09".eu-west-2.pv-s3 = "ami-bb9f95df";
-  "16.09".sa-east-1.hvm-ebs = "ami-a11882cd";
-  "16.09".sa-east-1.hvm-s3 = "ami-7726bc1b";
-  "16.09".sa-east-1.pv-ebs = "ami-9725bffb";
-  "16.09".sa-east-1.pv-s3 = "ami-b027bddc";
-  "16.09".us-east-1.hvm-ebs = "ami-854ca593";
-  "16.09".us-east-1.hvm-s3 = "ami-2241a834";
-  "16.09".us-east-1.pv-ebs = "ami-a441a8b2";
-  "16.09".us-east-1.pv-s3 = "ami-e841a8fe";
-  "16.09".us-east-2.hvm-ebs = "ami-3f41645a";
-  "16.09".us-east-2.hvm-s3 = "ami-804065e5";
-  "16.09".us-east-2.pv-ebs = "ami-f1466394";
-  "16.09".us-east-2.pv-s3 = "ami-05426760";
-  "16.09".us-west-1.hvm-ebs = "ami-c2efbca2";
-  "16.09".us-west-1.hvm-s3 = "ami-d71042b7";
-  "16.09".us-west-1.pv-ebs = "ami-04e8bb64";
-  "16.09".us-west-1.pv-s3 = "ami-31e9ba51";
-  "16.09".us-west-2.hvm-ebs = "ami-6449f504";
-  "16.09".us-west-2.hvm-s3 = "ami-344af654";
-  "16.09".us-west-2.pv-ebs = "ami-6d4af60d";
-  "16.09".us-west-2.pv-s3 = "ami-de48f4be";
-
-  # 17.03.885.6024dd4067
-  "17.03".ap-northeast-1.hvm-ebs = "ami-dbd0f7bc";
-  "17.03".ap-northeast-1.hvm-s3 = "ami-7cdff81b";
-  "17.03".ap-northeast-2.hvm-ebs = "ami-c59a48ab";
-  "17.03".ap-northeast-2.hvm-s3 = "ami-0b944665";
-  "17.03".ap-south-1.hvm-ebs = "ami-4f413220";
-  "17.03".ap-south-1.hvm-s3 = "ami-864033e9";
-  "17.03".ap-southeast-1.hvm-ebs = "ami-e08c3383";
-  "17.03".ap-southeast-1.hvm-s3 = "ami-c28f30a1";
-  "17.03".ap-southeast-2.hvm-ebs = "ami-fca9a69f";
-  "17.03".ap-southeast-2.hvm-s3 = "ami-3daaa55e";
-  "17.03".ca-central-1.hvm-ebs = "ami-9b00bdff";
-  "17.03".ca-central-1.hvm-s3 = "ami-e800bd8c";
-  "17.03".eu-central-1.hvm-ebs = "ami-5450803b";
-  "17.03".eu-central-1.hvm-s3 = "ami-6e2efe01";
-  "17.03".eu-west-1.hvm-ebs = "ami-10754c76";
-  "17.03".eu-west-1.hvm-s3 = "ami-11734a77";
-  "17.03".eu-west-2.hvm-ebs = "ami-ff1d099b";
-  "17.03".eu-west-2.hvm-s3 = "ami-fe1d099a";
-  "17.03".sa-east-1.hvm-ebs = "ami-d95d3eb5";
-  "17.03".sa-east-1.hvm-s3 = "ami-fca2c190";
-  "17.03".us-east-1.hvm-ebs = "ami-0940c61f";
-  "17.03".us-east-1.hvm-s3 = "ami-674fc971";
-  "17.03".us-east-2.hvm-ebs = "ami-afc2e6ca";
-  "17.03".us-east-2.hvm-s3 = "ami-a1cde9c4";
-  "17.03".us-west-1.hvm-ebs = "ami-587b2138";
-  "17.03".us-west-1.hvm-s3 = "ami-70411b10";
-  "17.03".us-west-2.hvm-ebs = "ami-a93daac9";
-  "17.03".us-west-2.hvm-s3 = "ami-5139ae31";
-
-  # 17.09.2681.59661f21be6
-  "17.09".eu-west-1.hvm-ebs = "ami-a30192da";
-  "17.09".eu-west-2.hvm-ebs = "ami-295a414d";
-  "17.09".eu-west-3.hvm-ebs = "ami-8c0eb9f1";
-  "17.09".eu-central-1.hvm-ebs = "ami-266cfe49";
-  "17.09".us-east-1.hvm-ebs = "ami-40bee63a";
-  "17.09".us-east-2.hvm-ebs = "ami-9d84aff8";
-  "17.09".us-west-1.hvm-ebs = "ami-d14142b1";
-  "17.09".us-west-2.hvm-ebs = "ami-3eb40346";
-  "17.09".ca-central-1.hvm-ebs = "ami-ca8207ae";
-  "17.09".ap-southeast-1.hvm-ebs = "ami-84bccff8";
-  "17.09".ap-southeast-2.hvm-ebs = "ami-0dc5386f";
-  "17.09".ap-northeast-1.hvm-ebs = "ami-89b921ef";
-  "17.09".ap-northeast-2.hvm-ebs = "ami-179b3b79";
-  "17.09".sa-east-1.hvm-ebs = "ami-4762202b";
-  "17.09".ap-south-1.hvm-ebs = "ami-4e376021";
-
-  # 18.03.132946.1caae7247b8
-  "18.03".eu-west-1.hvm-ebs = "ami-065c46ec";
-  "18.03".eu-west-2.hvm-ebs = "ami-64f31903";
-  "18.03".eu-west-3.hvm-ebs = "ami-5a8d3d27";
-  "18.03".eu-central-1.hvm-ebs = "ami-09faf9e2";
-  "18.03".us-east-1.hvm-ebs = "ami-8b3538f4";
-  "18.03".us-east-2.hvm-ebs = "ami-150b3170";
-  "18.03".us-west-1.hvm-ebs = "ami-ce06ebad";
-  "18.03".us-west-2.hvm-ebs = "ami-586c3520";
-  "18.03".ca-central-1.hvm-ebs = "ami-aca72ac8";
-  "18.03".ap-southeast-1.hvm-ebs = "ami-aa0b4d40";
-  "18.03".ap-southeast-2.hvm-ebs = "ami-d0f254b2";
-  "18.03".ap-northeast-1.hvm-ebs = "ami-456511a8";
-  "18.03".ap-northeast-2.hvm-ebs = "ami-3366d15d";
-  "18.03".sa-east-1.hvm-ebs = "ami-163e1f7a";
-  "18.03".ap-south-1.hvm-ebs = "ami-6a390b05";
-
-  # 18.09.910.c15e342304a
-  "18.09".eu-west-1.hvm-ebs = "ami-0f412186fb8a0ec97";
-  "18.09".eu-west-2.hvm-ebs = "ami-0dada3805ce43c55e";
-  "18.09".eu-west-3.hvm-ebs = "ami-074df85565f2e02e2";
-  "18.09".eu-central-1.hvm-ebs = "ami-07c9b884e679df4f8";
-  "18.09".us-east-1.hvm-ebs = "ami-009c9c3f1af480ff3";
-  "18.09".us-east-2.hvm-ebs = "ami-08199961085ea8bc6";
-  "18.09".us-west-1.hvm-ebs = "ami-07aa7f56d612ddd38";
-  "18.09".us-west-2.hvm-ebs = "ami-01c84b7c368ac24d1";
-  "18.09".ca-central-1.hvm-ebs = "ami-04f66113f76198f6c";
-  "18.09".ap-southeast-1.hvm-ebs = "ami-0892c7e24ebf2194f";
-  "18.09".ap-southeast-2.hvm-ebs = "ami-010730f36424b0a2c";
-  "18.09".ap-northeast-1.hvm-ebs = "ami-0cdba8e998f076547";
-  "18.09".ap-northeast-2.hvm-ebs = "ami-0400a698e6a9f4a15";
-  "18.09".sa-east-1.hvm-ebs = "ami-0e4a8a47fd6db6112";
-  "18.09".ap-south-1.hvm-ebs = "ami-0880a678d3f555313";
-
-  # 19.03.172286.8ea36d73256
-  "19.03".eu-west-1.hvm-ebs = "ami-0fe40176548ff0940";
-  "19.03".eu-west-2.hvm-ebs = "ami-03a40fd3a02fe95ba";
-  "19.03".eu-west-3.hvm-ebs = "ami-0436f9da0f20a638e";
-  "19.03".eu-central-1.hvm-ebs = "ami-0022b8ea9efde5de4";
-  "19.03".us-east-1.hvm-ebs = "ami-0efc58fb70ae9a217";
-  "19.03".us-east-2.hvm-ebs = "ami-0abf711b1b34da1af";
-  "19.03".us-west-1.hvm-ebs = "ami-07d126e8838c40ec5";
-  "19.03".us-west-2.hvm-ebs = "ami-03f8a737546e47fb0";
-  "19.03".ca-central-1.hvm-ebs = "ami-03f9fd0ef2e035ede";
-  "19.03".ap-southeast-1.hvm-ebs = "ami-0cff66114c652c262";
-  "19.03".ap-southeast-2.hvm-ebs = "ami-054c73a7f8d773ea9";
-  "19.03".ap-northeast-1.hvm-ebs = "ami-00db62688900456a4";
-  "19.03".ap-northeast-2.hvm-ebs = "ami-0485cdd1a5fdd2117";
-  "19.03".sa-east-1.hvm-ebs = "ami-0c6a43c6e0ad1f4e2";
-  "19.03".ap-south-1.hvm-ebs = "ami-0303deb1b5890f878";
-
-  # 19.09.2243.84af403f54f
-  "19.09".eu-west-1.hvm-ebs = "ami-071082f0fa035374f";
-  "19.09".eu-west-2.hvm-ebs = "ami-0d9dc33c54d1dc4c3";
-  "19.09".eu-west-3.hvm-ebs = "ami-09566799591d1bfed";
-  "19.09".eu-central-1.hvm-ebs = "ami-015f8efc2be419b79";
-  "19.09".eu-north-1.hvm-ebs = "ami-07fc0a32d885e01ed";
-  "19.09".us-east-1.hvm-ebs = "ami-03330d8b51287412f";
-  "19.09".us-east-2.hvm-ebs = "ami-0518b4c84972e967f";
-  "19.09".us-west-1.hvm-ebs = "ami-06ad07e61a353b4a6";
-  "19.09".us-west-2.hvm-ebs = "ami-0e31e30925cf3ce4e";
-  "19.09".ca-central-1.hvm-ebs = "ami-07df50fc76702a36d";
-  "19.09".ap-southeast-1.hvm-ebs = "ami-0f71ae5d4b0b78d95";
-  "19.09".ap-southeast-2.hvm-ebs = "ami-057bbf2b4bd62d210";
-  "19.09".ap-northeast-1.hvm-ebs = "ami-02a62555ca182fb5b";
-  "19.09".ap-northeast-2.hvm-ebs = "ami-0219dde0e6b7b7b93";
-  "19.09".ap-south-1.hvm-ebs = "ami-066f7f2a895c821a1";
-  "19.09".ap-east-1.hvm-ebs = "ami-055b2348db2827ff1";
-  "19.09".sa-east-1.hvm-ebs = "ami-018aab68377227e06";
-
-  # 20.03.1554.94e39623a49
-  "20.03".eu-west-1.hvm-ebs = "ami-02c34db5766cc7013";
-  "20.03".eu-west-2.hvm-ebs = "ami-0e32bd8c7853883f1";
-  "20.03".eu-west-3.hvm-ebs = "ami-061edb1356c1d69fd";
-  "20.03".eu-central-1.hvm-ebs = "ami-0a1a94722dcbff94c";
-  "20.03".eu-north-1.hvm-ebs = "ami-02699abfacbb6464b";
-  "20.03".us-east-1.hvm-ebs = "ami-0c5e7760748b74e85";
-  "20.03".us-east-2.hvm-ebs = "ami-030296bb256764655";
-  "20.03".us-west-1.hvm-ebs = "ami-050be818e0266b741";
-  "20.03".us-west-2.hvm-ebs = "ami-06562f78dca68eda2";
-  "20.03".ca-central-1.hvm-ebs = "ami-02365684a173255c7";
-  "20.03".ap-southeast-1.hvm-ebs = "ami-0dbf353e168d155f7";
-  "20.03".ap-southeast-2.hvm-ebs = "ami-04c0f3a75f63daddd";
-  "20.03".ap-northeast-1.hvm-ebs = "ami-093d9cc49c191eb6c";
-  "20.03".ap-northeast-2.hvm-ebs = "ami-0087df91a7b6ebd45";
-  "20.03".ap-south-1.hvm-ebs = "ami-0a1a6b569af04af9d";
-  "20.03".ap-east-1.hvm-ebs = "ami-0d18fdd309cdefa86";
-  "20.03".sa-east-1.hvm-ebs = "ami-09859378158ae971d";
-
-  # 20.09.2016.19db3e5ea27
-  "20.09".eu-west-1.hvm-ebs = "ami-0057cb7d614329fa2";
-  "20.09".eu-west-2.hvm-ebs = "ami-0d46f16e0bb0ec8fd";
-  "20.09".eu-west-3.hvm-ebs = "ami-0e8985c3ea42f87fe";
-  "20.09".eu-central-1.hvm-ebs = "ami-0eed77c38432886d2";
-  "20.09".eu-north-1.hvm-ebs = "ami-0be5bcadd632bea14";
-  "20.09".us-east-1.hvm-ebs = "ami-0a2cce52b42daccc8";
-  "20.09".us-east-2.hvm-ebs = "ami-09378bf487b07a4d8";
-  "20.09".us-west-1.hvm-ebs = "ami-09b4337b2a9e77485";
-  "20.09".us-west-2.hvm-ebs = "ami-081d3bb5fbee0a1ac";
-  "20.09".ca-central-1.hvm-ebs = "ami-020c24c6c607e7ac7";
-  "20.09".ap-southeast-1.hvm-ebs = "ami-08f648d5db009e67d";
-  "20.09".ap-southeast-2.hvm-ebs = "ami-0be390efaccbd40f9";
-  "20.09".ap-northeast-1.hvm-ebs = "ami-0c3311601cbe8f927";
-  "20.09".ap-northeast-2.hvm-ebs = "ami-0020146701f4d56cf";
-  "20.09".ap-south-1.hvm-ebs = "ami-0117e2bd876bb40d1";
-  "20.09".ap-east-1.hvm-ebs = "ami-0c42f97e5b1fda92f";
-  "20.09".sa-east-1.hvm-ebs = "ami-021637976b094959d";
-
-  # 21.05.740.aa576357673
-  "21.05".eu-west-1.hvm-ebs = "ami-048dbc738074a3083";
-  "21.05".eu-west-2.hvm-ebs = "ami-0234cf81fec68315d";
-  "21.05".eu-west-3.hvm-ebs = "ami-020e459baf709107d";
-  "21.05".eu-central-1.hvm-ebs = "ami-0857d5d1309ab8b77";
-  "21.05".eu-north-1.hvm-ebs = "ami-05403e3ae53d3716f";
-  "21.05".us-east-1.hvm-ebs = "ami-0d3002ba40b5b9897";
-  "21.05".us-east-2.hvm-ebs = "ami-069a0ca1bde6dea52";
-  "21.05".us-west-1.hvm-ebs = "ami-0b415460a84bcf9bc";
-  "21.05".us-west-2.hvm-ebs = "ami-093cba49754abd7f8";
-  "21.05".ca-central-1.hvm-ebs = "ami-065c13e1d52d60b33";
-  "21.05".ap-southeast-1.hvm-ebs = "ami-04f570c70ff9b665e";
-  "21.05".ap-southeast-2.hvm-ebs = "ami-02a3d1df595df5ef6";
-  "21.05".ap-northeast-1.hvm-ebs = "ami-027836fddb5c56012";
-  "21.05".ap-northeast-2.hvm-ebs = "ami-0edacd41dc7700c39";
-  "21.05".ap-south-1.hvm-ebs = "ami-0b279b5bb55288059";
-  "21.05".ap-east-1.hvm-ebs = "ami-06dc98082bc55c1fc";
-  "21.05".sa-east-1.hvm-ebs = "ami-04737dd49b98936c6";
-
-  latest = self."21.05";
-}; in self
+# Compatibility shim
+let
+  lib = import ../../../lib;
+  inherit (lib) mapAttrs;
+  everything = import ./amazon-ec2-amis.nix;
+  doAllVersions = mapAttrs (versionName: doRegion);
+  doRegion = mapAttrs (regionName: systems: systems.x86_64-linux);
+in
+  doAllVersions everything