diff --git a/openshift/gitlab.yml b/openshift/gitlab.yml
index 7a68e33..708f892 100644
--- a/openshift/gitlab.yml
+++ b/openshift/gitlab.yml
@@ -108,7 +108,7 @@
         method: GET
         return_content: true
 
-    - name: debug gitlab_chart_versions
+    - name: Debug gitlab_chart_versions
       ansible.builtin.debug:
         var: gitlab_chart_versions.content | from_yaml
 
diff --git a/windows/patching.yml b/windows/patching.yml
index 39471d2..aae21b1 100644
--- a/windows/patching.yml
+++ b/windows/patching.yml
@@ -5,6 +5,12 @@
     report_server: aws_win1
 
   tasks:
+
+    - name: Assert that host is in webservers group
+      ansible.builtin.assert:
+        that: "'{{ report_server }}' in groups.os_windows"
+        msg: "Please run the 'Deploy Cloud Stack in AWS' Workflow Job Template first"
+
     - name: Patch windows server
       ansible.builtin.include_role:
         name: demo.patching.patch_windows
diff --git a/windows/setup.yml b/windows/setup.yml
index bcd3299..80f20c1 100644
--- a/windows/setup.yml
+++ b/windows/setup.yml
@@ -40,7 +40,6 @@ controller_templates:
     inventory: "Demo Inventory"
     project: "Ansible Product Demos"
     playbook: "windows/patching.yml"
-    execution_environment: Default execution environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -86,7 +85,6 @@ controller_templates:
     inventory: "Demo Inventory"
     project: "Ansible Product Demos"
     playbook: "windows/rollback.yml"
-    execution_environment: Default execution environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -111,7 +109,6 @@ controller_templates:
     inventory: "Demo Inventory"
     project: "Ansible Product Demos"
     playbook: "windows/connect.yml"
-    execution_environment: Default execution environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry