diff --git a/conductor/cloud_formation.py b/conductor/cloud_formation.py
index 7a47e56..235fbf7 100644
--- a/conductor/cloud_formation.py
+++ b/conductor/cloud_formation.py
@@ -73,6 +73,9 @@ def prepare_user_data(context, hostname, service, unit,
                 base64.b64encode(template_data))
 
             init_script = init_script.replace('%INTERNAL_HOSTNAME%', hostname)
+            init_script = init_script.replace(
+                '%MURANO_SERVER_ADDRESS%',
+                config.CONF.file_server or settings.host)
 
             return init_script
 
diff --git a/conductor/config.py b/conductor/config.py
index bb804da..192387e 100644
--- a/conductor/config.py
+++ b/conductor/config.py
@@ -50,7 +50,7 @@ CONF = cfg.CONF
 CONF.register_opts(paste_deploy_opts, group='paste_deploy')
 CONF.register_opts(rabbit_opts, group='rabbitmq')
 CONF.register_opts(heat_opts, group='heat')
-
+CONF.register_opt(cfg.StrOpt('file_server'))
 
 CONF.import_opt('verbose', 'conductor.openstack.common.log')
 CONF.import_opt('debug', 'conductor.openstack.common.log')
diff --git a/data/templates/agent/DeployWebApp.template b/data/templates/agent/DeployWebApp.template
index bad0a6d..4fbc959 100644
--- a/data/templates/agent/DeployWebApp.template
+++ b/data/templates/agent/DeployWebApp.template
@@ -6,7 +6,7 @@
     {
       "Name": "Deploy-WebApp",
       "Arguments": {
-        "URL": "git://github.com/Mirantis/murano-mvc-demo.git"
+        "URL": "$repository"
       }
     }
   ],
diff --git a/data/workflows/DeployWebApp.xml b/data/workflows/AspNet.xml
similarity index 69%
rename from data/workflows/DeployWebApp.xml
rename to data/workflows/AspNet.xml
index 329cabf..3b90471 100644
--- a/data/workflows/DeployWebApp.xml
+++ b/data/workflows/AspNet.xml
@@ -1,11 +1,11 @@
 <workflow>
-	<rule match="$.services.webServers[?(@.domain)].units[*]">
+	<rule match="$.services.aspNetApps[?(@.domain)].units[*]">
 		<set path="domain">
 			<select path="::domain"/>
 		</set>
 	</rule>
 
-	<rule match="$.services.webServers[*].units[?(@.state.hostname and not @.state.instanceName)]">
+	<rule match="$.services.aspNetApps[*].units[?(@.state.hostname and not @.state.instanceName)]">
 		<report entity="unit">
 			<parameter name="id"><select path="id"/></parameter>
 			<parameter name="text">Creating instance <select path="name"/></parameter>
@@ -41,7 +41,30 @@
 		</update-cf-stack>
 	</rule>
 
-	<rule match="$.services.webServers[*].units[?(@.state.instanceName and not @.state.iisInstalled)]">
+	<rule match="$.services.aspNetApps[?(@.adminPassword and @.adminPassword != @.state.adminPassword)].units[?(@.state.instanceName)]">
+		<send-command template="SetPassword">
+			<parameter name="host">
+				<select path="name"/>
+			</parameter>
+			<parameter name="service">
+				<select path="::id"/>
+			</parameter>
+			<parameter name="mappings">
+				<map>
+					<mapping name="adminPassword">
+						<select path="::adminPassword"/>
+					</mapping>
+				</map>
+			</parameter>
+			<success>
+				<set path="::state.adminPassword">
+					<select path="::adminPassword"/>
+				</set>
+			</success>
+		</send-command>
+	</rule>
+
+	<rule match="$.services.aspNetApps[*].units[?(@.state.instanceName and not @.state.iisInstalled)]">
 		<report entity="unit">
 			<parameter name="id"><select path="id"/></parameter>
 			<parameter name="text">Creating IIS Web Server on unit <select path="name"/></parameter>
@@ -63,7 +86,7 @@
 		</send-command>
 	</rule>
 
-	<rule match="$.services.webServers[*].units[?(@.state.instanceName and @.state.iisInstalled)]">
+	<rule match="$.services.aspNetApps[*].units[?(@.state.iisInstalled and not @.state.webAppDeployed)]">
 		<report entity="unit">
 			<parameter name="id"><select path="id"/></parameter>
 			<parameter name="text">Deploying Web App on unit <select path="name"/></parameter>
@@ -75,8 +98,15 @@
 			<parameter name="service">
 				<select path="::id"/>
 			</parameter>
+            <parameter name="mappings">
+				<map>
+					<mapping name="repository">
+						<select path="::repository"/>
+					</mapping>
+				</map>
+			</parameter>
 			<success>
-				<set path="state.WebAppDeployed"><true/></set>
+				<set path="state.webAppDeployed"><true/></set>
 				<report entity="unit">
 					<parameter name="id"><select path="id"/></parameter>
 					<parameter name="text">WebApp <select path="name"/> has been deployed.</parameter>
@@ -84,4 +114,5 @@
 			</success>
 		</send-command>
 	</rule>
+
 </workflow>
\ No newline at end of file
diff --git a/data/workflows/IIS.xml b/data/workflows/IIS.xml
index 493b8ae..433562e 100644
--- a/data/workflows/IIS.xml
+++ b/data/workflows/IIS.xml
@@ -41,6 +41,30 @@
 		</update-cf-stack>
 	</rule>
 
+	<rule match="$.services.webServers[?(@.adminPassword and @.adminPassword != @.state.adminPassword)].units[?(@.state.instanceName)]">
+		<send-command template="SetPassword">
+			<parameter name="host">
+				<select path="name"/>
+			</parameter>
+			<parameter name="service">
+				<select path="::id"/>
+			</parameter>
+			<parameter name="mappings">
+				<map>
+					<mapping name="adminPassword">
+						<select path="::adminPassword"/>
+					</mapping>
+				</map>
+			</parameter>
+			<success>
+				<set path="::state.adminPassword">
+					<select path="::adminPassword"/>
+				</set>
+			</success>
+		</send-command>
+	</rule>
+
+
 	<rule match="$.services.webServers[*].units[?(@.state.instanceName and not @.state.iisInstalled)]">
 		<report entity="unit">
 			<parameter name="id"><select path="id"/></parameter>