diff --git a/cfn/F17/WordPress_Composed_Instances.template b/cfn/F17/WordPress_Composed_Instances.template
index 0d3140f9..bd22247b 100644
--- a/cfn/F17/WordPress_Composed_Instances.template
+++ b/cfn/F17/WordPress_Composed_Instances.template
@@ -90,7 +90,7 @@
     "DatabaseTemplate": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://raw.github.com/openstack/heat-templates/master/cfn/MySQL_Single_Instance.template",
+        "TemplateURL": "https://raw.github.com/openstack/heat-templates/master/cfn/F17/MySQL_Single_Instance.template",
         "Parameters": {
           "KeyName"           : { "Ref" : "KeyName" },
           "InstanceType"      : { "Ref" : "InstanceType" },
diff --git a/cfn/F17/WordPress_With_LB.template b/cfn/F17/WordPress_With_LB.template
index b24b47f3..33b4cbfc 100644
--- a/cfn/F17/WordPress_With_LB.template
+++ b/cfn/F17/WordPress_With_LB.template
@@ -90,7 +90,7 @@
     "DatabaseServer": {
       "Type": "AWS::CloudFormation::Stack",
       "Properties": {
-        "TemplateURL": "https://raw.github.com/openstack/heat-templates/master/cfn/MySQL_Single_Instance.template",
+        "TemplateURL": "https://raw.github.com/openstack/heat-templates/master/cfn/F17/MySQL_Single_Instance.template",
         "Parameters": {
           "KeyName"          : { "Ref": "KeyName" },
           "InstanceType"     : { "Ref": "InstanceType" },