diff --git a/data/templates/agent/JoinDomain.template b/data/templates/agent/JoinDomain.template
index 85e4b9c..f2e7a24 100644
--- a/data/templates/agent/JoinDomain.template
+++ b/data/templates/agent/JoinDomain.template
@@ -1,5 +1,4 @@
 {
-  "Scripts": [],
   "Commands": [
     {
       "Name": "Import-Module",
@@ -17,11 +16,15 @@
     {
       "Name": "Join-Domain",
       "Arguments": {
+        "Username": "$domainUser",
+        "Password": "$domainPassword",
         "DomainName": "$domain",
-        "Username": "Administrator",
-        "Password": "$domainPassword"
+        "OUPath": "$ouPath"
       }
     }
   ],
-  "RebootOnCompletion": 1
+  "RebootOnCompletion": 1,
+  "Scripts": [
+    "RnVuY3Rpb24gSm9pbi1Eb21haW4gewo8IwouU1lOT1BTSVMKRXhlY3V0ZXMgIkpvaW4gZG9tYWluIiBhY3Rpb24uCgpSZXF1aXJlcyAnQ29yZUZ1bmN0aW9ucycgbW9kdWxlLgojPgoJcGFyYW0gKAoJCVtTdHJpbmddICREb21haW5OYW1lID0gJycsCgkJW1N0cmluZ10gJFVzZXJOYW1lID0gJycsCgkJW1N0cmluZ10gJFBhc3N3b3JkID0gJycsCgkJW1N0cmluZ10gJE9VUGF0aCA9ICcnLAogICAgICAgIFtTd2l0Y2hdICRBbGxvd1Jlc3RhcnQKCSkKCQoJaWYgKCRVc2VyTmFtZSAtZXEgJycpIHsKCQkkVXNlck5hbWUgPSAnQWRtaW5pc3RyYXRvcicKCX0KCgkkQ3JlZGVudGlhbCA9IE5ldy1DcmVkZW50aWFsIC1Vc2VyTmFtZSAiJERvbWFpbk5hbWVcJFVzZXJOYW1lIiAtUGFzc3dvcmQgJFBhc3N3b3JkCgoJaWYgKFRlc3QtQ29tcHV0ZXJOYW1lIC1Eb21haW5OYW1lICREb21haW5OYW1lKSB7CiAgICAgICAgV3JpdGUtTG9nV2FybmluZyAiQ29tcHV0ZXIgYWxyZWFkeSBqb2luZWQgdG8gZG9tYWluICckRG9tYWluTmFtZSciCgl9CgllbHNlIHsKCQlXcml0ZS1Mb2cgIkpvaW5pbmcgY29tcHV0ZXIgdG8gZG9tYWluICckRG9tYWluTmFtZScgLi4uIgoJCQoJCWlmICgkT1VQYXRoIC1lcSAnJykgewoJCQlBZGQtQ29tcHV0ZXIgLURvbWFpbk5hbWUgJERvbWFpbk5hbWUgLUNyZWRlbnRpYWwgJENyZWRlbnRpYWwgLUZvcmNlIC1FcnJvckFjdGlvbiBTdG9wCgkJfQoJCWVsc2UgewoJCQlBZGQtQ29tcHV0ZXIgLURvbWFpbk5hbWUgJERvbWFpbk5hbWUgLUNyZWRlbnRpYWwgJENyZWRlbnRpYWwgLU9VUGF0aCAkT1VQYXRoIC1Gb3JjZSAtRXJyb3JBY3Rpb24gU3RvcAoJCX0KCQkKICAgICAgICBpZiAoJEFsbG93UmVzdGFydCkgewogICAgICAgICAgICBXcml0ZS1Mb2cgIlJlc3RhcnRpbmcgY29tcHV0ZXIgLi4uIgogICAgICAgICAgICBSZXN0YXJ0LUNvbXB1dGVyIC1Gb3JjZQogICAgICAgIH0KICAgICAgICBlbHNlIHsKICAgICAgICAgICAgV3JpdGUtTG9nICJQbGVhc2UgcmVzdGFydCB0aGUgY29tcHV0ZXIgbm93LiIKICAgICAgICB9Cgl9Cn0K"
+  ]
 }
\ No newline at end of file
diff --git a/data/workflows/AD.xml b/data/workflows/AD.xml
index c1bba51..1457201 100644
--- a/data/workflows/AD.xml
+++ b/data/workflows/AD.xml
@@ -162,6 +162,8 @@
 						<mapping name="dnsIp">
 							<select path="state.primaryDcIp"/>
 						</mapping>
+						<mapping name="domainUser">Administrator</mapping>
+						<mapping name="ouPath"></mapping>
 					</map>
 				</parameter>
 
diff --git a/data/workflows/ExternalAD.xml.example b/data/workflows/ExternalAD.xml.example
index 54c8faa..082bde8 100644
--- a/data/workflows/ExternalAD.xml.example
+++ b/data/workflows/ExternalAD.xml.example
@@ -8,19 +8,23 @@
  <!--  Specify here parameters of domain controllers at each availability zone -->
  <!--  ======================================================================= -->
 
-        <mapping name="AvailabilityZone1">
+        <mapping name="Region1">
             <map>
                 <mapping name="domain">domain1</mapping>
+                <mapping name="domainUser">Administrator</mapping>
                 <mapping name="domainPassword">password1</mapping>
                 <mapping name="dnsIp">ip1</mapping>
+                <mapping name="ou"></mapping>
             </map>
         </mapping>
 
-        <mapping name="AvailabilityZone2">
+        <mapping name="Region2">
             <map>
                 <mapping name="domain">domain2</mapping>
+                <mapping name="domainUser">Administrator</mapping>
                 <mapping name="domainPassword">password2</mapping>
                 <mapping name="dnsIp">ip2</mapping>
+                <mapping name="ou"></mapping>
             </map>
         </mapping>
 
@@ -49,12 +53,18 @@
 						<mapping name="domain">
 							<select path="domain" source="ad"/>
 						</mapping>
+						<mapping name="domainUser">
+							<select path="domainUser" source="ad"/>
+						</mapping>
 						<mapping name="domainPassword">
 							<select path="domainPassword" source="ad"/>
 						</mapping>
 						<mapping name="dnsIp">
 							<select path="dnsIp" source="ad"/>
 						</mapping>
+						<mapping name="ouPath">
+							<select path="ou" source="ad"/>
+						</mapping>
 					</map>
 				</parameter>