diff --git a/cloud/setup.yml b/cloud/setup.yml
index ab4dba8..04cba8e 100644
--- a/cloud/setup.yml
+++ b/cloud/setup.yml
@@ -75,7 +75,6 @@ controller_templates:
     project: Ansible official demo project
     playbook: cloud/create_infra.yml
     inventory: Workshop Inventory
-    execution_environment: Default execution environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -108,7 +107,6 @@ controller_templates:
     project: Ansible official demo project
     playbook: cloud/create_vm.yml
     inventory: Workshop Inventory
-    execution_environment: Default execution environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -154,7 +152,6 @@ controller_templates:
     project: Ansible official demo project
     playbook: cloud/destroy_vm.yml
     inventory: Workshop Inventory
-    execution_environment: Default execution environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
diff --git a/linux/ec2_register.yml b/linux/ec2_register.yml
index c5df31b..b1cee04 100644
--- a/linux/ec2_register.yml
+++ b/linux/ec2_register.yml
@@ -8,6 +8,10 @@
       that:
         - org_id is defined
         - activation_key is defined
+        - org_id != ''
+        - activation_key != ''
+        - org_id != 'undef'
+        - activation_key != 'undef'
 
   - name: set hostname
     hostname:
diff --git a/windows/create_ad_domain.yml b/windows/create_ad_domain.yml
index 00ee7d2..2a085e8 100644
--- a/windows/create_ad_domain.yml
+++ b/windows/create_ad_domain.yml
@@ -1,9 +1,15 @@
 ---
 - name: Create Active Directory domain
-  hosts: "{{ HOSTS | default('windows') }}"
+  hosts: "{{ HOSTS | default('os_windows') }}"
   gather_facts: false
 
   tasks:
+
+  - name: Set Local Admin Password
+    ansible.windows.win_user:
+      name: Administrator
+      password: "{{ ansible_password }}"
+
   - name: Create new domain in a new forest on the target host
     ansible.windows.win_domain:
       dns_domain_name: ansible.local
@@ -22,6 +28,7 @@
       state: present
       timeout: 600
       sleep: 10
+    remote_user: Administrator
 
   - name: Create some groups
     community.windows.win_domain_group:
diff --git a/windows/group_vars/os_windows.yml b/windows/group_vars/os_windows.yml
index 5cde06e..a646837 100644
--- a/windows/group_vars/os_windows.yml
+++ b/windows/group_vars/os_windows.yml
@@ -2,4 +2,4 @@
 ansible_connection: winrm
 ansible_winrm_transport: ntlm
 ansible_winrm_server_cert_validation: ignore
-ansible_port: 5986
\ No newline at end of file
+ansible_port: 5986
diff --git a/windows/setup.yml b/windows/setup.yml
index cddec4c..967a848 100644
--- a/windows/setup.yml
+++ b/windows/setup.yml
@@ -18,7 +18,6 @@ controller_templates:
     inventory: "Workshop Inventory"
     project: "Ansible official demo project"
     playbook: "windows/install_iis.yml"
-    execution_environment: Default execution environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -91,7 +90,6 @@ controller_templates:
     inventory: "Workshop Inventory"
     project: "Ansible official demo project"
     playbook: "windows/windows_choco_multiple.yml"
-    execution_environment: Default execution environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -112,7 +110,6 @@ controller_templates:
     inventory: "Workshop Inventory"
     project: "Ansible official demo project"
     playbook: "windows/windows_choco_specific.yml"
-    execution_environment: Default execution environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -137,7 +134,6 @@ controller_templates:
     inventory: "Workshop Inventory"
     project: "Ansible official demo project"
     playbook: "windows/powershell.yml"
-    execution_environment: Default execution environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -163,7 +159,6 @@ controller_templates:
     inventory: "Workshop Inventory"
     project: "Ansible official demo project"
     playbook: "windows/powershell_script.yml"
-    execution_environment: Default execution environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -192,7 +187,6 @@ controller_templates:
     inventory: "Workshop Inventory"
     project: "Ansible official demo project"
     playbook: "windows/powershell_dsc.yml"
-    execution_environment: Default execution environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -213,7 +207,6 @@ controller_templates:
     inventory: "Workshop Inventory"
     project: "Ansible official demo project"
     playbook: "windows/create_ad_domain.yml"
-    execution_environment: Default execution environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -234,7 +227,6 @@ controller_templates:
     inventory: "Workshop Inventory"
     project: "Ansible official demo project"
     playbook: "windows/helpdesk_new_user_portal.yml"
-    execution_environment: Default execution environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry