use ansible blocks with tags, also use standard layout

ansible/roles/win_reboot/tasks/reboot.yml

@@ -1,25 +1,11 @@
 ---
+- name: Reboot VM
+  tags: reboot_vm
+  block:
     - name: Rebooting hosts
       ansible.windows.win_reboot:
         msg: "rebooting VM, initiated by ansible"
         reboot_timeout: 3600
-  register: status
-
-- name: Delay WinRM
-  ansible.windows.win_service:
-    name: WinRM
-    start_mode: delayed
-
-    #- name: Force Openstack Reboot
-    #  openstack.cloud.server_action:
-    #    action: "reboot_hard"
-    #name: "{{ ansible_hostname }}"
-    #  when: not status | bool
-
-    #- name: Delay WinRM
-    #  ansible.windows.win_service:
-    #    name: WinRM
-    #    start_mode: delayed
 
     - name: Logging action
       vars:

ansible/roles/win_update/tasks/update.yml

@@ -1,4 +1,7 @@
 ---
+- name: Update VM
+  tags: update_vm
+  block:
     - name: Clear update cache
       win_shell: |
         UsoClient RefreshSettings
@@ -10,10 +13,6 @@
         skip_optional: true
         reboot: true
         reboot_timeout: 3600
-  vars:
-    ansible_become: true
-    ansible_become_pass: "{{ ansible_password }}"
-    ansible_become_user: Administrator
       ignore_errors: true
 
     - name: Update Windows (again)