diff --git a/heat/tests/test_api_cfn_v1.py b/heat/tests/test_api_cfn_v1.py
index 1ff2c0e23e..7b66e9a7c8 100644
--- a/heat/tests/test_api_cfn_v1.py
+++ b/heat/tests/test_api_cfn_v1.py
@@ -172,7 +172,7 @@ class StackControllerTest(unittest.TestCase):
             u'updated_time': u'2012-07-09T09:13:11Z',
             u'parameters':{
             u'DBUsername': u'admin',
-            u'LinuxDistribution': u'F16',
+            u'LinuxDistribution': u'F17',
             u'InstanceType': u'm1.large',
             u'DBRootPassword': u'admin',
             u'DBPassword': u'admin',
@@ -213,7 +213,7 @@ class StackControllerTest(unittest.TestCase):
                 'Parameters':
                     [{'ParameterValue': u'admin',
                     'ParameterKey': u'DBUsername'},
-                    {'ParameterValue': u'F16',
+                    {'ParameterValue': u'F17',
                     'ParameterKey': u'LinuxDistribution'},
                     {'ParameterValue': u'm1.large',
                     'ParameterKey': u'InstanceType'},
@@ -258,7 +258,7 @@ class StackControllerTest(unittest.TestCase):
             u'updated_time': u'2012-07-09T09:13:11Z',
             u'parameters':{
             u'DBUsername': u'admin',
-            u'LinuxDistribution': u'F16',
+            u'LinuxDistribution': u'F17',
             u'InstanceType': u'm1.large',
             u'DBRootPassword': u'admin',
             u'DBPassword': u'admin',
@@ -296,7 +296,7 @@ class StackControllerTest(unittest.TestCase):
                 'Parameters':
                     [{'ParameterValue': u'admin',
                     'ParameterKey': u'DBUsername'},
-                    {'ParameterValue': u'F16',
+                    {'ParameterValue': u'F17',
                     'ParameterKey': u'LinuxDistribution'},
                     {'ParameterValue': u'm1.large',
                     'ParameterKey': u'InstanceType'},
diff --git a/heat/tests/test_engine_manager.py b/heat/tests/test_engine_manager.py
index ed63790685..75564ab0b2 100644
--- a/heat/tests/test_engine_manager.py
+++ b/heat/tests/test_engine_manager.py
@@ -403,7 +403,7 @@ class stackManagerTest(unittest.TestCase):
             user_data = ev['resource_properties']['UserData']
             self.assertNotEqual(user_data.find('wordpress'), -1)
             self.assertEqual(ev['resource_properties']['ImageId'],
-                             'F16-x86_64-gold')
+                             'F17-x86_64-gold')
             self.assertEqual(ev['resource_properties']['InstanceType'],
                              'm1.large')
 
diff --git a/heat/tests/v1_1/fakes.py b/heat/tests/v1_1/fakes.py
index 8e222ca3e5..55013ef7a8 100644
--- a/heat/tests/v1_1/fakes.py
+++ b/heat/tests/v1_1/fakes.py
@@ -551,7 +551,7 @@ class FakeHTTPClient(base_client.HTTPClient):
         return (200, {'images': [
             {'id': 1, 'name': 'CentOS 5.2'},
             {'id': 2, 'name': 'My Server Backup'},
-            {'id': 3, 'name': 'F16-x86_64-gold'}
+            {'id': 3, 'name': 'F17-x86_64-gold'}
         ]})
 
     def get_images_detail(self, **kw):
@@ -579,7 +579,7 @@ class FakeHTTPClient(base_client.HTTPClient):
             },
             {
                 "id": 744,
-                "name": "F16-x86_64-gold",
+                "name": "F17-x86_64-gold",
                 "serverId": 9999,
                 "updated": "2010-10-10T12:00:00Z",
                 "created": "2010-08-10T12:00:00Z",
diff --git a/templates/MySQL_Single_Instance.template b/templates/MySQL_Single_Instance.template
index bf410abead..10d3d953db 100644
--- a/templates/MySQL_Single_Instance.template
+++ b/templates/MySQL_Single_Instance.template
@@ -59,7 +59,7 @@
       "Description" : "Distribution of choice",
       "Type": "String",
       "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ],
-      "Default": "F16"
+      "Default": "F17"
     }
   },
 
diff --git a/templates/PuppetMaster_Single_Instance.template b/templates/PuppetMaster_Single_Instance.template
index f52f659d9c..1d348c415d 100644
--- a/templates/PuppetMaster_Single_Instance.template
+++ b/templates/PuppetMaster_Single_Instance.template
@@ -26,7 +26,7 @@
       "Type" : "String"
     },
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F17",
       "Description" : "Distribution of choice",
       "Type": "String",
       "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
diff --git a/templates/WordPress_2_Instances.template b/templates/WordPress_2_Instances.template
index 5847a6448f..6ec34dcee8 100644
--- a/templates/WordPress_2_Instances.template
+++ b/templates/WordPress_2_Instances.template
@@ -61,7 +61,7 @@
       "ConstraintDescription" : "must contain only alphanumeric characters."
     },
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F17",
       "Description" : "Distribution of choice",
       "Type": "String",
       "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
diff --git a/templates/WordPress_2_Instances_With_EBS.template b/templates/WordPress_2_Instances_With_EBS.template
index ada10c0fc4..71d6e150b4 100644
--- a/templates/WordPress_2_Instances_With_EBS.template
+++ b/templates/WordPress_2_Instances_With_EBS.template
@@ -70,7 +70,7 @@
       "ConstraintDescription" : "must contain only alphanumeric characters."
     },
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F17",
       "Description" : "Distribution of choice",
       "Type": "String",
       "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
diff --git a/templates/WordPress_2_Instances_With_EBS_EIP.template b/templates/WordPress_2_Instances_With_EBS_EIP.template
index 78fdcfccbd..fb668888ed 100644
--- a/templates/WordPress_2_Instances_With_EBS_EIP.template
+++ b/templates/WordPress_2_Instances_With_EBS_EIP.template
@@ -70,7 +70,7 @@
       "ConstraintDescription" : "must contain only alphanumeric characters."
     },
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F17",
       "Description" : "Distribution of choice",
       "Type": "String",
       "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
diff --git a/templates/WordPress_And_Http.template b/templates/WordPress_And_Http.template
index 52f52b5147..77e853e4d4 100644
--- a/templates/WordPress_And_Http.template
+++ b/templates/WordPress_And_Http.template
@@ -58,7 +58,7 @@
     },
 
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F17",
       "Description": "Distribution of choice",
       "Type": "String",
       "AllowedValues": [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
diff --git a/templates/WordPress_Composed_Instances.template b/templates/WordPress_Composed_Instances.template
index 422ca5ec31..f7b28f5ef1 100644
--- a/templates/WordPress_Composed_Instances.template
+++ b/templates/WordPress_Composed_Instances.template
@@ -61,7 +61,7 @@
       "ConstraintDescription" : "must contain only alphanumeric characters."
     },
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F17",
       "Description" : "Distribution of choice",
       "Type": "String",
       "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
diff --git a/templates/WordPress_Single_Instance.template b/templates/WordPress_Single_Instance.template
index 642a5bd79d..c44377a763 100644
--- a/templates/WordPress_Single_Instance.template
+++ b/templates/WordPress_Single_Instance.template
@@ -61,7 +61,7 @@
       "ConstraintDescription" : "must contain only alphanumeric characters."
     },
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F17",
       "Description" : "Distribution of choice",
       "Type": "String",
       "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
diff --git a/templates/WordPress_Single_Instance_With_EBS.template b/templates/WordPress_Single_Instance_With_EBS.template
index e243ff9ab8..931d41e69f 100644
--- a/templates/WordPress_Single_Instance_With_EBS.template
+++ b/templates/WordPress_Single_Instance_With_EBS.template
@@ -70,7 +70,7 @@
       "ConstraintDescription" : "must contain only alphanumeric characters."
     },
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F17",
       "Description" : "Distribution of choice",
       "Type": "String",
       "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
diff --git a/templates/WordPress_Single_Instance_With_EBS_EIP.template b/templates/WordPress_Single_Instance_With_EBS_EIP.template
index 5651b0f2f2..549fafb222 100644
--- a/templates/WordPress_Single_Instance_With_EBS_EIP.template
+++ b/templates/WordPress_Single_Instance_With_EBS_EIP.template
@@ -70,7 +70,7 @@
       "ConstraintDescription" : "must contain only alphanumeric characters."
     },
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F17",
       "Description" : "Distribution of choice",
       "Type": "String",
       "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
diff --git a/templates/WordPress_Single_Instance_With_EIP.template b/templates/WordPress_Single_Instance_With_EIP.template
index c234f383f1..f65220dba0 100644
--- a/templates/WordPress_Single_Instance_With_EIP.template
+++ b/templates/WordPress_Single_Instance_With_EIP.template
@@ -61,7 +61,7 @@
       "ConstraintDescription" : "must contain only alphanumeric characters."
     },
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F17",
       "Description" : "Distribution of choice",
       "Type": "String",
       "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
diff --git a/templates/WordPress_Single_Instance_With_HA.template b/templates/WordPress_Single_Instance_With_HA.template
index 8c00624c58..a3c864ceb8 100644
--- a/templates/WordPress_Single_Instance_With_HA.template
+++ b/templates/WordPress_Single_Instance_With_HA.template
@@ -61,7 +61,7 @@
       "ConstraintDescription" : "must contain only alphanumeric characters."
     },
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F17",
       "Description" : "Distribution of choice",
       "Type": "String",
       "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
diff --git a/templates/WordPress_Single_Instance_With_IHA.template b/templates/WordPress_Single_Instance_With_IHA.template
index de61090cd7..1159c1a37a 100644
--- a/templates/WordPress_Single_Instance_With_IHA.template
+++ b/templates/WordPress_Single_Instance_With_IHA.template
@@ -61,7 +61,7 @@
       "ConstraintDescription" : "must contain only alphanumeric characters."
     },
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F17",
       "Description" : "Distribution of choice",
       "Type": "String",
       "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
diff --git a/templates/WordPress_Single_Instance_deb.template b/templates/WordPress_Single_Instance_deb.template
index 7dfa1a5942..1207d18358 100644
--- a/templates/WordPress_Single_Instance_deb.template
+++ b/templates/WordPress_Single_Instance_deb.template
@@ -61,7 +61,7 @@
       "ConstraintDescription" : "must contain only alphanumeric characters."
     },
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F17",
       "Description" : "Distribution of choice",
       "Type": "String",
       "AllowedValues" : "U10"
diff --git a/templates/WordPress_Single_Instance_gold.template b/templates/WordPress_Single_Instance_gold.template
index b3d06afecf..621e8a3311 100644
--- a/templates/WordPress_Single_Instance_gold.template
+++ b/templates/WordPress_Single_Instance_gold.template
@@ -61,7 +61,7 @@
       "ConstraintDescription" : "must contain only alphanumeric characters."
     },
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F17",
       "Description" : "Distribution of choice",
       "Type": "String",
       "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
diff --git a/templates/WordPress_With_LB.template b/templates/WordPress_With_LB.template
index a25353de42..abcab38132 100644
--- a/templates/WordPress_With_LB.template
+++ b/templates/WordPress_With_LB.template
@@ -61,7 +61,7 @@
       "ConstraintDescription": "must contain only alphanumeric characters."
     },
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F17",
       "Description": "Distribution of choice",
       "Type": "String",
       "AllowedValues": [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
diff --git a/templates/WordPress_With_RDS.template b/templates/WordPress_With_RDS.template
index 9a1b865fcb..bbf51357ea 100644
--- a/templates/WordPress_With_RDS.template
+++ b/templates/WordPress_With_RDS.template
@@ -79,7 +79,7 @@
     },
 
     "LinuxDistribution": {
-      "Default": "F16",
+      "Default": "F17",
       "Description" : "Distribution of choice",
       "Type": "String",
       "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]