diff --git a/data/templates/cf/SQL-security.template b/data/templates/cf/SQL-security.template
index 2cc2a52..aee056d 100644
--- a/data/templates/cf/SQL-security.template
+++ b/data/templates/cf/SQL-security.template
@@ -1,6 +1,6 @@
 {
     "Resources": {
-        "$instanceName": {
+        "$instancePort": {
             "Properties": {
                 "SecurityGroups" : [ {"Ref" : "MsSqlSecurityGroup"} ]
             }
@@ -10,27 +10,27 @@
             "Properties": {
                 "SecurityGroupIngress": [
                     {
-                        "ToPort": 4022,
+                        "ToPort": "4022",
                         "IpProtocol": "tcp",
-                        "FromPort": 4022,
+                        "FromPort": "4022",
                         "CidrIp": "0.0.0.0/0"
                     },
                     {
-                        "ToPort": 135,
+                        "ToPort": "135",
                         "IpProtocol": "tcp",
-                        "FromPort": 135,
+                        "FromPort": "135",
                         "CidrIp": "0.0.0.0/0"
                     },
                     {
-                        "ToPort": 1433,
+                        "ToPort": "1433",
                         "IpProtocol": "tcp",
-                        "FromPort": 1433,
+                        "FromPort": "1433",
                         "CidrIp": "0.0.0.0/0"
                     },
                     {
-                        "ToPort": 1434,
+                        "ToPort": "1434",
                         "IpProtocol": "tcp",
-                        "FromPort": 1434,
+                        "FromPort": "1434",
                         "CidrIp": "0.0.0.0/0"
                     }
                 ],
diff --git a/data/templates/cf/SQLCluster.template b/data/templates/cf/SQLCluster.template
index 5a24a63..3103ee4 100644
--- a/data/templates/cf/SQLCluster.template
+++ b/data/templates/cf/SQLCluster.template
@@ -1,20 +1,16 @@
 {
     "Resources": {
-        "$instanceName": {
-            "Properties": {
-                "SecurityGroups": [
-                    {
-                        "Ref": "MsSqlSecurityGroup"
-                    }
-                ]
-            }
-        },
         "$instancePort": {
             "Properties": {
                 "allowed_address_pairs": [
                     {
                         "ip_address": "$clusterIp"
                     }
+                ],
+                "SecurityGroups": [
+                    {
+                        "Ref": "MsSqlSecurityGroup"
+                    }
                 ]
             }
         },
@@ -23,27 +19,27 @@
             "Properties": {
                 "SecurityGroupIngress": [
                     {
-                        "ToPort": 4022,
+                        "ToPort": "4022",
                         "IpProtocol": "tcp",
-                        "FromPort": 4022,
+                        "FromPort": "4022",
                         "CidrIp": "0.0.0.0/0"
                     },
                     {
-                        "ToPort": 135,
+                        "ToPort": "135",
                         "IpProtocol": "tcp",
-                        "FromPort": 135,
+                        "FromPort": "135",
                         "CidrIp": "0.0.0.0/0"
                     },
                     {
-                        "ToPort": 1433,
+                        "ToPort": "1433",
                         "IpProtocol": "tcp",
-                        "FromPort": 1433,
+                        "FromPort": "1433",
                         "CidrIp": "0.0.0.0/0"
                     },
                     {
-                        "ToPort": 1434,
+                        "ToPort": "1434",
                         "IpProtocol": "tcp",
-                        "FromPort": 1434,
+                        "FromPort": "1434",
                         "CidrIp": "0.0.0.0/0"
                     }
                 ],
diff --git a/data/templates/cf/Windows.template b/data/templates/cf/Windows.template
index 257827c..8b6b01a 100644
--- a/data/templates/cf/Windows.template
+++ b/data/templates/cf/Windows.template
@@ -17,11 +17,6 @@
                 "ImageId": "$imageName",
                 "AvailabilityZone": "$availabilityZone",
                 "UserData": "$userData",
-                "SecurityGroups": [
-                    {
-                        "Ref": "MuranoDefaultSecurityGroup"
-                    }
-                ],
                 "NetworkInterfaces": [
                     {
                         "Ref": "$instancePort"
@@ -32,6 +27,11 @@
         "$instancePort": {
             "Type": "OS::Neutron::Port",
             "Properties": {
+                "security_groups": [
+                    {
+                        "Ref": "MuranoDefaultSecurityGroup"
+                    }
+                ],
                 "network_id": {
                     "Ref": "network"
                 },
@@ -49,21 +49,21 @@
             "Properties": {
                 "SecurityGroupIngress": [
                     {
-                        "ToPort": 3389,
+                        "ToPort": "3389",
                         "IpProtocol": "tcp",
-                        "FromPort": 3389,
+                        "FromPort": "3389",
                         "CidrIp": "0.0.0.0/0"
                     },
                     {
-                        "ToPort": 22,
+                        "ToPort": "22",
                         "IpProtocol": "tcp",
-                        "FromPort": 22,
+                        "FromPort": "22",
                         "CidrIp": "0.0.0.0/0"
                     },
                     {
-                        "ToPort": -1,
+                        "ToPort": "-1",
                         "IpProtocol": "icmp",
-                        "FromPort": -1,
+                        "FromPort": "-1",
                         "CidrIp": "0.0.0.0/0"
                     }
                 ],
diff --git a/data/workflows/MsSqlCluster.xml b/data/workflows/MsSqlCluster.xml
index 3820e4b..e19df5d 100644
--- a/data/workflows/MsSqlCluster.xml
+++ b/data/workflows/MsSqlCluster.xml
@@ -55,7 +55,6 @@
 		<update-cf-stack template="SQLCluster" error="exception">
 			<parameter name="mappings">
 				<map>
-					<mapping name="instanceName"><select path="state.hostname"/></mapping>
 					<mapping name="instancePort">port-<select path="state.hostname"/></mapping>
 					<mapping name="clusterIp"><select path="::clusterIp"/></mapping>
 				</map>
diff --git a/data/workflows/MsSqlServer.xml b/data/workflows/MsSqlServer.xml
index 18f9f18..92ee5df 100644
--- a/data/workflows/MsSqlServer.xml
+++ b/data/workflows/MsSqlServer.xml
@@ -54,7 +54,7 @@
 		<update-cf-stack template="SQL-security" error="exception">
 			<parameter name="mappings">
 				<map>
-					<mapping name="instanceName"><select path="state.hostname"/></mapping>
+					<mapping name="instancePort">port-<select path="state.hostname"/></mapping>
 				</map>
 			</parameter>
 			<success>