diff --git a/windows/active_directory/create_ad_domain.yml b/windows/active_directory/create_ad_domain.yml
index 212b3ac..00ee7d2 100644
--- a/windows/active_directory/create_ad_domain.yml
+++ b/windows/active_directory/create_ad_domain.yml
@@ -1,6 +1,6 @@
 ---
 - name: Create Active Directory domain
-  hosts: windows
+  hosts: "{{ HOSTS | default('windows') }}"
   gather_facts: false
 
   tasks:
diff --git a/windows/setup.yml b/windows/setup.yml
index fbf189a..b9bac53 100644
--- a/windows/setup.yml
+++ b/windows/setup.yml
@@ -213,7 +213,15 @@ controller_templates:
     execution_environment: Default execution environment
     credentials:
     - "Workshop Credential"
-    survey_enabled: false
+    survey_enabled: true
+    survey:
+      name: ''
+      description: ''
+      spec:
+        - question_name: Server Name or Pattern
+          type: text
+          variable: HOSTS
+          required: false
 
   - name: "ACTIVE DIRECTORY / Helpdesk new user portal"
     job_type: run