diff --git a/templates/getting_started.template b/templates/getting_started.template
index 4fd4b7ac21..dfd270eae8 100644
--- a/templates/getting_started.template
+++ b/templates/getting_started.template
@@ -1,4 +1,5 @@
 {
+  "AWSTemplateFormatVersion" : "2010-09-09",
   "Parameters" : {
     "KeyName" : {
       "Description" : "Name of an existing EC2 KeyPair to enable SSH access to the instance",
@@ -6,35 +7,24 @@
     }
   },
 
-  "Mappings" : {
-    "RegionMap" : {
-      "us-east-1" : {
-          "AMI" : "ami-76f0061f"
-      },
-      "us-west-1" : {
-          "AMI" : "ami-655a0a20"
-      },
-      "eu-west-1" : {
-          "AMI" : "ami-7fd4e10b"
-      },
-      "ap-southeast-1" : {
-          "AMI" : "ami-72621c20"
-      },
-      "ap-northeast-1" : {
-          "AMI" : "ami-8e08a38f"
-      }
-    }
-  },
-
   "Resources" : {
-    "Ec2Instance" : {
+    "MyInstance" : {
       "Type" : "AWS::EC2::Instance",
       "Properties" : {
         "KeyName" : { "Ref" : "KeyName" },
-        "ImageId" : { "Fn::FindInMap" : [ "RegionMap", { "Ref" : "AWS::Region" }, "AMI" ]},
+        "ImageId" : "F16-x86_64-cfntools",
+	"InstanceType": "m1.large",
         "UserData" : { "Fn::Base64" : "80" }
       }
     }
+  },
+  "Outputs" : {
+    "InstanceIp" : {
+      "Value" : { "Fn::Join" : ["", ["ssh ec2-user@",
+                                     {"Fn::GetAtt": ["MyInstance",
+				                     "PublicIp"]}]]},
+      "Description" : "My ssh command"
+    }
   }
 }