This a bad commit message. NO idea.

roles/oatakan.windows_template_build/tasks/main.yml

@@ -1,13 +1,16 @@
 ---
 
-- include_tasks: powershell-upgrade.yml
+- include_role:
+    name: "{{ windows_powershell_upgrade_role }}"
   when: upgrade_powershell | bool
 
 - name: run setup module
   setup:
 
+- include_tasks: hotfix-tlsv12.yml
+  when: "'Windows Server 2008' in ansible_distribution or 'Windows 7' in ansible_distribution"
+
 - include_tasks: enable-tlsv12.yml
-  when: upgrade_powershell | bool
 
 - include_tasks: update-agent-win2008.yml
   when: "'Windows Server 2008' in ansible_distribution or 'Windows 7' in ansible_distribution"
@@ -42,7 +45,7 @@
 - include_tasks: policy.yml
 
 - include_tasks: power.yml
-  when: "'Server' not in ansible_distribution"
+  when: (ansible_os_product_type == 'workstation') | default(False)
 
 - include_tasks: enable-rdp.yml
 
@@ -55,15 +58,21 @@
     - not target_ovirt | bool
     - not target_vagrant | bool
 
-- include_tasks: remove-apps-alt-2.yml
+- block:
+    - include_tasks: remove-apps-alt-2.yml
+
+    - include_tasks: remove-onedrive.yml
   when:
     - remove_apps | bool
-    - "'Server' not in ansible_distribution"
+    - (ansible_os_product_type == 'workstation') | default(False)
 
 - include_role:
     name: "{{ ec2_ena_driver_role }}"
   when: target_ec2 | bool
 
+- name: run all handlers here
+  meta: flush_handlers
+
 - include_tasks: clean-up-components.yml
   when: clean_up_components | bool