diff --git a/conductor/conductor/commands/cloud_formation.py b/conductor/conductor/commands/cloud_formation.py
index 62b81659..409c652c 100644
--- a/conductor/conductor/commands/cloud_formation.py
+++ b/conductor/conductor/commands/cloud_formation.py
@@ -77,8 +77,9 @@ class HeatExecutor(CommandBase):
         if not len(self._update_pending_list):
             return False
 
-        template = {}
-        arguments = {}
+        template, arguments = self._get_current_template()
+        stack_exists = (template != {})
+
         for t in self._update_pending_list:
             template = conductor.helpers.merge_dicts(
                 template, t['template'], max_levels=2)
@@ -89,7 +90,7 @@ class HeatExecutor(CommandBase):
             'Executing heat template {0} with arguments {1} on stack {2}'
             .format(anyjson.dumps(template), arguments, self._stack))
 
-        try:
+        if stack_exists:
             self._heat_client.stacks.update(
                 stack_id=self._stack,
                 parameters=arguments,
@@ -98,7 +99,7 @@ class HeatExecutor(CommandBase):
                 'Waiting for the stack {0} to be update'.format(self._stack))
             self._wait_state('UPDATE_COMPLETE')
             log.info('Stack {0} updated'.format(self._stack))
-        except heatclient.exc.HTTPNotFound:
+        else:
             self._heat_client.stacks.create(
                 stack_name=self._stack,
                 parameters=arguments,
@@ -138,6 +139,15 @@ class HeatExecutor(CommandBase):
             item['callback'](True)
         return True
 
+    def _get_current_template(self):
+        try:
+            stack_info = self._heat_client.stacks.get(stack_id=self._stack)
+            template = self._heat_client.stacks.template(
+                stack_id='{0}/{1}'.format(stack_info.stack_name, stack_info.id))
+            return template, stack_info.parameters
+        except heatclient.exc.HTTPNotFound:
+            return {}, {}
+
     def _wait_state(self, state):
         if isinstance(state, types.ListType):
             states = state
diff --git a/conductor/data/workflows/AD.xml b/conductor/data/workflows/AD.xml
index fc2c7669..0433e4d0 100644
--- a/conductor/data/workflows/AD.xml
+++ b/conductor/data/workflows/AD.xml
@@ -131,10 +131,6 @@
 				<set path="::state.primaryDcIp">
 					<select source="ip" path="0.Result.0"/>
 				</set>
-				<report entity="unit">
-					<parameter name="id"><select path="id"/></parameter>
-					<parameter name="text">DNS IP = <select source="ip" path="0.Result.0"/></parameter>
-				</report>
 			</success>
 		</send-command>
 	</rule>
diff --git a/conductor/data/workflows/Common.xml b/conductor/data/workflows/Common.xml
index 76de5938..01d13259 100644
--- a/conductor/data/workflows/Common.xml
+++ b/conductor/data/workflows/Common.xml
@@ -1,6 +1,6 @@
 <workflow>
 
-	<rule match="$..units[?(@.state.hostname is None)]">
+	<rule match="$.services[*][*].units[?(@.state.hostname is None)]">
 		<set path="state.hostname"><generate-hostname/></set>
 	</rule>
 
diff --git a/conductor/data/workflows/IIS.xml b/conductor/data/workflows/IIS.xml
index 2d5e7aa3..136358b4 100644
--- a/conductor/data/workflows/IIS.xml
+++ b/conductor/data/workflows/IIS.xml
@@ -13,7 +13,7 @@
 		<update-cf-stack template="Windows">
 			<parameter name="mappings">
 				<map>
-					<mapping name="instanceName">WS-<select path="::name"/>-<select path="name"/></mapping>
+					<mapping name="instanceName"><select path="::name"/>-<select path="name"/></mapping>
 					<mapping name="userData">
 						<prepare-user-data>
 							<parameter name="hostname"><select path="state.hostname"/></parameter>