diff --git a/cloud/setup.yml b/cloud/setup.yml
index dc61b61..fd7dad5 100644
--- a/cloud/setup.yml
+++ b/cloud/setup.yml
@@ -70,6 +70,9 @@ controller_templates:
     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
     survey_enabled: true
     extra_vars:
       aws_region: us-east-2
@@ -88,6 +91,7 @@ controller_templates:
           type: textarea
           required: false
           variable: aws_public_key
+
   - name: Cloud / Create VM
     job_type: run
     organization: Default
@@ -99,6 +103,9 @@ controller_templates:
     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
     survey_enabled: true
     extra_vars:
       aws_region: us-east-2
@@ -130,6 +137,7 @@ controller_templates:
             - windows_full
             - rhel8
             - rhel7
+
   - name: Cloud / Destroy VM
     job_type: run
     organization: Default
@@ -141,6 +149,9 @@ controller_templates:
     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
     survey_enabled: true
     extra_vars:
       aws_region: us-east-2
@@ -152,4 +163,3 @@ controller_templates:
           type: text
           variable: HOSTS
           required: true
-
diff --git a/linux/setup.yml b/linux/setup.yml
index 13ccf59..eac25be 100644
--- a/linux/setup.yml
+++ b/linux/setup.yml
@@ -140,7 +140,7 @@ controller_templates:
           required: true
 
   - name: "LINUX / Patching"
-    job_type: run
+    job_type: check
     inventory: "Workshop Inventory"
     project: "Ansible official demo project"
     playbook: "linux/patching.yml"
@@ -149,7 +149,6 @@ controller_templates:
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
     use_fact_cache: true
-    job_type: check
     ask_job_type_on_launch: yes
     credentials:
     - "Workshop Credential"
diff --git a/network/setup.yml b/network/setup.yml
index f2c2cc6..1764620 100644
--- a/network/setup.yml
+++ b/network/setup.yml
@@ -42,6 +42,9 @@ controller_templates:
     survey_enabled: true
     project: Network Golden Configs
     playbook: main.yml
+    notification_templates_started: Telemetry
+    notification_templates_success: Telemetry
+    notification_templates_error: Telemetry
     ask_limit_on_launch: true
     use_fact_cache: yes
     survey:
diff --git a/windows/setup.yml b/windows/setup.yml
index 6b42eda..09ca311 100644
--- a/windows/setup.yml
+++ b/windows/setup.yml
@@ -19,6 +19,9 @@ controller_templates:
     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
     credentials:
     - "Workshop Credential"
     survey_enabled: true
@@ -43,6 +46,9 @@ controller_templates:
     project: "Ansible official demo project"
     playbook: "windows/patching.yml"
     execution_environment: Default execution environment
+    notification_templates_started: Telemetry
+    notification_templates_success: Telemetry
+    notification_templates_error: Telemetry
     credentials:
     - "Workshop Credential"
     survey_enabled: true
@@ -86,6 +92,9 @@ controller_templates:
     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
     credentials:
     - "Workshop Credential"
     survey_enabled: true
@@ -104,6 +113,9 @@ controller_templates:
     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
     credentials:
     - "Workshop Credential"
     survey_enabled: true
@@ -125,6 +137,9 @@ controller_templates:
     project: "Ansible official demo project"
     playbook: "windows/arbitrary_powershell.yml"
     execution_environment: Default execution environment
+    notification_templates_started: Telemetry
+    notification_templates_success: Telemetry
+    notification_templates_error: Telemetry
     credentials:
     - "Workshop Credential"
     survey_enabled: true
@@ -148,6 +163,9 @@ controller_templates:
     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
     credentials:
     - "Workshop Credential"
     survey_enabled: true
@@ -174,6 +192,9 @@ controller_templates:
     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
     credentials:
     - "Workshop Credential"
     survey_enabled: true
@@ -186,62 +207,68 @@ controller_templates:
           variable: HOSTS
           required: false
 
-  - name: "ACTIVE DIRECTORY / Create Active Directory domain"
-    job_type: run
-    inventory: "Workshop Inventory"
-    project: "Ansible official demo project"
-    playbook: "windows/active_directory/create_ad_domain.yml"
-    execution_environment: Default execution environment
-    credentials:
-    - "Workshop Credential"
-    survey_enabled: true
-    survey:
-      name: ''
-      description: ''
-      spec:
-        - question_name: Server Name or Pattern
-          type: text
-          variable: HOSTS
-          required: false
+#  - name: "ACTIVE DIRECTORY / Create Active Directory domain"
+#    job_type: run
+#    inventory: "Workshop Inventory"
+#    project: "Ansible official demo project"
+#    playbook: "windows/active_directory/create_ad_domain.yml"
+#    execution_environment: Default execution environment
+#    notification_templates_started: Telemetry
+#    notification_templates_success: Telemetry
+#    notification_templates_error: Telemetry
+#    credentials:
+#    - "Workshop Credential"
+#    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
-    inventory: "Workshop Inventory"
-    project: "Ansible official demo project"
-    playbook: "windows/active_directory/helpdesk_new_user_portal.yml"
-    execution_environment: Default execution environment
-    credentials:
-    - "Workshop Credential"
-    survey_enabled: true
-    survey:
-      name: ''
-      description: ''
-      spec:
-        - question_name: Firstname
-          type: text
-          variable: firstname
-          required: true
-        - question_name: Surname
-          type: text
-          variable: surname
-          required: true
-        - question_name: Street
-          type: text
-          variable: street
-          default: 123 4th St.
-          required: false
-        - question_name: City
-          type: text
-          variable: city
-          default: Sometown
-          required: false
-        - question_name: Postal code
-          type: text
-          variable: postal_code
-          default: IN
-          required: false
-        - question_name: Telephone number
-          type: text
-          variable: telephone_number
-          default: 555-123456
-          required: false
\ No newline at end of file
+#  - name: "ACTIVE DIRECTORY / Helpdesk new user portal"
+#    job_type: run
+#    inventory: "Workshop Inventory"
+#    project: "Ansible official demo project"
+#    playbook: "windows/active_directory/helpdesk_new_user_portal.yml"
+#    execution_environment: Default execution environment
+#    notification_templates_started: Telemetry
+#    notification_templates_success: Telemetry
+#    notification_templates_error: Telemetry
+#    credentials:
+#    - "Workshop Credential"
+#    survey_enabled: true
+#    survey:
+#      name: ''
+#      description: ''
+#      spec:
+#        - question_name: Firstname
+#          type: text
+#          variable: firstname
+#          required: true
+#        - question_name: Surname
+#          type: text
+#          variable: surname
+#          required: true
+#        - question_name: Street
+#          type: text
+#          variable: street
+#          default: 123 4th St.
+#          required: false
+#        - question_name: City
+#          type: text
+#          variable: city
+#          default: Sometown
+#          required: false
+#        - question_name: Postal code
+#          type: text
+#          variable: postal_code
+#          default: IN
+#          required: false
+#        - question_name: Telephone number
+#          type: text
+#          variable: telephone_number
+#          default: 555-123456
+#          required: false