diff --git a/templates/HAProxy_Single_Instance.template b/templates/HAProxy_Single_Instance.template
index 26143a25d5..8b69eeb8e6 100644
--- a/templates/HAProxy_Single_Instance.template
+++ b/templates/HAProxy_Single_Instance.template
@@ -102,7 +102,13 @@
         }
       },
       "Properties": {
-        "ImageId": "F16-x86_64-cfntools",
+        "ImageId" : {
+          "Fn::FindInMap" : [ "DistroArch2AMI",
+                              { "Ref" : "LinuxDistribution" },
+                              { "Fn::FindInMap" : [ "AWSInstanceType2Arch",
+                                                    { "Ref" : "InstanceType" },
+                                                    "Arch" ] } ]
+        },
         "InstanceType": { "Ref": "InstanceType" },
         "KeyName": { "Ref": "KeyName" },
         "UserData": { "Fn::Base64": { "Fn::Join": ["", [