diff --git a/templates/WordPress_Single_Instance.template b/templates/WordPress_Single_Instance.template
index 9a67ebaf11..0da4dfb6aa 100644
--- a/templates/WordPress_Single_Instance.template
+++ b/templates/WordPress_Single_Instance.template
@@ -59,6 +59,12 @@
       "MaxLength": "41",
       "AllowedPattern" : "[a-zA-Z0-9]*",
       "ConstraintDescription" : "must contain only alphanumeric characters."
+    },
+    "LinuxDistribution": {
+      "Default": "F17",
+      "Description" : "Distribution of choice",
+      "Type": "String",
+      "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
     }
   },
 
@@ -75,14 +81,13 @@
       "c1.xlarge"   : { "Arch" : "64" },
       "cc1.4xlarge" : { "Arch" : "64" }
     },
-    "AWSRegionArch2AMI" : {
-      "us-east-1"      : { "32" : "ami-7f418316", "64" : "ami-7341831a" },
-      "us-west-1"      : { "32" : "ami-951945d0", "64" : "ami-971945d2" },
-      "us-west-2"      : { "32" : "ami-16fd7026", "64" : "ami-10fd7020" },
-      "eu-west-1"      : { "32" : "ami-24506250", "64" : "ami-20506254" },
-      "sa-east-1"      : { "32" : "ami-3e3be423", "64" : "ami-3c3be421" },
-      "ap-southeast-1" : { "32" : "ami-74dda626", "64" : "ami-7edda62c" },
-      "ap-northeast-1" : { "32" : "ami-dcfa4edd", "64" : "ami-e8fa4ee9" }
+    "DistroArch2AMI": {
+      "F16"      : { "32" : "F16", "64" : "F16-x86_64" },
+      "F17"      : { "32" : "F17", "64" : "F17-x86_64" },
+      "U10"      : { "32" : "U10", "64" : "U10-x86_64" },
+      "RHEL-6.1" : { "32" : "rhel61", "64" : "rhel61-x86_64" },
+      "RHEL-6.2" : { "32" : "rhel62", "64" : "rhel62-x86_64" },
+      "RHEL-6.3" : { "32" : "rhel63", "64" : "rhel63-x86_64" }
     }
   },
 
@@ -111,7 +116,7 @@
         }
       },
       "Properties": {
-        "ImageId" : { "Fn::FindInMap" : [ "AWSRegionArch2AMI", { "Ref" : "AWS::Region" },
+        "ImageId" : { "Fn::FindInMap" : [ "DistroArch2AMI", { "Ref" : "LinuxDistribution" },
                           { "Fn::FindInMap" : [ "AWSInstanceType2Arch", { "Ref" : "InstanceType" }, "Arch" ] } ] },
         "InstanceType"   : { "Ref" : "InstanceType" },
         "KeyName"        : { "Ref" : "KeyName" },