diff --git a/muranorepository/Services/agent_templates/SqlServerCluster/ConfigureEnvironmentForAOAG.template b/muranorepository/Services/agent_templates/ConfigureEnvironmentForAOAG.template
similarity index 100%
rename from muranorepository/Services/agent_templates/SqlServerCluster/ConfigureEnvironmentForAOAG.template
rename to muranorepository/Services/agent_templates/ConfigureEnvironmentForAOAG.template
diff --git a/muranorepository/Services/agent_templates/SqlServerCluster/FailoverCluster.template b/muranorepository/Services/agent_templates/FailoverCluster.template
similarity index 100%
rename from muranorepository/Services/agent_templates/SqlServerCluster/FailoverCluster.template
rename to muranorepository/Services/agent_templates/FailoverCluster.template
diff --git a/muranorepository/Services/agent_templates/SqlServerCluster/FailoverClusterPrerequisites.template b/muranorepository/Services/agent_templates/FailoverClusterPrerequisites.template
similarity index 100%
rename from muranorepository/Services/agent_templates/SqlServerCluster/FailoverClusterPrerequisites.template
rename to muranorepository/Services/agent_templates/FailoverClusterPrerequisites.template
diff --git a/muranorepository/Services/agent_templates/SqlServerCluster/InitializeAOAGPrimaryReplica.template b/muranorepository/Services/agent_templates/InitializeAOAGPrimaryReplica.template
similarity index 100%
rename from muranorepository/Services/agent_templates/SqlServerCluster/InitializeAOAGPrimaryReplica.template
rename to muranorepository/Services/agent_templates/InitializeAOAGPrimaryReplica.template
diff --git a/muranorepository/Services/agent_templates/SqlServerCluster/InitializeAOAGSecondaryReplica.template b/muranorepository/Services/agent_templates/InitializeAOAGSecondaryReplica.template
similarity index 100%
rename from muranorepository/Services/agent_templates/SqlServerCluster/InitializeAOAGSecondaryReplica.template
rename to muranorepository/Services/agent_templates/InitializeAOAGSecondaryReplica.template
diff --git a/muranorepository/Services/agent_templates/SqlServerCluster/InitializeAlwaysOn.template b/muranorepository/Services/agent_templates/InitializeAlwaysOn.template
similarity index 100%
rename from muranorepository/Services/agent_templates/SqlServerCluster/InitializeAlwaysOn.template
rename to muranorepository/Services/agent_templates/InitializeAlwaysOn.template
diff --git a/muranorepository/Services/agent_templates/SqlServerCluster/InstallSqlServerForAOAG.template b/muranorepository/Services/agent_templates/InstallSqlServerForAOAG.template
similarity index 100%
rename from muranorepository/Services/agent_templates/SqlServerCluster/InstallSqlServerForAOAG.template
rename to muranorepository/Services/agent_templates/InstallSqlServerForAOAG.template
diff --git a/muranorepository/Services/heat_templates/WindowsSecurity.template b/muranorepository/Services/heat_templates/WindowsSecurity.template
index a8d4c5c..00f1055 100644
--- a/muranorepository/Services/heat_templates/WindowsSecurity.template
+++ b/muranorepository/Services/heat_templates/WindowsSecurity.template
@@ -9,6 +9,18 @@
                         "IpProtocol": "tcp",
                         "FromPort": "3389",
                         "CidrIp": "0.0.0.0/0"
+                    },
+                    {
+                        "ToPort": "5985",
+                        "IpProtocol": "tcp",
+                        "FromPort": "5985",
+                        "CidrIp": "$cidr"
+                    },
+                    {
+                        "ToPort": "5986",
+                        "IpProtocol": "tcp",
+                        "FromPort": "5986",
+                        "CidrIp": "$cidr"
                     }
                 ]
             }
diff --git a/muranorepository/Services/msSqlClusterServer-manifest.yaml b/muranorepository/Services/msSqlClusterServer-manifest.yaml
index 41547f6..62fb4be 100644
--- a/muranorepository/Services/msSqlClusterServer-manifest.yaml
+++ b/muranorepository/Services/msSqlClusterServer-manifest.yaml
@@ -35,13 +35,13 @@ heat:
 
 agent:
   - SetPassword.template
-  - SqlServerCluster/FailoverClusterPrerequisites.template
-  - SqlServerCluster/FailoverCluster.template
-  - SqlServerCluster/ConfigureEnvironmentForAOAG.template
-  - SqlServerCluster/InstallSqlServerForAOAG.template
-  - SqlServerCluster/InitializeAlwaysOn.template
-  - SqlServerCluster/InitializeAOAGPrimaryReplica.template
-  - SqlServerCluster/InitializeAOAGSecondaryReplica.template
+  - FailoverClusterPrerequisites.template
+  - FailoverCluster.template
+  - ConfigureEnvironmentForAOAG.template
+  - InstallSqlServerForAOAG.template
+  - InitializeAlwaysOn.template
+  - InitializeAOAGPrimaryReplica.template
+  - InitializeAOAGSecondaryReplica.template
 
 
 scripts:
diff --git a/muranorepository/Services/workflows/MsSqlCluster.xml b/muranorepository/Services/workflows/MsSqlCluster.xml
index 2e3b86b..bdd52f3 100644
--- a/muranorepository/Services/workflows/MsSqlCluster.xml
+++ b/muranorepository/Services/workflows/MsSqlCluster.xml
@@ -128,7 +128,7 @@
 
 	<rule match="$.services[?(@.type == 'msSqlClusterServer')].units[?(@.state.domain and not @.state.failoverClusterPrerequisitesInstalled)]"
             desc="Units of SQL Server Cluster services that are already joined AD domain">
-		<send-command template="SqlServerCluster/FailoverClusterPrerequisites" error="exception">
+		<send-command template="FailoverClusterPrerequisites" error="exception">
 			<parameter name="unit">
 				<select path="id"/>
 			</parameter>
@@ -167,7 +167,7 @@
 
 	<rule match="$.services[?(@.type == 'msSqlClusterServer' and not @.state.failoverClusterCreated)].units[?(@.state.failoverClusterPrerequisitesInstalled)]" limit="1"
             desc="First unit of SQL Server Cluster services that is already has failover cluster prerequisites installed">
-		<send-command template="SqlServerCluster/FailoverCluster" error="exception">
+		<send-command template="FailoverCluster" error="exception">
 			<parameter name="unit">
 				<select path="id"/>
 			</parameter>
@@ -218,7 +218,7 @@
 
 	<rule match="$.services[?(@.type == 'msSqlClusterServer' and @.state.failoverClusterCreated and not @.state.agEnvironmentConfigured)].units[*]"
             desc="First unit of SQL Server Cluster services that is already has failover cluster created">
-		<send-command template="SqlServerCluster/ConfigureEnvironmentForAOAG" error="exception">
+		<send-command template="ConfigureEnvironmentForAOAG" error="exception">
 			<parameter name="unit">
 				<select path="id"/>
 			</parameter>
@@ -251,7 +251,7 @@
 
 	<rule match="$.services[?(@.type == 'msSqlClusterServer' and @.state.agEnvironmentConfigured)].units[?(@.state.failoverClusterPrerequisitesInstalled and not @.state.sqlServerInstalled)]"
             desc="All units of SQL Server Cluster services that is already has environment configured">
-		<send-command template="SqlServerCluster/InstallSqlServerForAOAG" error="exception">
+		<send-command template="InstallSqlServerForAOAG" error="exception">
 			<parameter name="unit">
 				<select path="id"/>
 			</parameter>
@@ -296,7 +296,7 @@
 
 	<rule match="$.services[?(@.type == 'msSqlClusterServer')].units[?(@.state.sqlServerInstalled and not @.state.alwaysOnInitialized)]"
             desc="All units of SQL Server Cluster services that has SQL Server installed">
-		<send-command template="SqlServerCluster/InitializeAlwaysOn" error="exception">
+		<send-command template="InitializeAlwaysOn" error="exception">
 			<parameter name="unit">
 				<select path="id"/>
 			</parameter>
@@ -341,7 +341,7 @@
 
 	<rule match="$.services[?(@.type == 'msSqlClusterServer')].units[?(@.state.alwaysOnInitialized and not @.state.primaryReplicaInitialized)]"
             desc="All units of SQL Server Cluster services that has AlwaysOn initialized">
-		<send-command template="SqlServerCluster/InitializeAOAGPrimaryReplica" error="exception">
+		<send-command template="InitializeAOAGPrimaryReplica" error="exception">
 			<parameter name="unit">
 				<select path="id"/>
 			</parameter>
@@ -401,7 +401,7 @@
 
 	<rule match="$.services[?(@.type == 'msSqlClusterServer')].units[?(@.state.primaryReplicaInitialized and not @.state.secondaryReplicaInitialized)]"
             desc="All units of SQL Server Cluster services that has primary replica initialized">
-		<send-command template="SqlServerCluster/InitializeAOAGSecondaryReplica" error="exception">
+		<send-command template="InitializeAOAGSecondaryReplica" error="exception">
 			<parameter name="unit">
 				<select path="id"/>
 			</parameter>