diff --git a/muranorepository/Services/workflows/Demo.xml b/muranorepository/Services/workflows/Demo.xml
index acc4217..88d7b88 100644
--- a/muranorepository/Services/workflows/Demo.xml
+++ b/muranorepository/Services/workflows/Demo.xml
@@ -56,4 +56,36 @@
 		</failure>
 		</update-cf-stack>
 	</rule>
+
+
+<rule match="$.services[?(@.type == 'demoService')].units[?(@.temp.instanceName and not @.state.demoInstalled)]"
+			desc="Units of demo service which have got an instance deployed but have not got demo service installed">
+		<report entity="unit">
+			<parameter name="id"><select path="id"/></parameter>
+			<parameter name="text">Creating demo service on unit <select path="state.hostname"/> (<select path="name"/>)</parameter>
+		</report>
+		<send-command template="Demo" error='exception'>
+			<parameter name="unit">
+				<select path="id"/>
+			</parameter>
+			<parameter name="service">
+				<select path="::id"/>
+			</parameter>
+			<success>
+				<set path="state.demoInstalled"><true/></set>
+				<report entity="unit">
+					<parameter name="id"><select path="id"/></parameter>
+					<parameter name="text">Demo service <select path="state.hostname"/> (<select path="name"/>) has started</parameter>
+				</report>
+			</success>
+			<failure>
+				<report entity="unit" level="error">
+					<parameter name="id"><select path="id"/></parameter>
+					<parameter name="text">Unable to install demo service on <select path="state.hostname"/> (<select path="name"/>) due to <format-error error="exception"/></parameter>
+				</report>
+				<stop/>
+			</failure>
+		</send-command>
+	</rule>
+
 </workflow>