diff --git a/data/templates/agent/LeaveDomain.template b/data/templates/agent/LeaveDomain.template
new file mode 100644
index 0000000..c4e95d6
--- /dev/null
+++ b/data/templates/agent/LeaveDomain.template
@@ -0,0 +1,5 @@
+{
+  "Commands": [],
+  "RebootOnCompletion": 0,
+  "Scripts": []
+}
\ No newline at end of file
diff --git a/data/workflows/AD.xml b/data/workflows/AD.xml
index 8a3befb..b325aee 100644
--- a/data/workflows/AD.xml
+++ b/data/workflows/AD.xml
@@ -135,6 +135,32 @@
 		</send-command>
 	</rule>
 
+    <rule match="$.services[?(@.type != 'activeDirectory')].units[?(@.state.domain and not @.domain)]">
+        <send-command template="LeaveDomain">
+            <parameter name="unit">
+                <select path="id" source="unit"/>
+            </parameter>
+            <parameter name="service">
+                <select path="::id"/>
+            </parameter>
+            <parameter name="mappings">
+                <map>
+                    <mapping name="domain">
+                        <select path="state.domain"/>
+                    </mapping>
+                </map>
+            </parameter>
+
+            <success>
+                <report entity="unit">
+                    <parameter name="id"><select path="id" source="unit"/></parameter>
+                    <parameter name="text">Unit <select path="state.hostname" source="unit"/> (<select path="name" source="unit"/>) has leaved domain <select path="state.domain"/></parameter>
+                </report>
+                <set path="state.domain"><null/></set>
+            </success>
+        </send-command>
+    </rule>
+
 	<rule match="$..units[?(@.state.instanceName and @.domain and @.domain != @.state.domain)]">
 		<set path="#unit">
 			<select/>