diff --git a/muranorepository/Services/heat_templates/ApacheSecurity.template b/muranorepository/Services/heat_templates/ApacheSecurity.template
index 7a35b2d..f99eec3 100644
--- a/muranorepository/Services/heat_templates/ApacheSecurity.template
+++ b/muranorepository/Services/heat_templates/ApacheSecurity.template
@@ -1,6 +1,6 @@
 {
     "Resources": {
-        "$port-{instanceName}": {
+        "$instancePort": {
             "Properties": {
                 "security_groups" : [ {"Ref" : "ApacheSecurityGroup"} ]
             }
@@ -26,4 +26,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/muranorepository/Services/heat_templates/Linux.template b/muranorepository/Services/heat_templates/Linux.template
index f095e25..36d909c 100644
--- a/muranorepository/Services/heat_templates/Linux.template
+++ b/muranorepository/Services/heat_templates/Linux.template
@@ -21,7 +21,7 @@
                 "NetworkInterfaces": [ { "Ref": "$port-{instanceName}" } ]
             }
         },
-        "$port-{instanceName}": {
+        "$instancePort": {
             "Type": "OS::Quantum::Port",
             "Properties": {
                 "network_id": {