diff --git a/modules/misc/deployment.nix b/modules/misc/deployment.nix
index 81988e964681..146baec16dd2 100644
--- a/modules/misc/deployment.nix
+++ b/modules/misc/deployment.nix
@@ -186,11 +186,13 @@ let cfg = config.deployment; in
     deployment.ec2 = mkIf (cfg.ec2.region != "") {
     
       controller = mkDefault "https://ec2.${cfg.ec2.region}.amazonaws.com/";
-      
+
+      # The list below is generated by running the "create-amis.sh" script, then doing:
+      # $ while read system region ami; do echo "        if cfg.ec2.region == \"$region\" && config.nixpkgs.system == \"$system\" then \"$ami\" else"; done < amis
       ami = mkDefault (
-        if cfg.ec2.region == "eu-west-1" && config.nixpkgs.system == "i686-linux" then "ami-c9f2d8bd" else
-        if cfg.ec2.region == "eu-west-1" && config.nixpkgs.system == "x86_64-linux" then "ami-c34c71b7" else
-        if cfg.ec2.region == "us-east-1" && config.nixpkgs.system == "x86_64-linux" then "ami-d93bf4b0" else
+        if cfg.ec2.region == "eu-west-1" && config.nixpkgs.system == "x86_64-linux" then "ami-65dae711" else
+        if cfg.ec2.region == "us-east-1" && config.nixpkgs.system == "x86_64-linux" then "ami-95bb72fc" else
+        if cfg.ec2.region == "us-west-1" && config.nixpkgs.system == "x86_64-linux" then "ami-0b0c534e" else
         # !!! Doesn't work, not lazy enough.
         # throw "I don't know an AMI for region ‘${cfg.ec2.region}’ and platform type ‘${config.nixpkgs.system}’"
         "");