From eaa5e07b2866e05b6c7b5628ca92e9cb1142d008 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Sun, 15 Jun 2025 09:13:16 +0200
Subject: [PATCH] Adjust YAML files (#10233)

Adjust YAML files.
---
 .azure-pipelines/templates/matrix.yml         |  14 +-
 .azure-pipelines/templates/test.yml           |  68 +-
 .github/workflows/ansible-test.yml            |   2 +-
 .github/workflows/codeql-analysis.yml         |   2 +-
 tests/integration/requirements.yml            |   6 +-
 .../targets/aix_filesystem/tasks/main.yml     |   8 +-
 .../targets/alternatives/tasks/main.yml       |  92 +-
 .../targets/alternatives/tasks/setup.yml      |  10 +-
 .../targets/alternatives/tasks/test.yml       |  42 +-
 .../targets/alternatives/tasks/tests.yml      |  14 +-
 .../targets/android_sdk/tasks/main.yml        |  20 +-
 .../targets/android_sdk/tasks/setup.yml       |   4 +-
 .../ansible_galaxy_install/tasks/main.yml     |  28 +-
 .../tasks/635-apache2-misleading-warning.yml  |  12 +-
 .../apache2_module/tasks/actualtest.yml       | 260 +++---
 .../targets/btrfs_subvolume/defaults/main.yml |  16 +-
 .../targets/btrfs_subvolume/tasks/main.yml    |  24 +-
 .../tasks/run_filesystem_tests.yml            |  40 +-
 .../targets/btrfs_subvolume/tasks/setup.yml   |   6 +-
 .../tasks/test_filesystem_matching.yml        | 114 +--
 .../tasks/test_snapshot_clobber.yml           |  54 +-
 .../tasks/test_snapshot_error.yml             |  56 +-
 .../tasks/test_snapshot_skip.yml              |  54 +-
 .../tasks/test_subvolume_default.yml          | 164 ++--
 .../tasks/test_subvolume_nested.yml           |  90 +-
 .../tasks/test_subvolume_recursive.yml        | 144 ++--
 .../tasks/test_subvolume_simple.yml           |  88 +-
 .../tasks/test_subvolume_whitespace.yml       |  90 +-
 .../targets/callback/tasks/main.yml           | 102 +--
 .../tasks/main.yml                            |  31 +-
 .../targets/callback_diy/tasks/main.yml       | 345 ++++----
 .../callback_print_task/tasks/main.yml        | 126 ++-
 .../targets/callback_timestamp/tasks/main.yml |  46 +-
 .../targets/callback_yaml/tasks/main.yml      |  85 +-
 .../integration/targets/cargo/tasks/main.yml  |   6 +-
 .../integration/targets/cargo/tasks/setup.yml |  44 +-
 .../targets/cargo/tasks/test_general.yml      |   8 +-
 .../targets/cargo/tasks/test_rustup_cargo.yml |   4 +-
 .../targets/cargo/tasks/test_version.yml      |  12 +-
 .../cloud_init_data_facts/tasks/main.yml      |  90 +-
 .../targets/connection/test_connection.yml    |  60 +-
 .../connection_wsl/plugin-specific-tests.yml  |   2 +-
 .../targets/consul/tasks/consul_kv.yml        |   8 +-
 .../targets/consul/tasks/consul_role.yml      |   6 +-
 .../integration/targets/consul/tasks/main.yml | 176 ++--
 tests/integration/targets/copr/tasks/main.yml | 222 ++---
 .../targets/deploy_helper/tasks/main.yml      |  66 +-
 .../targets/discord/defaults/main.yml         |   2 +-
 .../targets/filesize/tasks/basics.yml         |   4 -
 .../targets/filesize/tasks/floats.yml         |   2 -
 .../targets/filesize/tasks/sparse.yml         |   3 -
 .../targets/filesize/tasks/symlinks.yml       |   4 +-
 .../filesystem/tasks/reset_fs_uuid.yml        |  82 +-
 .../tasks/set_fs_uuid_on_creation.yml         |  48 +-
 .../set_fs_uuid_on_creation_with_opts.yml     |  38 +-
 .../filter_keep_keys/vars/main/tests.yml      |  12 +-
 .../targets/filter_random_mac/tasks/main.yml  |  14 +-
 .../filter_replace_keys/vars/main/tests.yml   |  12 +-
 .../tasks/tasks.yml                           |  20 +-
 .../targets/flatpak/tasks/main.yml            |  72 +-
 .../targets/flatpak/tasks/setup.yml           |  20 +-
 .../targets/flatpak/tasks/test.yml            |  34 +-
 .../targets/flatpak_remote/tasks/main.yml     |  54 +-
 .../targets/flatpak_remote/tasks/setup.yml    |  20 +-
 .../targets/gandi_livedns/defaults/main.yml   |  38 +-
 .../gandi_livedns/tasks/create_record.yml     |  24 +-
 .../gandi_livedns/tasks/remove_record.yml     |   8 +-
 .../gandi_livedns/tasks/update_record.yml     |  30 +-
 tests/integration/targets/gem/tasks/main.yml  | 332 ++++----
 .../git_config/tasks/set_value_with_tilde.yml |   2 +-
 .../targets/git_config_info/tasks/main.yml    |  21 +-
 .../github_app_access_token/tasks/main.yml    |   6 +-
 .../gitlab_group_access_token/tasks/main.yml  |  40 +-
 .../gitlab_instance_variable/tasks/main.yml   |   2 +-
 .../targets/gitlab_issue/tasks/main.yml       | 240 +++---
 .../targets/gitlab_label/tasks/main.yml       | 802 +++++++++---------
 .../gitlab_merge_request/tasks/main.yml       | 204 ++---
 .../targets/gitlab_milestone/tasks/main.yml   | 668 +++++++--------
 .../tasks/main.yml                            |  40 +-
 .../gitlab_project_variable/tasks/main.yml    |   2 +-
 tests/integration/targets/hg/tasks/main.yml   |  20 +-
 .../targets/homebrew/tasks/casks.yml          | 142 ++--
 .../targets/homebrew/tasks/formulae.yml       | 766 ++++++++---------
 .../targets/homebrew_cask/tasks/main.yml      | 108 +--
 .../targets/homebrew_services/tasks/main.yml  | 110 +--
 .../targets/hwc_ecs_instance/tasks/main.yml   |  14 +-
 .../targets/hwc_evs_disk/tasks/main.yml       |   6 +-
 .../targets/hwc_network_vpc/tasks/main.yml    |  94 +-
 .../targets/hwc_smn_topic/tasks/main.yml      |  84 +-
 .../targets/hwc_vpc_eip/tasks/main.yml        |  14 +-
 .../hwc_vpc_peering_connect/tasks/main.yml    |  14 +-
 .../targets/hwc_vpc_port/tasks/main.yml       |  14 +-
 .../targets/hwc_vpc_private_ip/tasks/main.yml |  14 +-
 .../targets/hwc_vpc_route/tasks/main.yml      |  12 +-
 .../hwc_vpc_security_group/tasks/main.yml     |  10 +-
 .../tasks/main.yml                            |  14 +-
 .../targets/hwc_vpc_subnet/tasks/main.yml     |  14 +-
 .../ini_file/tasks/tests/04-symlink.yml       |  30 +-
 .../tasks/tests/06-modify_inactive_option.yml |   4 +-
 .../targets/interfaces_file/tasks/main.yml    |   4 +-
 .../iptables_state/tasks/tests/00-basic.yml   |  13 -
 .../iptables_state/tasks/tests/01-tables.yml  |  13 -
 .../tasks/tests/10-rollback.yml               |   8 -
 .../targets/ipwcli_dns/tasks/main.yml         |  30 +-
 .../targets/iso_create/tasks/main.yml         |  28 +-
 .../iso_customize/tasks/iso_customize.yml     |   4 +-
 .../tasks/iso_customize_add_files.yml         |   2 +-
 .../tasks/iso_customize_delete_files.yml      |   2 +-
 .../targets/iso_extract/tasks/prepare.yml     |   4 +-
 .../targets/iso_extract/tasks/tests.yml       |  14 +-
 .../targets/java_cert/tasks/main.yml          |  12 +-
 .../targets/java_cert/tasks/state_change.yml  |   2 +-
 tests/integration/targets/jboss/meta/main.yml |   2 +-
 .../integration/targets/jboss/tasks/jboss.yml | 306 +++----
 .../targets/kdeconfig/tasks/main.yml          |  10 +-
 .../keycloak_authentication/tasks/main.yml    | 102 +--
 .../keycloak_authz_permission/tasks/main.yml  |   4 +-
 .../targets/keycloak_client/tasks/main.yml    |   8 +-
 .../keycloak_client_rolescope/tasks/main.yml  | 100 +--
 .../keycloak_component_info/tasks/main.yml    |  56 +-
 .../targets/keycloak_group/tasks/main.yml     |  10 +-
 .../keycloak_user_rolemapping/tasks/main.yml  |  12 +-
 .../keycloak_userprofile/vars/main.yml        | 126 +--
 .../targets/keyring/tasks/main.yml            |   2 +-
 .../targets/ldap_inc/tasks/tests/basic.yml    |  38 +-
 .../targets/ldap_search/tasks/tests/auth.yml  |  12 +-
 .../targets/ldap_search/tasks/tests/basic.yml |  10 +-
 .../targets/ldap_search/tasks/tests/pages.yml |   4 +-
 .../ldap_search/tasks/tests/schema.yml        |   6 +-
 .../targets/lookup_cartesian/tasks/main.yml   |  30 +-
 .../targets/lookup_etcd3/defaults/main.yml    |   4 +-
 .../targets/lookup_etcd3/tasks/main.yml       |   6 +-
 .../targets/lookup_etcd3/tasks/tests.yml      |  38 +-
 .../targets/lookup_flattened/tasks/main.yml   |  16 +-
 .../targets/lookup_lmdb_kv/test.yml           |  48 +-
 .../lookup_passwordstore/tasks/package.yml    |  48 +-
 .../tasks/password_tests.yml                  | 200 ++---
 .../lookup_passwordstore/tasks/tests.yml      | 180 ++--
 .../targets/lookup_random_pet/test.yml        |  42 +-
 .../targets/lookup_random_string/test.yml     |  86 +-
 .../targets/lookup_random_words/test.yml      |  48 +-
 .../targets/lvg/tasks/test_active_create.yml  |  10 +-
 .../targets/lvg/tasks/test_pvresize.yml       |  38 +-
 tests/integration/targets/mail/tasks/main.yml | 166 ++--
 tests/integration/targets/mas/tasks/main.yml  |  34 +-
 .../integration/targets/monit/tasks/main.yml  | 148 ++--
 .../integration/targets/mqtt/tasks/ubuntu.yml |   6 +-
 .../integration/targets/nomad/tasks/main.yml  | 154 ++--
 tests/integration/targets/npm/tasks/main.yml  |  26 +-
 .../targets/one_host/tasks/main.yml           |  16 +-
 .../targets/one_image/tasks/main.yml          |   6 +-
 .../targets/one_template/tasks/main.yml       |  12 +-
 .../targets/one_vnet/tasks/main.yml           |   2 +-
 .../targets/osx_defaults/tasks/main.yml       |   8 +-
 tests/integration/targets/pids/tasks/main.yml |  22 +-
 .../pipx/tasks/testcase-oldsitewide.yml       |   2 +-
 .../targets/pkgutil/tasks/main.yml            |  16 +-
 .../targets/read_csv/tasks/main.yml           |  88 +-
 .../targets/redis_info/meta/main.yml          |   2 +-
 .../targets/redis_info/tasks/main.yml         |  24 +-
 .../targets/rundeck/files/test_job.yaml       |  14 +-
 .../integration/targets/rundeck/meta/main.yml |   2 +-
 .../scaleway_compute/tasks/security_group.yml | 160 ++--
 .../defaults/main.yml                         |   2 +-
 .../scaleway_security_group/tasks/main.yml    | 110 +--
 .../tasks/main.yml                            | 260 +++---
 .../targets/sefcontext/tasks/sefcontext.yml   |  60 +-
 .../targets/setup_cron/tasks/main.yml         | 114 +--
 .../targets/setup_docker/tasks/main.yml       |   2 +-
 .../targets/setup_etcd3/defaults/main.yml     |   2 +-
 .../targets/setup_etcd3/tasks/main.yml        | 154 ++--
 .../setup_flatpak_remote/meta/main.yaml       |   2 +-
 .../setup_flatpak_remote/tasks/main.yaml      |  32 +-
 .../targets/setup_openssl/tasks/main.yml      |  44 +-
 .../setup_postgresql_db/defaults/main.yml     |   4 +-
 .../setup_postgresql_db/tasks/main.yml        |  80 +-
 .../setup_redis_replication/defaults/main.yml |  16 +-
 .../setup_redis_replication/handlers/main.yml |  16 +-
 .../setup_redis_replication/meta/main.yml     |   4 +-
 .../setup_redis_replication/tasks/main.yml    |   2 +-
 .../tasks/setup_redis_cluster.yml             |  24 +-
 .../setup_wildfly_server/handlers/main.yml    |   4 +-
 .../setup_wildfly_server/meta/main.yml        |   4 +-
 .../targets/snap_alias/tasks/test.yml         |  48 +-
 .../spectrum_model_attrs/tasks/main.yml       | 102 +--
 .../targets/ssh_config/tasks/options.yml      |  20 +-
 .../targets/supervisorctl/tasks/main.yml      |  66 +-
 .../targets/systemd_info/tasks/main.yml       |   4 +-
 .../terraform/tasks/complex_variables.yml     |  10 +-
 .../targets/terraform/tasks/main.yml          |  52 +-
 .../terraform/tasks/test_provider_upgrade.yml |   2 +-
 .../targets/test_ansible_type/tasks/tasks.yml |  20 +-
 tests/integration/targets/ufw/tasks/main.yml  |  24 +-
 .../targets/ufw/tasks/tests/basic.yml         |  92 +-
 .../targets/ufw/tasks/tests/global-state.yml  |  44 +-
 .../ufw/tasks/tests/insert_relative_to.yml    |  18 +-
 .../targets/wakeonlan/tasks/main.yml          |  12 +-
 .../integration/targets/xattr/tasks/test.yml  |  20 +-
 .../targets/xfs_quota/tasks/gquota.yml        | 264 +++---
 .../targets/xfs_quota/tasks/pquota.yml        | 302 +++----
 .../targets/xfs_quota/tasks/uquota.yml        | 264 +++---
 tests/integration/targets/xml/tasks/main.yml  |  74 +-
 .../test-add-children-elements-unicode.yml    |  46 +-
 .../xml/tasks/test-add-children-elements.yml  |  46 +-
 .../test-add-children-from-groupvars.yml      |  46 +-
 .../tasks/test-add-children-insertafter.yml   |  44 +-
 .../tasks/test-add-children-insertbefore.yml  |  44 +-
 ...t-add-children-with-attributes-unicode.yml |  46 +-
 .../test-add-children-with-attributes.yml     |  54 +-
 .../xml/tasks/test-add-element-implicitly.yml |  16 +-
 .../test-add-namespaced-children-elements.yml |  52 +-
 .../xml/tasks/test-children-elements-xml.yml  |  48 +-
 .../targets/xml/tasks/test-count-unicode.yml  |  26 +-
 .../targets/xml/tasks/test-count.yml          |  26 +-
 .../test-get-element-content-unicode.yml      |  44 +-
 .../xml/tasks/test-get-element-content.yml    |  66 +-
 .../test-mutually-exclusive-attributes.yml    |  32 +-
 .../xml/tasks/test-pretty-print-only.yml      |  44 +-
 .../targets/xml/tasks/test-pretty-print.yml   |  44 +-
 .../tasks/test-remove-attribute-nochange.yml  |  42 +-
 .../xml/tasks/test-remove-attribute.yml       |  46 +-
 .../tasks/test-remove-element-nochange.yml    |  42 +-
 .../targets/xml/tasks/test-remove-element.yml |  46 +-
 ...t-remove-namespaced-attribute-nochange.yml |  52 +-
 .../test-remove-namespaced-attribute.yml      |  56 +-
 ...est-remove-namespaced-element-nochange.yml |  52 +-
 .../tasks/test-remove-namespaced-element.yml  |  56 +-
 .../test-set-attribute-value-unicode.yml      |  48 +-
 .../xml/tasks/test-set-attribute-value.yml    |  48 +-
 .../test-set-children-elements-level.yml      | 126 +--
 .../test-set-children-elements-unicode.yml    |  68 +-
 .../test-set-children-elements-value.yml      |  92 +-
 .../xml/tasks/test-set-children-elements.yml  | 126 +--
 .../tasks/test-set-element-value-empty.yml    |  46 +-
 .../tasks/test-set-element-value-unicode.yml  |  68 +-
 .../xml/tasks/test-set-element-value.yml      |  68 +-
 .../test-set-namespaced-attribute-value.yml   |  58 +-
 .../test-set-namespaced-children-elements.yml |  86 +-
 .../test-set-namespaced-element-value.yml     |  78 +-
 .../targets/xml/tasks/test-xmlstring.yml      | 124 +--
 tests/integration/targets/xml/vars/main.yml   |   6 +-
 tests/integration/targets/yarn/tasks/run.yml  |   2 +-
 .../targets/zpool/tasks/add_remove_vdevs.yml  |   8 +-
 .../targets/zpool/tasks/properties.yml        |   2 +-
 .../targets/zypper/tasks/zypper.yml           |  46 +-
 .../tasks/zypper_repository.yml               | 110 +--
 tests/unit/requirements.yml                   |   2 +-
 247 files changed, 7318 insertions(+), 7375 deletions(-)

diff --git a/.azure-pipelines/templates/matrix.yml b/.azure-pipelines/templates/matrix.yml
index 4876375855..49f5d8595a 100644
--- a/.azure-pipelines/templates/matrix.yml
+++ b/.azure-pipelines/templates/matrix.yml
@@ -50,11 +50,11 @@ jobs:
     parameters:
       jobs:
         - ${{ if eq(length(parameters.groups), 0) }}:
-          - ${{ each target in parameters.targets }}:
-            - name: ${{ format(parameters.nameFormat, coalesce(target.name, target.test)) }}
-              test: ${{ format(parameters.testFormat, coalesce(target.test, target.name)) }}
-        - ${{ if not(eq(length(parameters.groups), 0)) }}:
-          - ${{ each group in parameters.groups }}:
             - ${{ each target in parameters.targets }}:
-              - name: ${{ format(format(parameters.nameGroupFormat, parameters.nameFormat), coalesce(target.name, target.test), group) }}
-                test: ${{ format(format(parameters.testGroupFormat, parameters.testFormat), coalesce(target.test, target.name), group) }}
+                - name: ${{ format(parameters.nameFormat, coalesce(target.name, target.test)) }}
+                  test: ${{ format(parameters.testFormat, coalesce(target.test, target.name)) }}
+        - ${{ if not(eq(length(parameters.groups), 0)) }}:
+            - ${{ each group in parameters.groups }}:
+                - ${{ each target in parameters.targets }}:
+                    - name: ${{ format(format(parameters.nameGroupFormat, parameters.nameFormat), coalesce(target.name, target.test), group) }}
+                      test: ${{ format(format(parameters.testGroupFormat, parameters.testFormat), coalesce(target.test, target.name), group) }}
diff --git a/.azure-pipelines/templates/test.yml b/.azure-pipelines/templates/test.yml
index 700cf629d7..b263379c06 100644
--- a/.azure-pipelines/templates/test.yml
+++ b/.azure-pipelines/templates/test.yml
@@ -14,37 +14,37 @@ parameters:
 
 jobs:
   - ${{ each job in parameters.jobs }}:
-    - job: test_${{ replace(replace(replace(job.test, '/', '_'), '.', '_'), '-', '_') }}
-      displayName: ${{ job.name }}
-      container: default
-      workspace:
-        clean: all
-      steps:
-        - checkout: self
-          fetchDepth: $(fetchDepth)
-          path: $(checkoutPath)
-        - bash: .azure-pipelines/scripts/run-tests.sh "$(entryPoint)" "${{ job.test }}" "$(coverageBranches)"
-          displayName: Run Tests
-        - bash: .azure-pipelines/scripts/process-results.sh
-          condition: succeededOrFailed()
-          displayName: Process Results
-        - bash: .azure-pipelines/scripts/aggregate-coverage.sh "$(Agent.TempDirectory)"
-          condition: eq(variables.haveCoverageData, 'true')
-          displayName: Aggregate Coverage Data
-        - task: PublishTestResults@2
-          condition: eq(variables.haveTestResults, 'true')
-          inputs:
-            testResultsFiles: "$(outputPath)/junit/*.xml"
-          displayName: Publish Test Results
-        - task: PublishPipelineArtifact@1
-          condition: eq(variables.haveBotResults, 'true')
-          displayName: Publish Bot Results
-          inputs:
-            targetPath: "$(outputPath)/bot/"
-            artifactName: "Bot $(System.JobAttempt) $(System.StageDisplayName) $(System.JobDisplayName)"
-        - task: PublishPipelineArtifact@1
-          condition: eq(variables.haveCoverageData, 'true')
-          displayName: Publish Coverage Data
-          inputs:
-            targetPath: "$(Agent.TempDirectory)/coverage/"
-            artifactName: "Coverage $(System.JobAttempt) $(System.StageDisplayName) $(System.JobDisplayName)"
+      - job: test_${{ replace(replace(replace(job.test, '/', '_'), '.', '_'), '-', '_') }}
+        displayName: ${{ job.name }}
+        container: default
+        workspace:
+          clean: all
+        steps:
+          - checkout: self
+            fetchDepth: $(fetchDepth)
+            path: $(checkoutPath)
+          - bash: .azure-pipelines/scripts/run-tests.sh "$(entryPoint)" "${{ job.test }}" "$(coverageBranches)"
+            displayName: Run Tests
+          - bash: .azure-pipelines/scripts/process-results.sh
+            condition: succeededOrFailed()
+            displayName: Process Results
+          - bash: .azure-pipelines/scripts/aggregate-coverage.sh "$(Agent.TempDirectory)"
+            condition: eq(variables.haveCoverageData, 'true')
+            displayName: Aggregate Coverage Data
+          - task: PublishTestResults@2
+            condition: eq(variables.haveTestResults, 'true')
+            inputs:
+              testResultsFiles: "$(outputPath)/junit/*.xml"
+            displayName: Publish Test Results
+          - task: PublishPipelineArtifact@1
+            condition: eq(variables.haveBotResults, 'true')
+            displayName: Publish Bot Results
+            inputs:
+              targetPath: "$(outputPath)/bot/"
+              artifactName: "Bot $(System.JobAttempt) $(System.StageDisplayName) $(System.JobDisplayName)"
+          - task: PublishPipelineArtifact@1
+            condition: eq(variables.haveCoverageData, 'true')
+            displayName: Publish Coverage Data
+            inputs:
+              targetPath: "$(Agent.TempDirectory)/coverage/"
+              artifactName: "Coverage $(System.JobAttempt) $(System.StageDisplayName) $(System.JobDisplayName)"
diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml
index 8a10ef3589..89b36e6163 100644
--- a/.github/workflows/ansible-test.yml
+++ b/.github/workflows/ansible-test.yml
@@ -7,7 +7,7 @@
 # https://github.com/marketplace/actions/ansible-test
 
 name: EOL CI
-on:
+"on":
   # Run EOL CI against all pushes (direct commits, also merged PRs), Pull Requests
   push:
     branches:
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 57303aab3a..ec344315bb 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -5,7 +5,7 @@
 
 name: "Code scanning - action"
 
-on:
+"on":
   schedule:
     - cron: '26 19 * * 1'
   workflow_dispatch:
diff --git a/tests/integration/requirements.yml b/tests/integration/requirements.yml
index b772fc82d1..dfe544e3cc 100644
--- a/tests/integration/requirements.yml
+++ b/tests/integration/requirements.yml
@@ -4,6 +4,6 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 collections:
-- ansible.posix
-- community.crypto
-- community.docker
+  - ansible.posix
+  - community.crypto
+  - community.docker
diff --git a/tests/integration/targets/aix_filesystem/tasks/main.yml b/tests/integration/targets/aix_filesystem/tasks/main.yml
index 878088f4e7..5c4f2c7e39 100644
--- a/tests/integration/targets/aix_filesystem/tasks/main.yml
+++ b/tests/integration/targets/aix_filesystem/tasks/main.yml
@@ -28,10 +28,10 @@
 # It requires a host (nfshost) exporting the NFS
 - name: Creating NFS filesystem from nfshost (Linux NFS server)
   aix_filesystem:
-   device: /home/ftp
-   nfs_server: nfshost
-   filesystem: /nfs/ftp
-   state: present
+    device: /home/ftp
+    nfs_server: nfshost
+    filesystem: /nfs/ftp
+    state: present
 
 # It requires a volume group named datavg (next three actions)
 - name: Creating a logical volume testlv (aix_lvol module)
diff --git a/tests/integration/targets/alternatives/tasks/main.yml b/tests/integration/targets/alternatives/tasks/main.yml
index cd86b085d4..906463903f 100644
--- a/tests/integration/targets/alternatives/tasks/main.yml
+++ b/tests/integration/targets/alternatives/tasks/main.yml
@@ -9,60 +9,60 @@
 
 - name: 'setup: create a dummy alternative'
   block:
-  - import_tasks: setup.yml
+    - import_tasks: setup.yml
 
-  ##############
-  # Test parameters:
-  # link parameter present / absent ('with_link' variable)
-  # with / without alternatives defined in alternatives file ('with_alternatives' variable)
-  # auto / manual ('mode' variable)
+    ##############
+    # Test parameters:
+    # link parameter present / absent ('with_link' variable)
+    # with / without alternatives defined in alternatives file ('with_alternatives' variable)
+    # auto / manual ('mode' variable)
 
-  - include_tasks: tests.yml
-    with_nested:
-        - [ true, false ] # with_link
-        - [ true, false ] # with_alternatives
-        - [ 'auto', 'manual' ] # mode
-    loop_control:
-      loop_var: test_conf
+    - include_tasks: tests.yml
+      with_nested:
+        - [true, false] # with_link
+        - [true, false] # with_alternatives
+        - ['auto', 'manual'] # mode
+      loop_control:
+        loop_var: test_conf
 
-  ##########
-  # Priority
-  - block:
-    - include_tasks: remove_links.yml
-    - include_tasks: setup_test.yml
-    # at least two iterations again
-    - include_tasks: tests_set_priority.yml
-      with_sequence: start=3 end=4
-    vars:
-      with_alternatives: true
-      mode: auto
+    ##########
+    # Priority
+    - block:
+        - include_tasks: remove_links.yml
+        - include_tasks: setup_test.yml
+        # at least two iterations again
+        - include_tasks: tests_set_priority.yml
+          with_sequence: start=3 end=4
+      vars:
+        with_alternatives: true
+        mode: auto
 
-  - block:
-    - include_tasks: remove_links.yml
-    - include_tasks: setup_test.yml
-    # at least two iterations again
-    - include_tasks: tests_set_priority.yml
-      with_sequence: start=3 end=4
-    vars:
-      with_alternatives: false
-      mode: auto
+    - block:
+        - include_tasks: remove_links.yml
+        - include_tasks: setup_test.yml
+        # at least two iterations again
+        - include_tasks: tests_set_priority.yml
+          with_sequence: start=3 end=4
+      vars:
+        with_alternatives: false
+        mode: auto
 
-  # Test that path is checked: alternatives must fail when path is nonexistent
-  - import_tasks: path_is_checked.yml
+    # Test that path is checked: alternatives must fail when path is nonexistent
+    - import_tasks: path_is_checked.yml
 
-  # Test that subcommands commands work
-  - import_tasks: subcommands.yml
+    # Test that subcommands commands work
+    - import_tasks: subcommands.yml
 
-  # Test operation of the 'state' parameter
-  - block:
-    - include_tasks: remove_links.yml
-    - include_tasks: tests_state.yml
+    # Test operation of the 'state' parameter
+    - block:
+        - include_tasks: remove_links.yml
+        - include_tasks: tests_state.yml
 
-  # Test for the family parameter
-  - block:
-      - include_tasks: remove_links.yml
-      - include_tasks: tests_family.yml
-    when: ansible_os_family == 'RedHat'
+    # Test for the family parameter
+    - block:
+        - include_tasks: remove_links.yml
+        - include_tasks: tests_family.yml
+      when: ansible_os_family == 'RedHat'
 
   # Cleanup
   always:
diff --git a/tests/integration/targets/alternatives/tasks/setup.yml b/tests/integration/targets/alternatives/tasks/setup.yml
index ab2c398521..cadee7f7f2 100644
--- a/tests/integration/targets/alternatives/tasks/setup.yml
+++ b/tests/integration/targets/alternatives/tasks/setup.yml
@@ -5,11 +5,11 @@
 
 - include_vars: '{{ item }}'
   with_first_found:
-  - files:
-    - '{{ ansible_os_family }}-{{ ansible_distribution_version }}.yml'
-    - '{{ ansible_os_family }}.yml'
-    - default.yml
-    paths: ../vars
+    - files:
+        - '{{ ansible_os_family }}-{{ ansible_distribution_version }}.yml'
+        - '{{ ansible_os_family }}.yml'
+        - default.yml
+      paths: ../vars
 - template:
     src: dummy_command
     dest: /usr/bin/dummy{{ item }}
diff --git a/tests/integration/targets/alternatives/tasks/test.yml b/tests/integration/targets/alternatives/tasks/test.yml
index ca59a4b554..3445f64555 100644
--- a/tests/integration/targets/alternatives/tasks/test.yml
+++ b/tests/integration/targets/alternatives/tasks/test.yml
@@ -7,32 +7,32 @@
     msg: ' with_alternatives: {{ with_alternatives }}, mode: {{ mode }}'
 
 - block:
-  - name: set alternative (using link parameter)
-    alternatives:
-      name: dummy
-      path: '/usr/bin/dummy{{ item }}'
-      link: '/usr/bin/dummy'
-    register: alternative
+    - name: set alternative (using link parameter)
+      alternatives:
+        name: dummy
+        path: '/usr/bin/dummy{{ item }}'
+        link: '/usr/bin/dummy'
+      register: alternative
 
-  - name: check expected command was executed
-    assert:
-      that:
-        - 'alternative is successful'
-        - 'alternative is changed'
+    - name: check expected command was executed
+      assert:
+        that:
+          - 'alternative is successful'
+          - 'alternative is changed'
   when: with_link
 
 - block:
-  - name: set alternative (without link parameter)
-    alternatives:
-      name: dummy
-      path: '/usr/bin/dummy{{ item }}'
-    register: alternative
+    - name: set alternative (without link parameter)
+      alternatives:
+        name: dummy
+        path: '/usr/bin/dummy{{ item }}'
+      register: alternative
 
-  - name: check expected command was executed
-    assert:
-      that:
-        - 'alternative is successful'
-        - 'alternative is changed'
+    - name: check expected command was executed
+      assert:
+        that:
+          - 'alternative is successful'
+          - 'alternative is changed'
   when: not with_link
 
 - name: execute dummy command
diff --git a/tests/integration/targets/alternatives/tasks/tests.yml b/tests/integration/targets/alternatives/tasks/tests.yml
index 75e30cabea..63068ede54 100644
--- a/tests/integration/targets/alternatives/tasks/tests.yml
+++ b/tests/integration/targets/alternatives/tasks/tests.yml
@@ -4,13 +4,13 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 - block:
-  - include_tasks: remove_links.yml
-  - include_tasks: setup_test.yml
-  # at least two iterations:
-  # - first will use 'link currently absent',
-  # - second will receive 'link currently points to'
-  - include_tasks: test.yml
-    with_sequence: start=1 end=2
+    - include_tasks: remove_links.yml
+    - include_tasks: setup_test.yml
+    # at least two iterations:
+    # - first will use 'link currently absent',
+    # - second will receive 'link currently points to'
+    - include_tasks: test.yml
+      with_sequence: start=1 end=2
   vars:
     with_link: '{{ test_conf[0] }}'
     with_alternatives: '{{ test_conf[1] }}'
diff --git a/tests/integration/targets/android_sdk/tasks/main.yml b/tests/integration/targets/android_sdk/tasks/main.yml
index 46cf3192e1..3b49df4056 100644
--- a/tests/integration/targets/android_sdk/tasks/main.yml
+++ b/tests/integration/targets/android_sdk/tasks/main.yml
@@ -11,21 +11,21 @@
 # java >= 17 is not available in RHEL and CentOS7 repos, which is required for sdkmanager to run
 - name: Bail out if not supported
   when:
-  - "ansible_os_family == 'RedHat' and ansible_distribution_version is version('8.0', '<')"
+    - "ansible_os_family == 'RedHat' and ansible_distribution_version is version('8.0', '<')"
   ansible.builtin.meta: end_play
 
 - name: Run android_sdk tests
   environment:
     PATH: '{{ ansible_env.PATH }}:{{ android_sdk_location }}/cmdline-tools/latest/bin'
   block:
-  - import_tasks: setup.yml
+    - import_tasks: setup.yml
 
-  - name: Run default tests
-    import_tasks: default-tests.yml
-    when: ansible_os_family != 'FreeBSD'
+    - name: Run default tests
+      import_tasks: default-tests.yml
+      when: ansible_os_family != 'FreeBSD'
 
-  # Most of the important Android SDK packages are not available on FreeBSD (like, build-tools, platform-tools and so on),
-  # but at least some of the functionality can be tested (like, downloading sources)
-  - name: Run FreeBSD tests
-    import_tasks: freebsd-tests.yml
-    when: ansible_os_family == 'FreeBSD'
+    # Most of the important Android SDK packages are not available on FreeBSD (like, build-tools, platform-tools and so on),
+    # but at least some of the functionality can be tested (like, downloading sources)
+    - name: Run FreeBSD tests
+      import_tasks: freebsd-tests.yml
+      when: ansible_os_family == 'FreeBSD'
diff --git a/tests/integration/targets/android_sdk/tasks/setup.yml b/tests/integration/targets/android_sdk/tasks/setup.yml
index 108822c6da..8ded283533 100644
--- a/tests/integration/targets/android_sdk/tasks/setup.yml
+++ b/tests/integration/targets/android_sdk/tasks/setup.yml
@@ -82,7 +82,7 @@
       unarchive:
         src: "{{ commandline_tools_link }}"
         dest: "{{ android_cmdline_temp_dir }}"
-        remote_src: yes
+        remote_src: true
         creates: "{{ android_cmdline_temp_dir }}/cmdline-tools"
       when: not sdkmanager_installed.stat.exists
 
@@ -91,4 +91,4 @@
       copy:
         src: "{{ android_cmdline_temp_dir }}/cmdline-tools/"
         dest: "{{ android_sdk_location }}/cmdline-tools/latest"
-        remote_src: yes
+        remote_src: true
diff --git a/tests/integration/targets/ansible_galaxy_install/tasks/main.yml b/tests/integration/targets/ansible_galaxy_install/tasks/main.yml
index 5c4af6d167..686422c065 100644
--- a/tests/integration/targets/ansible_galaxy_install/tasks/main.yml
+++ b/tests/integration/targets/ansible_galaxy_install/tasks/main.yml
@@ -19,8 +19,8 @@
 - name: Assert collection netbox.netbox was installed
   assert:
     that:
-    - install_c0 is changed
-    - '"netbox.netbox" in install_c0.new_collections'
+      - install_c0 is changed
+      - '"netbox.netbox" in install_c0.new_collections'
 
 - name: Install collection netbox.netbox (again)
   community.general.ansible_galaxy_install:
@@ -32,7 +32,7 @@
 - name: Assert collection was not installed
   assert:
     that:
-    - install_c1 is not changed
+      - install_c1 is not changed
 
 ###################################################
 - name: Make directory install_r
@@ -50,8 +50,8 @@
 - name: Assert collection ansistrano.deploy was installed
   assert:
     that:
-    - install_r0 is changed
-    - '"ansistrano.deploy" in install_r0.new_roles'
+      - install_r0 is changed
+      - '"ansistrano.deploy" in install_r0.new_roles'
 
 - name: Install role ansistrano.deploy (again)
   community.general.ansible_galaxy_install:
@@ -63,7 +63,7 @@
 - name: Assert role was not installed
   assert:
     that:
-    - install_r1 is not changed
+      - install_r1 is not changed
 
 ###################################################
 - name: Set requirements file path
@@ -85,9 +85,9 @@
 - name: Assert requirements file was installed
   assert:
     that:
-    - install_rq0 is changed
-    - '"geerlingguy.java" in install_rq0.new_roles'
-    - '"geerlingguy.php_roles" in install_rq0.new_collections'
+      - install_rq0 is changed
+      - '"geerlingguy.java" in install_rq0.new_roles'
+      - '"geerlingguy.php_roles" in install_rq0.new_collections'
 
 - name: Install from requirements file (again)
   community.general.ansible_galaxy_install:
@@ -99,7 +99,7 @@
 - name: Assert requirements file was not installed
   assert:
     that:
-    - install_rq1 is not changed
+      - install_rq1 is not changed
 
 ###################################################
 - name: Make directory upgrade_c
@@ -117,8 +117,8 @@
 - name: Assert collection netbox.netbox was installed
   assert:
     that:
-    - upgrade_c0 is changed
-    - '"netbox.netbox" in upgrade_c0.new_collections'
+      - upgrade_c0 is changed
+      - '"netbox.netbox" in upgrade_c0.new_collections'
 
 - name: Upgrade collection netbox.netbox
   community.general.ansible_galaxy_install:
@@ -139,5 +139,5 @@
 - name: Assert collection was not installed
   assert:
     that:
-    - upgrade_c1 is changed
-    - upgrade_c2 is not changed
+      - upgrade_c1 is changed
+      - upgrade_c2 is not changed
diff --git a/tests/integration/targets/apache2_module/tasks/635-apache2-misleading-warning.yml b/tests/integration/targets/apache2_module/tasks/635-apache2-misleading-warning.yml
index 5d93a9d300..c7d140b7bc 100644
--- a/tests/integration/targets/apache2_module/tasks/635-apache2-misleading-warning.yml
+++ b/tests/integration/targets/apache2_module/tasks/635-apache2-misleading-warning.yml
@@ -15,11 +15,11 @@
 
 - assert:
     that:
-    - "'warnings' in disable_mpm_modules"
-    - disable_mpm_modules["warnings"] == [
-      "No MPM module loaded! apache2 reload AND other module actions will fail if no MPM module is loaded immediately.",
-      "No MPM module loaded! apache2 reload AND other module actions will fail if no MPM module is loaded immediately."
-      ]
+      - "'warnings' in disable_mpm_modules"
+      - disable_mpm_modules["warnings"] == [
+        "No MPM module loaded! apache2 reload AND other module actions will fail if no MPM module is loaded immediately.",
+        "No MPM module loaded! apache2 reload AND other module actions will fail if no MPM module is loaded immediately."
+        ]
 
 - name: Enable MPM event module - Revert previous change
   apache2_module:
@@ -44,4 +44,4 @@
 
 - assert:
     that:
-    - "'warnings' not in disable_mpm_modules"
+      - "'warnings' not in disable_mpm_modules"
diff --git a/tests/integration/targets/apache2_module/tasks/actualtest.yml b/tests/integration/targets/apache2_module/tasks/actualtest.yml
index 6fd10ce572..5bf66db9fb 100644
--- a/tests/integration/targets/apache2_module/tasks/actualtest.yml
+++ b/tests/integration/targets/apache2_module/tasks/actualtest.yml
@@ -67,141 +67,141 @@
 - name: Debian/Ubuntu specific tests
   when: "ansible_os_family == 'Debian'"
   block:
-  - name: force disable of autoindex  # bug #2499
-    community.general.apache2_module:
-      name: autoindex
-      state: absent
-      force: true
-
-  - name: re-enable autoindex
-    community.general.apache2_module:
-      name: autoindex
-      state: present
-
-  # mod_evasive is enabled by default upon the installation, so disable first and enable second, to preserve the config
-  - name: disable evasive module
-    community.general.apache2_module:
-      name: evasive
-      state: absent
-
-  - name: enable evasive module, test https://github.com/ansible/ansible/issues/22635
-    community.general.apache2_module:
-      name: evasive
-      state: present
-
-  - name: use identifier to enable module, fix for https://github.com/ansible/ansible/issues/33669
-    community.general.apache2_module:
-      name: dump_io
-      state: present
-    ignore_errors: true
-    register: enable_dumpio_wrong
-
-  - name: disable dump_io
-    community.general.apache2_module:
-      name: dump_io
-      identifier: dumpio_module
-      state: absent
-
-  - name: use identifier to enable module, fix for https://github.com/ansible/ansible/issues/33669
-    community.general.apache2_module:
-      name: dump_io
-      identifier: dumpio_module
-      state: present
-    register: enable_dumpio_correct_1
-
-  - name: ensure idempotency with identifier
-    community.general.apache2_module:
-      name: dump_io
-      identifier: dumpio_module
-      state: present
-    register: enable_dumpio_correct_2
-
-  - name: disable dump_io
-    community.general.apache2_module:
-      name: dump_io
-      identifier: dumpio_module
-      state: absent
-
-  - assert:
-      that:
-        - enable_dumpio_wrong is failed
-        - enable_dumpio_correct_1 is changed
-        - enable_dumpio_correct_2 is not changed
-
-  - name: disable mpm modules
-    community.general.apache2_module:
-      name: "{{ item }}"
-      state: absent
-      ignore_configcheck: true
-    with_items:
-      - mpm_worker
-      - mpm_event
-      - mpm_prefork
-
-  - name: enabled mpm_event
-    community.general.apache2_module:
-      name: mpm_event
-      state: present
-      ignore_configcheck: true
-    register: enabledmpmevent
-
-  - name: ensure changed mpm_event
-    assert:
-      that:
-        - 'enabledmpmevent.changed'
-
-  - name: switch between mpm_event and mpm_worker
-    community.general.apache2_module:
-      name: "{{ item.name }}"
-      state: "{{ item.state }}"
-      ignore_configcheck: true
-    with_items:
-      - name: mpm_event
+    - name: force disable of autoindex  # bug #2499
+      community.general.apache2_module:
+        name: autoindex
         state: absent
-      - name: mpm_worker
+        force: true
+
+    - name: re-enable autoindex
+      community.general.apache2_module:
+        name: autoindex
         state: present
 
-  - name: ensure mpm_worker is already enabled
-    community.general.apache2_module:
-      name: mpm_worker
-      state: present
-    register: enabledmpmworker
+    # mod_evasive is enabled by default upon the installation, so disable first and enable second, to preserve the config
+    - name: disable evasive module
+      community.general.apache2_module:
+        name: evasive
+        state: absent
 
-  - name: ensure mpm_worker unchanged
-    assert:
-      that:
-        - 'not enabledmpmworker.changed'
+    - name: enable evasive module, test https://github.com/ansible/ansible/issues/22635
+      community.general.apache2_module:
+        name: evasive
+        state: present
 
-  - name: try to disable all mpm modules with configcheck
-    community.general.apache2_module:
-      name: "{{item}}"
-      state: absent
-    with_items:
-      - mpm_worker
-      - mpm_event
-      - mpm_prefork
-    ignore_errors: true
-    register: remove_with_configcheck
+    - name: use identifier to enable module, fix for https://github.com/ansible/ansible/issues/33669
+      community.general.apache2_module:
+        name: dump_io
+        state: present
+      ignore_errors: true
+      register: enable_dumpio_wrong
 
-  - name: ensure configcheck fails task with when run without mpm modules
-    assert:
-      that:
-        - "{{ item.failed }}"
-    with_items: "{{ remove_with_configcheck.results }}"
+    - name: disable dump_io
+      community.general.apache2_module:
+        name: dump_io
+        identifier: dumpio_module
+        state: absent
 
-  - name: try to disable all mpm modules without configcheck
-    community.general.apache2_module:
-      name: "{{item}}"
-      state: absent
-      ignore_configcheck: true
-    with_items:
-      - mpm_worker
-      - mpm_event
-      - mpm_prefork
+    - name: use identifier to enable module, fix for https://github.com/ansible/ansible/issues/33669
+      community.general.apache2_module:
+        name: dump_io
+        identifier: dumpio_module
+        state: present
+      register: enable_dumpio_correct_1
 
-  - name: enabled mpm_event to restore previous state
-    community.general.apache2_module:
-      name: mpm_event
-      state: present
-      ignore_configcheck: true
-    register: enabledmpmevent
+    - name: ensure idempotency with identifier
+      community.general.apache2_module:
+        name: dump_io
+        identifier: dumpio_module
+        state: present
+      register: enable_dumpio_correct_2
+
+    - name: disable dump_io
+      community.general.apache2_module:
+        name: dump_io
+        identifier: dumpio_module
+        state: absent
+
+    - assert:
+        that:
+          - enable_dumpio_wrong is failed
+          - enable_dumpio_correct_1 is changed
+          - enable_dumpio_correct_2 is not changed
+
+    - name: disable mpm modules
+      community.general.apache2_module:
+        name: "{{ item }}"
+        state: absent
+        ignore_configcheck: true
+      with_items:
+        - mpm_worker
+        - mpm_event
+        - mpm_prefork
+
+    - name: enabled mpm_event
+      community.general.apache2_module:
+        name: mpm_event
+        state: present
+        ignore_configcheck: true
+      register: enabledmpmevent
+
+    - name: ensure changed mpm_event
+      assert:
+        that:
+          - 'enabledmpmevent.changed'
+
+    - name: switch between mpm_event and mpm_worker
+      community.general.apache2_module:
+        name: "{{ item.name }}"
+        state: "{{ item.state }}"
+        ignore_configcheck: true
+      with_items:
+        - name: mpm_event
+          state: absent
+        - name: mpm_worker
+          state: present
+
+    - name: ensure mpm_worker is already enabled
+      community.general.apache2_module:
+        name: mpm_worker
+        state: present
+      register: enabledmpmworker
+
+    - name: ensure mpm_worker unchanged
+      assert:
+        that:
+          - 'not enabledmpmworker.changed'
+
+    - name: try to disable all mpm modules with configcheck
+      community.general.apache2_module:
+        name: "{{item}}"
+        state: absent
+      with_items:
+        - mpm_worker
+        - mpm_event
+        - mpm_prefork
+      ignore_errors: true
+      register: remove_with_configcheck
+
+    - name: ensure configcheck fails task with when run without mpm modules
+      assert:
+        that:
+          - "{{ item.failed }}"
+      with_items: "{{ remove_with_configcheck.results }}"
+
+    - name: try to disable all mpm modules without configcheck
+      community.general.apache2_module:
+        name: "{{item}}"
+        state: absent
+        ignore_configcheck: true
+      with_items:
+        - mpm_worker
+        - mpm_event
+        - mpm_prefork
+
+    - name: enabled mpm_event to restore previous state
+      community.general.apache2_module:
+        name: mpm_event
+        state: present
+        ignore_configcheck: true
+      register: enabledmpmevent
diff --git a/tests/integration/targets/btrfs_subvolume/defaults/main.yml b/tests/integration/targets/btrfs_subvolume/defaults/main.yml
index 52c88d5de1..fad7fb401a 100644
--- a/tests/integration/targets/btrfs_subvolume/defaults/main.yml
+++ b/tests/integration/targets/btrfs_subvolume/defaults/main.yml
@@ -4,15 +4,15 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 btrfs_subvolume_single_configs:
-- file: "/tmp/disks0.img"
-  loop: "/dev/loop95"
+  - file: "/tmp/disks0.img"
+    loop: "/dev/loop95"
 btrfs_subvolume_multiple_configs:
-- file: "/tmp/diskm0.img"
-  loop: "/dev/loop97"
-- file: "/tmp/diskm1.img"
-  loop: "/dev/loop98"
-- file: "/tmp/diskm2.img"
-  loop: "/dev/loop99"
+  - file: "/tmp/diskm0.img"
+    loop: "/dev/loop97"
+  - file: "/tmp/diskm1.img"
+    loop: "/dev/loop98"
+  - file: "/tmp/diskm2.img"
+    loop: "/dev/loop99"
 btrfs_subvolume_configs: "{{ btrfs_subvolume_single_configs + btrfs_subvolume_multiple_configs }}"
 btrfs_subvolume_single_devices: "{{ btrfs_subvolume_single_configs | map(attribute='loop') }}"
 btrfs_subvolume_single_label: "single"
diff --git a/tests/integration/targets/btrfs_subvolume/tasks/main.yml b/tests/integration/targets/btrfs_subvolume/tasks/main.yml
index d472704401..f97b6643a8 100644
--- a/tests/integration/targets/btrfs_subvolume/tasks/main.yml
+++ b/tests/integration/targets/btrfs_subvolume/tasks/main.yml
@@ -8,22 +8,22 @@
     name:
       - btrfs-progs # btrfs userspace
       - util-linux # losetup
-  ignore_errors: True
+  ignore_errors: true
   register: btrfs_installed
 
 - name: Execute integration tests tests
   block:
-  - ansible.builtin.include_tasks: 'setup.yml'
+    - ansible.builtin.include_tasks: 'setup.yml'
 
-  - name: "Execute test scenario for single device filesystem"
-    ansible.builtin.include_tasks: 'run_filesystem_tests.yml'
-    vars:
-      btrfs_subvolume_target_device: "{{ btrfs_subvolume_single_devices | first }}"
-      btrfs_subvolume_target_label: "{{ btrfs_subvolume_single_label }}"
+    - name: "Execute test scenario for single device filesystem"
+      ansible.builtin.include_tasks: 'run_filesystem_tests.yml'
+      vars:
+        btrfs_subvolume_target_device: "{{ btrfs_subvolume_single_devices | first }}"
+        btrfs_subvolume_target_label: "{{ btrfs_subvolume_single_label }}"
 
-  - name: "Execute test scenario for multiple device configuration"
-    ansible.builtin.include_tasks: 'run_filesystem_tests.yml'
-    vars:
-      btrfs_subvolume_target_device: "{{ btrfs_subvolume_multiple_devices | first }}"
-      btrfs_subvolume_target_label: "{{ btrfs_subvolume_multiple_label }}"
+    - name: "Execute test scenario for multiple device configuration"
+      ansible.builtin.include_tasks: 'run_filesystem_tests.yml'
+      vars:
+        btrfs_subvolume_target_device: "{{ btrfs_subvolume_multiple_devices | first }}"
+        btrfs_subvolume_target_label: "{{ btrfs_subvolume_multiple_label }}"
   when: btrfs_installed is success
diff --git a/tests/integration/targets/btrfs_subvolume/tasks/run_filesystem_tests.yml b/tests/integration/targets/btrfs_subvolume/tasks/run_filesystem_tests.yml
index 0ea3fa6660..137f97a235 100644
--- a/tests/integration/targets/btrfs_subvolume/tasks/run_filesystem_tests.yml
+++ b/tests/integration/targets/btrfs_subvolume/tasks/run_filesystem_tests.yml
@@ -10,23 +10,23 @@
 
 - name: "Execute test scenarios where non-root subvolume is mounted"
   block:
-  - name: Create subvolume '/nonroot'
-    community.general.btrfs_subvolume:
-      automount: Yes
-      name: "/nonroot"
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      state: "present"
-    register: nonroot
-  - name: "Mount subvolume '/nonroot'"
-    ansible.posix.mount:
-      src: "{{ nonroot.filesystem.devices | first }}"
-      path: /mnt
-      opts: "subvolid={{ nonroot.target_subvolume_id }}"
-      fstype: btrfs
-      state: mounted
-  - name: "Run tests for explicit, mounted single device configuration"
-    ansible.builtin.include_tasks: 'run_common_tests.yml'
-  - name: "Unmount subvolume /nonroot"
-    ansible.posix.mount:
-      path: /mnt
-      state: absent
+    - name: Create subvolume '/nonroot'
+      community.general.btrfs_subvolume:
+        automount: true
+        name: "/nonroot"
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        state: "present"
+      register: nonroot
+    - name: "Mount subvolume '/nonroot'"
+      ansible.posix.mount:
+        src: "{{ nonroot.filesystem.devices | first }}"
+        path: /mnt
+        opts: "subvolid={{ nonroot.target_subvolume_id }}"
+        fstype: btrfs
+        state: mounted
+    - name: "Run tests for explicit, mounted single device configuration"
+      ansible.builtin.include_tasks: 'run_common_tests.yml'
+    - name: "Unmount subvolume /nonroot"
+      ansible.posix.mount:
+        path: /mnt
+        state: absent
diff --git a/tests/integration/targets/btrfs_subvolume/tasks/setup.yml b/tests/integration/targets/btrfs_subvolume/tasks/setup.yml
index f5bbdf9c54..f5d03a1779 100644
--- a/tests/integration/targets/btrfs_subvolume/tasks/setup.yml
+++ b/tests/integration/targets/btrfs_subvolume/tasks/setup.yml
@@ -18,12 +18,12 @@
 - name: Create single device btrfs filesystem
   ansible.builtin.command:
     cmd: "mkfs.btrfs --label {{ btrfs_subvolume_single_label }} -f {{ btrfs_subvolume_single_devices | first }}"
-  changed_when: True
+  changed_when: true
 
 - name: Create multiple device btrfs filesystem
   ansible.builtin.command:
     cmd: "mkfs.btrfs --label {{ btrfs_subvolume_multiple_label }} -f -d raid0 {{ btrfs_subvolume_multiple_devices | join(' ') }}"
-  changed_when: True
+  changed_when: true
 
 # Typically created by udev, but apparently missing on Alpine
 - name: Create btrfs control device node
@@ -34,4 +34,4 @@
 - name: Force rescan to ensure all device are detected
   ansible.builtin.command:
     cmd: "btrfs device scan"
-  changed_when: True
+  changed_when: true
diff --git a/tests/integration/targets/btrfs_subvolume/tasks/test_filesystem_matching.yml b/tests/integration/targets/btrfs_subvolume/tasks/test_filesystem_matching.yml
index 2455eeacf1..b00c033bcf 100644
--- a/tests/integration/targets/btrfs_subvolume/tasks/test_filesystem_matching.yml
+++ b/tests/integration/targets/btrfs_subvolume/tasks/test_filesystem_matching.yml
@@ -5,76 +5,76 @@
 
 - name: "Match targeted filesystem by label"
   block:
-  - name: Match '{{ btrfs_subvolume_target_label }}' filesystem by label
-    community.general.btrfs_subvolume:
-      automount: Yes
-      name: "/match_label"
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      state: "present"
-    register: result
+    - name: Match '{{ btrfs_subvolume_target_label }}' filesystem by label
+      community.general.btrfs_subvolume:
+        automount: true
+        name: "/match_label"
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        state: "present"
+      register: result
 
-  - name: Validate the '{{ btrfs_subvolume_target_label }}' filesystem was chosen
-    ansible.builtin.assert:
-      that:
-        - result.filesystem.label == btrfs_subvolume_target_label
+    - name: Validate the '{{ btrfs_subvolume_target_label }}' filesystem was chosen
+      ansible.builtin.assert:
+        that:
+          - result.filesystem.label == btrfs_subvolume_target_label
 
 - name: "Match targeted filesystem by uuid"
   block:
-  - name: Match '{{ btrfs_subvolume_target_label }}' filesystem by uuid
-    community.general.btrfs_subvolume:
-      automount: Yes
-      name: "/match_uuid"
-      filesystem_uuid: "{{ result.filesystem.uuid }}"
-      state: "present"
-    register: result
+    - name: Match '{{ btrfs_subvolume_target_label }}' filesystem by uuid
+      community.general.btrfs_subvolume:
+        automount: true
+        name: "/match_uuid"
+        filesystem_uuid: "{{ result.filesystem.uuid }}"
+        state: "present"
+      register: result
 
-  - name: Validate the '{{ btrfs_subvolume_target_label }}' filesystem was chosen
-    ansible.builtin.assert:
-      that:
-        - result.filesystem.label == btrfs_subvolume_target_label
+    - name: Validate the '{{ btrfs_subvolume_target_label }}' filesystem was chosen
+      ansible.builtin.assert:
+        that:
+          - result.filesystem.label == btrfs_subvolume_target_label
 
 - name: "Match targeted filesystem by devices"
   block:
-  - name: Match '{{ btrfs_subvolume_target_label }}' filesystem by device
-    community.general.btrfs_subvolume:
-      automount: Yes
-      name: "/match_device"
-      filesystem_device: "{{ result.filesystem.devices | first }}"
-      state: "present"
-    register: result
+    - name: Match '{{ btrfs_subvolume_target_label }}' filesystem by device
+      community.general.btrfs_subvolume:
+        automount: true
+        name: "/match_device"
+        filesystem_device: "{{ result.filesystem.devices | first }}"
+        state: "present"
+      register: result
 
-  - name: Validate the '{{ btrfs_subvolume_target_label }}' filesystem was chosen
-    ansible.builtin.assert:
-      that:
-        - result.filesystem.label == btrfs_subvolume_target_label
+    - name: Validate the '{{ btrfs_subvolume_target_label }}' filesystem was chosen
+      ansible.builtin.assert:
+        that:
+          - result.filesystem.label == btrfs_subvolume_target_label
 
 - name: "Match only mounted filesystem"
   block:
-  - name: "Mount filesystem '{{ btrfs_subvolume_target_label }}'"
-    ansible.posix.mount:
-      src: "{{ result.filesystem.devices | first }}"
-      path: /mnt
-      opts: "subvolid={{ 5 }}"
-      fstype: btrfs
-      state: mounted
+    - name: "Mount filesystem '{{ btrfs_subvolume_target_label }}'"
+      ansible.posix.mount:
+        src: "{{ result.filesystem.devices | first }}"
+        path: /mnt
+        opts: "subvolid={{ 5 }}"
+        fstype: btrfs
+        state: mounted
 
-  - name: Print current status
-    community.general.btrfs_info:
+    - name: Print current status
+      community.general.btrfs_info:
 
-  - name: Match '{{ btrfs_subvolume_target_label }}' filesystem when only mount
-    community.general.btrfs_subvolume:
-      automount: Yes
-      name: "/match_only_mounted"
-      state: "present"
-    register: result
+    - name: Match '{{ btrfs_subvolume_target_label }}' filesystem when only mount
+      community.general.btrfs_subvolume:
+        automount: true
+        name: "/match_only_mounted"
+        state: "present"
+      register: result
 
-  - name: "Unmount filesystem '{{ btrfs_subvolume_target_label }}'"
-    ansible.posix.mount:
-      path: /mnt
-      state: absent
+    - name: "Unmount filesystem '{{ btrfs_subvolume_target_label }}'"
+      ansible.posix.mount:
+        path: /mnt
+        state: absent
 
-  - name: Validate the '{{ btrfs_subvolume_target_label }}' filesystem was chosen
-    ansible.builtin.assert:
-      that:
-        - result.filesystem.label == btrfs_subvolume_target_label
-  when: False  # TODO don't attempt this if the host already has a pre-existing btrfs filesystem
+    - name: Validate the '{{ btrfs_subvolume_target_label }}' filesystem was chosen
+      ansible.builtin.assert:
+        that:
+          - result.filesystem.label == btrfs_subvolume_target_label
+  when: false  # TODO don't attempt this if the host already has a pre-existing btrfs filesystem
diff --git a/tests/integration/targets/btrfs_subvolume/tasks/test_snapshot_clobber.yml b/tests/integration/targets/btrfs_subvolume/tasks/test_snapshot_clobber.yml
index ce25a999ba..f0224b23f1 100644
--- a/tests/integration/targets/btrfs_subvolume/tasks/test_snapshot_clobber.yml
+++ b/tests/integration/targets/btrfs_subvolume/tasks/test_snapshot_clobber.yml
@@ -5,37 +5,37 @@
 
 - name: Create a snapshot, overwriting if one already exists at path
   block:
-  - name: Create a snapshot named 'snapshot_clobber'
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/snapshot_clobber"
-      snapshot_source: "/"
-      snapshot_conflict: "clobber"
-      state: "present"
-    register: result
-  - name: Snapshot 'snapshot_clobber' created
-    ansible.builtin.assert:
-      that:
-      - result is changed
+    - name: Create a snapshot named 'snapshot_clobber'
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/snapshot_clobber"
+        snapshot_source: "/"
+        snapshot_conflict: "clobber"
+        state: "present"
+      register: result
+    - name: Snapshot 'snapshot_clobber' created
+      ansible.builtin.assert:
+        that:
+          - result is changed
 
-  - name: Create a snapshot named 'snapshot_clobber' (no idempotency)
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/snapshot_clobber"
-      snapshot_source: "/"
-      snapshot_conflict: "clobber"
-      state: "present"
-    register: result
-  - name: Snapshot 'snapshot_clobber' created (no idempotency)
-    ansible.builtin.assert:
-      that:
-      - result is changed
+    - name: Create a snapshot named 'snapshot_clobber' (no idempotency)
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/snapshot_clobber"
+        snapshot_source: "/"
+        snapshot_conflict: "clobber"
+        state: "present"
+      register: result
+    - name: Snapshot 'snapshot_clobber' created (no idempotency)
+      ansible.builtin.assert:
+        that:
+          - result is changed
 
 - name: Cleanup created snapshot
   community.general.btrfs_subvolume:
-    automount: Yes
+    automount: true
     filesystem_label: "{{ btrfs_subvolume_target_label }}"
     name: "/snapshot_clobber"
     state: "absent"
diff --git a/tests/integration/targets/btrfs_subvolume/tasks/test_snapshot_error.yml b/tests/integration/targets/btrfs_subvolume/tasks/test_snapshot_error.yml
index 49d928b74c..1399acfd4b 100644
--- a/tests/integration/targets/btrfs_subvolume/tasks/test_snapshot_error.yml
+++ b/tests/integration/targets/btrfs_subvolume/tasks/test_snapshot_error.yml
@@ -5,38 +5,38 @@
 
 - name: Create a snapshot, erroring if one already exists at path
   block:
-  - name: Create a snapshot named 'snapshot_error'
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/snapshot_error"
-      snapshot_source: "/"
-      snapshot_conflict: "error"
-      state: "present"
-    register: result
-  - name: Snapshot 'snapshot_error' created
-    ansible.builtin.assert:
-      that:
-      - result is changed
+    - name: Create a snapshot named 'snapshot_error'
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/snapshot_error"
+        snapshot_source: "/"
+        snapshot_conflict: "error"
+        state: "present"
+      register: result
+    - name: Snapshot 'snapshot_error' created
+      ansible.builtin.assert:
+        that:
+          - result is changed
 
-  - name: Create a snapshot named 'snapshot_error' (no idempotency)
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/snapshot_error"
-      snapshot_source: "/"
-      snapshot_conflict: "error"
-      state: "present"
-    register: result
-    ignore_errors: true
-  - name: Snapshot 'snapshot_error' created (no idempotency)
-    ansible.builtin.assert:
-      that:
-      - result is not changed
+    - name: Create a snapshot named 'snapshot_error' (no idempotency)
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/snapshot_error"
+        snapshot_source: "/"
+        snapshot_conflict: "error"
+        state: "present"
+      register: result
+      ignore_errors: true
+    - name: Snapshot 'snapshot_error' created (no idempotency)
+      ansible.builtin.assert:
+        that:
+          - result is not changed
 
 - name: Cleanup created snapshot
   community.general.btrfs_subvolume:
-    automount: Yes
+    automount: true
     filesystem_label: "{{ btrfs_subvolume_target_label }}"
     name: "/snapshot_error"
     state: "absent"
diff --git a/tests/integration/targets/btrfs_subvolume/tasks/test_snapshot_skip.yml b/tests/integration/targets/btrfs_subvolume/tasks/test_snapshot_skip.yml
index 07e65b133c..33cd46ecce 100644
--- a/tests/integration/targets/btrfs_subvolume/tasks/test_snapshot_skip.yml
+++ b/tests/integration/targets/btrfs_subvolume/tasks/test_snapshot_skip.yml
@@ -5,37 +5,37 @@
 
 - name: Create a snapshot if one does not already exist at path
   block:
-  - name: Create a snapshot named 'snapshot_skip'
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/snapshot_skip"
-      snapshot_source: "/"
-      snapshot_conflict: "skip"
-      state: "present"
-    register: result
-  - name: Snapshot 'snapshot_skip' created
-    ansible.builtin.assert:
-      that:
-      - result is changed
+    - name: Create a snapshot named 'snapshot_skip'
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/snapshot_skip"
+        snapshot_source: "/"
+        snapshot_conflict: "skip"
+        state: "present"
+      register: result
+    - name: Snapshot 'snapshot_skip' created
+      ansible.builtin.assert:
+        that:
+          - result is changed
 
-  - name: Create a snapshot named 'snapshot_skip' (idempotency)
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/snapshot_skip"
-      snapshot_source: "/"
-      snapshot_conflict: "skip"
-      state: "present"
-    register: result
-  - name: Snapshot 'snapshot_skip' created (idempotency)
-    ansible.builtin.assert:
-      that:
-      - result is not changed
+    - name: Create a snapshot named 'snapshot_skip' (idempotency)
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/snapshot_skip"
+        snapshot_source: "/"
+        snapshot_conflict: "skip"
+        state: "present"
+      register: result
+    - name: Snapshot 'snapshot_skip' created (idempotency)
+      ansible.builtin.assert:
+        that:
+          - result is not changed
 
 - name: Cleanup created snapshot
   community.general.btrfs_subvolume:
-    automount: Yes
+    automount: true
     filesystem_label: "{{ btrfs_subvolume_target_label }}"
     name: "/snapshot_skip"
     state: "absent"
diff --git a/tests/integration/targets/btrfs_subvolume/tasks/test_subvolume_default.yml b/tests/integration/targets/btrfs_subvolume/tasks/test_subvolume_default.yml
index f6eed93878..a506d56129 100644
--- a/tests/integration/targets/btrfs_subvolume/tasks/test_subvolume_default.yml
+++ b/tests/integration/targets/btrfs_subvolume/tasks/test_subvolume_default.yml
@@ -5,95 +5,95 @@
 
 - name: Change the default subvolume
   block:
-  - name: Update filesystem default subvolume to '@'
-    community.general.btrfs_subvolume:
-      automount: Yes
-      default: True
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/@"
-      state: "present"
-    register: result
-  - name: Subvolume '@' set to default
-    ansible.builtin.assert:
-      that:
-      - result is changed
-  - name: Update filesystem default subvolume to '@' (idempotency)
-    community.general.btrfs_subvolume:
-      automount: Yes
-      default: True
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/@"
-      state: "present"
-    register: result
-  - name: Subvolume '@' set to default (idempotency)
-    ansible.builtin.assert:
-      that:
-      - result is not changed
+    - name: Update filesystem default subvolume to '@'
+      community.general.btrfs_subvolume:
+        automount: true
+        default: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/@"
+        state: "present"
+      register: result
+    - name: Subvolume '@' set to default
+      ansible.builtin.assert:
+        that:
+          - result is changed
+    - name: Update filesystem default subvolume to '@' (idempotency)
+      community.general.btrfs_subvolume:
+        automount: true
+        default: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/@"
+        state: "present"
+      register: result
+    - name: Subvolume '@' set to default (idempotency)
+      ansible.builtin.assert:
+        that:
+          - result is not changed
 
 - name: Revert the default subvolume
   block:
-  - name: Revert filesystem default subvolume to '/'
-    community.general.btrfs_subvolume:
-      automount: Yes
-      default: True
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/"
-      state: "present"
-    register: result
-  - name: Subvolume '/' set to default
-    ansible.builtin.assert:
-      that:
-      - result is changed
-  - name: Revert filesystem default subvolume to '/' (idempotency)
-    community.general.btrfs_subvolume:
-      automount: Yes
-      default: True
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/"
-      state: "present"
-    register: result
-  - name: Subvolume '/' set to default (idempotency)
-    ansible.builtin.assert:
-      that:
-      - result is not changed
+    - name: Revert filesystem default subvolume to '/'
+      community.general.btrfs_subvolume:
+        automount: true
+        default: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/"
+        state: "present"
+      register: result
+    - name: Subvolume '/' set to default
+      ansible.builtin.assert:
+        that:
+          - result is changed
+    - name: Revert filesystem default subvolume to '/' (idempotency)
+      community.general.btrfs_subvolume:
+        automount: true
+        default: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/"
+        state: "present"
+      register: result
+    - name: Subvolume '/' set to default (idempotency)
+      ansible.builtin.assert:
+        that:
+          - result is not changed
 
 
 - name: Change the default subvolume again
   block:
-  - name: Update filesystem default subvolume to '@'
-    community.general.btrfs_subvolume:
-      automount: Yes
-      default: True
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/@"
-      state: "present"
-    register: result
-  - name: Subvolume '@' set to default
-    ansible.builtin.assert:
-      that:
-      - result is changed
+    - name: Update filesystem default subvolume to '@'
+      community.general.btrfs_subvolume:
+        automount: true
+        default: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/@"
+        state: "present"
+      register: result
+    - name: Subvolume '@' set to default
+      ansible.builtin.assert:
+        that:
+          - result is changed
 
 - name: Revert custom default subvolume to fs_tree root when deleted
   block:
-  - name: Delete custom default subvolume '@'
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/@"
-      state: "absent"
-    register: result
-  - name: Subvolume '@' deleted
-    ansible.builtin.assert:
-      that:
-      - result is changed
-  - name: Delete custom default subvolume '@' (idempotency)
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/@"
-      state: "absent"
-    register: result
-  - name: Subvolume '@' deleted (idempotency)
-    ansible.builtin.assert:
-      that:
-      - result is not changed
+    - name: Delete custom default subvolume '@'
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/@"
+        state: "absent"
+      register: result
+    - name: Subvolume '@' deleted
+      ansible.builtin.assert:
+        that:
+          - result is changed
+    - name: Delete custom default subvolume '@' (idempotency)
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/@"
+        state: "absent"
+      register: result
+    - name: Subvolume '@' deleted (idempotency)
+      ansible.builtin.assert:
+        that:
+          - result is not changed
diff --git a/tests/integration/targets/btrfs_subvolume/tasks/test_subvolume_nested.yml b/tests/integration/targets/btrfs_subvolume/tasks/test_subvolume_nested.yml
index b706bf72a8..a5c152f9ef 100644
--- a/tests/integration/targets/btrfs_subvolume/tasks/test_subvolume_nested.yml
+++ b/tests/integration/targets/btrfs_subvolume/tasks/test_subvolume_nested.yml
@@ -5,57 +5,57 @@
 
 - name: Create parent subvolume 'container'
   community.general.btrfs_subvolume:
-    automount: Yes
+    automount: true
     filesystem_label: "{{ btrfs_subvolume_target_label }}"
     name: "/container"
     state: "present"
 
 - name: Create a nested subvolume
   block:
-  - name: Create a subvolume named 'nested' inside 'container'
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/container/nested"
-      state: "present"
-    register: result
-  - name: Subvolume 'container/nested' created
-    ansible.builtin.assert:
-      that:
-      - result is changed
-  - name: Create a subvolume named 'nested' inside 'container' (idempotency)
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/container/nested"
-      state: "present"
-    register: result
-  - name: Subvolume 'container/nested' created (idempotency)
-    ansible.builtin.assert:
-      that:
-      - result is not changed
+    - name: Create a subvolume named 'nested' inside 'container'
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/container/nested"
+        state: "present"
+      register: result
+    - name: Subvolume 'container/nested' created
+      ansible.builtin.assert:
+        that:
+          - result is changed
+    - name: Create a subvolume named 'nested' inside 'container' (idempotency)
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/container/nested"
+        state: "present"
+      register: result
+    - name: Subvolume 'container/nested' created (idempotency)
+      ansible.builtin.assert:
+        that:
+          - result is not changed
 
 - name: Remove a nested subvolume
   block:
-  - name: Remove a subvolume named 'nested' inside 'container'
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/container/nested"
-      state: "absent"
-    register: result
-  - name: Subvolume 'container/nested' removed
-    ansible.builtin.assert:
-      that:
-      - result is changed
-  - name: Remove a subvolume named 'nested' inside 'container' (idempotency)
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/container/nested"
-      state: "absent"
-    register: result
-  - name: Subvolume 'container/nested' removed (idempotency)
-    ansible.builtin.assert:
-      that:
-      - result is not changed
+    - name: Remove a subvolume named 'nested' inside 'container'
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/container/nested"
+        state: "absent"
+      register: result
+    - name: Subvolume 'container/nested' removed
+      ansible.builtin.assert:
+        that:
+          - result is changed
+    - name: Remove a subvolume named 'nested' inside 'container' (idempotency)
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/container/nested"
+        state: "absent"
+      register: result
+    - name: Subvolume 'container/nested' removed (idempotency)
+      ansible.builtin.assert:
+        that:
+          - result is not changed
diff --git a/tests/integration/targets/btrfs_subvolume/tasks/test_subvolume_recursive.yml b/tests/integration/targets/btrfs_subvolume/tasks/test_subvolume_recursive.yml
index 7e9f990070..a0b86a11ac 100644
--- a/tests/integration/targets/btrfs_subvolume/tasks/test_subvolume_recursive.yml
+++ b/tests/integration/targets/btrfs_subvolume/tasks/test_subvolume_recursive.yml
@@ -5,82 +5,82 @@
 
 - name: Recursively create subvolumes
   block:
-  - name: Create a subvolume named '/recursive/son/grandson'
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/recursive/son/grandson"
-      recursive: Yes
-      state: "present"
-    register: result
-  - name: Subvolume named '/recursive/son/grandson' created
-    ansible.builtin.assert:
-      that:
-      - result is changed
+    - name: Create a subvolume named '/recursive/son/grandson'
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/recursive/son/grandson"
+        recursive: true
+        state: "present"
+      register: result
+    - name: Subvolume named '/recursive/son/grandson' created
+      ansible.builtin.assert:
+        that:
+          - result is changed
 
-  - name: Create a subvolume named '/recursive/son/grandson' (idempotency)
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/recursive/son/grandson"
-      recursive: Yes
-      state: "present"
-    register: result
-  - name: Subvolume named '/recursive/son/grandson' created (idempotency)
-    ansible.builtin.assert:
-      that:
-      - result is not changed
+    - name: Create a subvolume named '/recursive/son/grandson' (idempotency)
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/recursive/son/grandson"
+        recursive: true
+        state: "present"
+      register: result
+    - name: Subvolume named '/recursive/son/grandson' created (idempotency)
+      ansible.builtin.assert:
+        that:
+          - result is not changed
 
-  - name: Create a subvolume named '/recursive/daughter/granddaughter'
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/recursive/daughter/granddaughter"
-      recursive: Yes
-      state: "present"
-    register: result
-  - name: Subvolume named '/recursive/son/grandson' created
-    ansible.builtin.assert:
-      that:
-      - result is changed
+    - name: Create a subvolume named '/recursive/daughter/granddaughter'
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/recursive/daughter/granddaughter"
+        recursive: true
+        state: "present"
+      register: result
+    - name: Subvolume named '/recursive/son/grandson' created
+      ansible.builtin.assert:
+        that:
+          - result is changed
 
-  - name: Create a subvolume named '/recursive/daughter/granddaughter' (idempotency)
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/recursive/daughter/granddaughter"
-      recursive: Yes
-      state: "present"
-    register: result
-  - name: Subvolume named '/recursive/son/grandson' created (idempotency)
-    ansible.builtin.assert:
-      that:
-      - result is not changed
+    - name: Create a subvolume named '/recursive/daughter/granddaughter' (idempotency)
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/recursive/daughter/granddaughter"
+        recursive: true
+        state: "present"
+      register: result
+    - name: Subvolume named '/recursive/son/grandson' created (idempotency)
+      ansible.builtin.assert:
+        that:
+          - result is not changed
 
 - name: Recursively remove subvolumes
   block:
-  - name: Remove subvolume '/recursive' and all descendents
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/recursive"
-      recursive: Yes
-      state: "absent"
-    register: result
-  - name: Subvolume '/recursive' removed
-    ansible.builtin.assert:
-      that:
-      - result is changed
+    - name: Remove subvolume '/recursive' and all descendents
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/recursive"
+        recursive: true
+        state: "absent"
+      register: result
+    - name: Subvolume '/recursive' removed
+      ansible.builtin.assert:
+        that:
+          - result is changed
 
-  - name: Remove subvolume '/recursive' and all descendents (idempotency)
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/recursive"
-      recursive: Yes
-      state: "absent"
-    register: result
-  - name: Subvolume '/recursive' removed (idempotency)
-    ansible.builtin.assert:
-      that:
-      - result is not changed
+    - name: Remove subvolume '/recursive' and all descendents (idempotency)
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/recursive"
+        recursive: true
+        state: "absent"
+      register: result
+    - name: Subvolume '/recursive' removed (idempotency)
+      ansible.builtin.assert:
+        that:
+          - result is not changed
diff --git a/tests/integration/targets/btrfs_subvolume/tasks/test_subvolume_simple.yml b/tests/integration/targets/btrfs_subvolume/tasks/test_subvolume_simple.yml
index 6cd214e747..bde385aecd 100644
--- a/tests/integration/targets/btrfs_subvolume/tasks/test_subvolume_simple.yml
+++ b/tests/integration/targets/btrfs_subvolume/tasks/test_subvolume_simple.yml
@@ -5,50 +5,50 @@
 
 - name: Create a simple subvolume
   block:
-  - name: Create a subvolume named 'simple'
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/simple"
-      state: "present"
-    register: result
-  - name: Subvolume named 'simple' created
-    ansible.builtin.assert:
-      that:
-      - result is changed
-  - name: Create a subvolume named 'simple' (idempotency)
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/simple"
-      state: "present"
-    register: result
-  - name: Subvolume named 'simple' created (idempotency)
-    ansible.builtin.assert:
-      that:
-      - result is not changed
+    - name: Create a subvolume named 'simple'
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/simple"
+        state: "present"
+      register: result
+    - name: Subvolume named 'simple' created
+      ansible.builtin.assert:
+        that:
+          - result is changed
+    - name: Create a subvolume named 'simple' (idempotency)
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/simple"
+        state: "present"
+      register: result
+    - name: Subvolume named 'simple' created (idempotency)
+      ansible.builtin.assert:
+        that:
+          - result is not changed
 
 - name: Remove a simple subvolume
   block:
-  - name: Remove a subvolume named 'simple'
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/simple"
-      state: "absent"
-    register: result
-  - name: Subvolume named 'simple' removed
-    ansible.builtin.assert:
-      that:
-      - result is changed
-  - name: Remove a subvolume named 'simple' (idempotency)
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/simple"
-      state: "absent"
-    register: result
-  - name: Subvolume named 'simple' removed (idempotency)
-    ansible.builtin.assert:
-      that:
-      - result is not changed
+    - name: Remove a subvolume named 'simple'
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/simple"
+        state: "absent"
+      register: result
+    - name: Subvolume named 'simple' removed
+      ansible.builtin.assert:
+        that:
+          - result is changed
+    - name: Remove a subvolume named 'simple' (idempotency)
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/simple"
+        state: "absent"
+      register: result
+    - name: Subvolume named 'simple' removed (idempotency)
+      ansible.builtin.assert:
+        that:
+          - result is not changed
diff --git a/tests/integration/targets/btrfs_subvolume/tasks/test_subvolume_whitespace.yml b/tests/integration/targets/btrfs_subvolume/tasks/test_subvolume_whitespace.yml
index 6a0147af6c..8fc798108f 100644
--- a/tests/integration/targets/btrfs_subvolume/tasks/test_subvolume_whitespace.yml
+++ b/tests/integration/targets/btrfs_subvolume/tasks/test_subvolume_whitespace.yml
@@ -5,58 +5,58 @@
 
 - name: Create a subvolume named 'container'
   community.general.btrfs_subvolume:
-    automount: Yes
+    automount: true
     filesystem_label: "{{ btrfs_subvolume_target_label }}"
     name: "/container"
     state: "present"
 
 - name: Create a subvolume with whitespace in the name
   block:
-  - name: Create a subvolume named 'container/my data'
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/container/my data"
-      state: "present"
-    register: result
-  - name: Subvolume named 'container/my data' created
-    ansible.builtin.assert:
-      that:
-      - result is changed
-  - name: Create a subvolume named 'container/my data' (idempotency)
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/container/my data"
-      state: "present"
-    register: result
-  - name: Subvolume named 'container/my data' created (idempotency)
-    ansible.builtin.assert:
-      that:
-      - result is not changed
+    - name: Create a subvolume named 'container/my data'
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/container/my data"
+        state: "present"
+      register: result
+    - name: Subvolume named 'container/my data' created
+      ansible.builtin.assert:
+        that:
+          - result is changed
+    - name: Create a subvolume named 'container/my data' (idempotency)
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/container/my data"
+        state: "present"
+      register: result
+    - name: Subvolume named 'container/my data' created (idempotency)
+      ansible.builtin.assert:
+        that:
+          - result is not changed
 
 - name: Remove a subvolume with whitespace in the name
   block:
-  - name: Remove a subvolume named 'container/my data'
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/container/my data"
-      state: "absent"
-    register: result
-  - name: Subvolume named 'container/my data' removed
-    ansible.builtin.assert:
-      that:
-      - result is changed
+    - name: Remove a subvolume named 'container/my data'
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/container/my data"
+        state: "absent"
+      register: result
+    - name: Subvolume named 'container/my data' removed
+      ansible.builtin.assert:
+        that:
+          - result is changed
 
-  - name: Remove a subvolume named 'container/my data' (idempotency)
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/container/my data"
-      state: "absent"
-    register: result
-  - name: Subvolume named 'container/my data' removed (idempotency)
-    ansible.builtin.assert:
-      that:
-      - result is not changed
+    - name: Remove a subvolume named 'container/my data' (idempotency)
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/container/my data"
+        state: "absent"
+      register: result
+    - name: Subvolume named 'container/my data' removed (idempotency)
+      ansible.builtin.assert:
+        that:
+          - result is not changed
diff --git a/tests/integration/targets/callback/tasks/main.yml b/tests/integration/targets/callback/tasks/main.yml
index 51cef62173..815a78621f 100644
--- a/tests/integration/targets/callback/tasks/main.yml
+++ b/tests/integration/targets/callback/tasks/main.yml
@@ -9,59 +9,59 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 - block:
-  - name: Create temporary playbook files
-    tempfile:
-      state: file
-      suffix: temp
-    loop: "{{ tests }}"
-    loop_control:
-      loop_var: test
-      label: "{{ test.name }}"
-    register: temporary_playbook_files
+    - name: Create temporary playbook files
+      tempfile:
+        state: file
+        suffix: temp
+      loop: "{{ tests }}"
+      loop_control:
+        loop_var: test
+        label: "{{ test.name }}"
+      register: temporary_playbook_files
 
-  - name: Set temporary playbook file content
-    copy:
-      content: "{{ test.playbook }}"
-      dest: "{{ temporary_playbook_files.results[test_idx].path }}"
-    loop: "{{ tests }}"
-    loop_control:
-      loop_var: test
-      index_var: test_idx
-      label: "{{ test.name }}"
+    - name: Set temporary playbook file content
+      copy:
+        content: "{{ test.playbook }}"
+        dest: "{{ temporary_playbook_files.results[test_idx].path }}"
+      loop: "{{ tests }}"
+      loop_control:
+        loop_var: test
+        index_var: test_idx
+        label: "{{ test.name }}"
 
-  - name: Collect outputs
-    command: "ansible-playbook -i {{ inventory }} {{ playbook }}"
-    environment: "{{ test.environment }}"
-    loop: "{{ tests }}"
-    loop_control:
-      loop_var: test
-      label: "{{ test.name }}"
-    register: outputs
-    changed_when: false
-    vars:
-      inventory: "{{ role_path }}/inventory.yml"
-      playbook: "
-        {%- for result in temporary_playbook_files.results -%}
-        {%-   if result.test.name == test.name -%}
-        {{-     result.path -}}
-        {%-   endif -%}
-        {%- endfor -%}"
+    - name: Collect outputs
+      command: "ansible-playbook -i {{ inventory }} {{ playbook }}"
+      environment: "{{ test.environment }}"
+      loop: "{{ tests }}"
+      loop_control:
+        loop_var: test
+        label: "{{ test.name }}"
+      register: outputs
+      changed_when: false
+      vars:
+        inventory: "{{ role_path }}/inventory.yml"
+        playbook: "
+          {%- for result in temporary_playbook_files.results -%}
+          {%-   if result.test.name == test.name -%}
+          {{-     result.path -}}
+          {%-   endif -%}
+          {%- endfor -%}"
 
-  - name: Assert test output equals expected output
-    assert:
-      that: result.output.differences | length == 0
-    loop: "{{ outputs.results | callback_results_extractor }}"
-    loop_control:
-      loop_var: result
-      label: "{{ result.name }}"
-    register: assertions
+    - name: Assert test output equals expected output
+      assert:
+        that: result.output.differences | length == 0
+      loop: "{{ outputs.results | callback_results_extractor }}"
+      loop_control:
+        loop_var: result
+        label: "{{ result.name }}"
+      register: assertions
 
   always:
-  - name: Remove temporary playbooks
-    file:
-      path: "{{ temporary_file.path }}"
-      state: absent
-    loop: "{{ temporary_playbook_files.results }}"
-    loop_control:
-      loop_var: temporary_file
-      label: "{{ temporary_file.test.name }}: {{ temporary_file.path }}"
+    - name: Remove temporary playbooks
+      file:
+        path: "{{ temporary_file.path }}"
+        state: absent
+      loop: "{{ temporary_playbook_files.results }}"
+      loop_control:
+        loop_var: temporary_file
+        label: "{{ temporary_file.test.name }}: {{ temporary_file.path }}"
diff --git a/tests/integration/targets/callback_default_without_diff/tasks/main.yml b/tests/integration/targets/callback_default_without_diff/tasks/main.yml
index 5fc656e847..adb760fd02 100644
--- a/tests/integration/targets/callback_default_without_diff/tasks/main.yml
+++ b/tests/integration/targets/callback_default_without_diff/tasks/main.yml
@@ -41,22 +41,21 @@
                       content: |
                         Foo bar
                         Bar baz bam!
-            expected_output: [
-              "",
-              "PLAY [testhost] ****************************************************************",
-              "",
-              "TASK [Gathering Facts] *********************************************************",
-              "ok: [testhost]",
-              "",
-              "TASK [Create file] *************************************************************",
-              "changed: [testhost]",
-              "",
-              "TASK [Modify file] *************************************************************",
-              "changed: [testhost]",
-              "",
-              "PLAY RECAP *********************************************************************",
-              "testhost                   : ok=3    changed=2    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   ",
-            ]
+            expected_output:
+              - ""
+              - "PLAY [testhost] ****************************************************************"
+              - ""
+              - "TASK [Gathering Facts] *********************************************************"
+              - "ok: [testhost]"
+              - ""
+              - "TASK [Create file] *************************************************************"
+              - "changed: [testhost]"
+              - ""
+              - "TASK [Modify file] *************************************************************"
+              - "changed: [testhost]"
+              - ""
+              - "PLAY RECAP *********************************************************************"
+              - "testhost                   : ok=3    changed=2    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
 
   always:
     - name: Clean up temp file
diff --git a/tests/integration/targets/callback_diy/tasks/main.yml b/tests/integration/targets/callback_diy/tasks/main.yml
index fa468b52ba..9520ac5d55 100644
--- a/tests/integration/targets/callback_diy/tasks/main.yml
+++ b/tests/integration/targets/callback_diy/tasks/main.yml
@@ -25,18 +25,17 @@
               - name: Sample task name
                 debug:
                   msg: sample debug msg
-        expected_output: [
-          "",
-          "PLAY [testhost] ****************************************************************",
-          "",
-          "TASK [Sample task name] ********************************************************",
-          "ok: [testhost] => {",
-          "    \"msg\": \"sample debug msg\"",
-          "}",
-          "",
-          "PLAY RECAP *********************************************************************",
-          "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
-        ]
+        expected_output:
+          - ""
+          - "PLAY [testhost] ****************************************************************"
+          - ""
+          - "TASK [Sample task name] ********************************************************"
+          - "ok: [testhost] => {"
+          - "    \"msg\": \"sample debug msg\""
+          - "}"
+          - ""
+          - "PLAY RECAP *********************************************************************"
+          - "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
 
       - name: Set playbook_on_start_msg callback using environment variable
         environment:
@@ -51,19 +50,18 @@
               - name: Sample task name
                 debug:
                   msg: sample debug msg
-        expected_output: [
-          "Sample output Sample playbook message",
-          "",
-          "PLAY [testhost] ****************************************************************",
-          "",
-          "TASK [Sample task name] ********************************************************",
-          "ok: [testhost] => {",
-          "    \"msg\": \"sample debug msg\"",
-          "}",
-          "",
-          "PLAY RECAP *********************************************************************",
-          "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
-        ]
+        expected_output:
+          - "Sample output Sample playbook message"
+          - ""
+          - "PLAY [testhost] ****************************************************************"
+          - ""
+          - "TASK [Sample task name] ********************************************************"
+          - "ok: [testhost] => {"
+          - "    \"msg\": \"sample debug msg\""
+          - "}"
+          - ""
+          - "PLAY RECAP *********************************************************************"
+          - "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
 
       - name: Set playbook_on_play_start_msg callback using play variable
         environment:
@@ -80,17 +78,16 @@
               - name: Sample task name
                 debug:
                   msg: sample debug msg
-        expected_output: [
-          "Sample output Sample play name",
-          "",
-          "TASK [Sample task name] ********************************************************",
-          "ok: [testhost] => {",
-          "    \"msg\": \"sample debug msg\"",
-          "}",
-          "",
-          "PLAY RECAP *********************************************************************",
-          "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
-        ]
+        expected_output:
+          - "Sample output Sample play name"
+          - ""
+          - "TASK [Sample task name] ********************************************************"
+          - "ok: [testhost] => {"
+          - "    \"msg\": \"sample debug msg\""
+          - "}"
+          - ""
+          - "PLAY RECAP *********************************************************************"
+          - "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
 
       - name: Set playbook_on_task_start_msg callback using play variable
         environment:
@@ -106,17 +103,16 @@
               - name: Sample task name
                 debug:
                   msg: sample debug msg
-        expected_output: [
-          "",
-          "PLAY [testhost] ****************************************************************",
-          "Sample output Sample task name",
-          "ok: [testhost] => {",
-          "    \"msg\": \"sample debug msg\"",
-          "}",
-          "",
-          "PLAY RECAP *********************************************************************",
-          "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
-        ]
+        expected_output:
+          - ""
+          - "PLAY [testhost] ****************************************************************"
+          - "Sample output Sample task name"
+          - "ok: [testhost] => {"
+          - "    \"msg\": \"sample debug msg\""
+          - "}"
+          - ""
+          - "PLAY RECAP *********************************************************************"
+          - "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
 
       - name: Set playbook_on_task_start_msg callback using task variable
         environment:
@@ -132,17 +128,16 @@
                   msg: sample debug msg
                 vars:
                   ansible_callback_diy_playbook_on_task_start_msg: Sample output {{ ansible_callback_diy.task.name }}
-        expected_output: [
-          "",
-          "PLAY [testhost] ****************************************************************",
-          "Sample output Sample task name",
-          "ok: [testhost] => {",
-          "    \"msg\": \"sample debug msg\"",
-          "}",
-          "",
-          "PLAY RECAP *********************************************************************",
-          "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
-        ]
+        expected_output:
+          - ""
+          - "PLAY [testhost] ****************************************************************"
+          - "Sample output Sample task name"
+          - "ok: [testhost] => {"
+          - "    \"msg\": \"sample debug msg\""
+          - "}"
+          - ""
+          - "PLAY RECAP *********************************************************************"
+          - "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
 
       - name: Set runner_on_ok_msg callback using task variable
         environment:
@@ -158,16 +153,15 @@
                   msg: sample debug msg
                 vars:
                   ansible_callback_diy_runner_on_ok_msg: Sample output {{ ansible_callback_diy.result.output.msg }}
-        expected_output: [
-          "",
-          "PLAY [testhost] ****************************************************************",
-          "",
-          "TASK [Sample task name] ********************************************************",
-          "Sample output sample debug msg",
-          "",
-          "PLAY RECAP *********************************************************************",
-          "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
-        ]
+        expected_output:
+          - ""
+          - "PLAY [testhost] ****************************************************************"
+          - ""
+          - "TASK [Sample task name] ********************************************************"
+          - "Sample output sample debug msg"
+          - ""
+          - "PLAY RECAP *********************************************************************"
+          - "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
 
       - name: Set runner_on_failed_msg callback using task variable
         environment:
@@ -185,16 +179,15 @@
                 ignore_errors: true
                 vars:
                   ansible_callback_diy_runner_on_failed_msg: Sample output Sample failure message
-        expected_output: [
-          "",
-          "PLAY [testhost] ****************************************************************",
-          "",
-          "TASK [Sample task name] ********************************************************",
-          "Sample output Sample failure message",
-          "",
-          "PLAY RECAP *********************************************************************",
-          "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=1   "
-        ]
+        expected_output:
+          - ""
+          - "PLAY [testhost] ****************************************************************"
+          - ""
+          - "TASK [Sample task name] ********************************************************"
+          - "Sample output Sample failure message"
+          - ""
+          - "PLAY RECAP *********************************************************************"
+          - "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=1   "
 
       - name: Set runner_on_skipped_msg callback using task variable
         environment:
@@ -211,16 +204,15 @@
                 when: false
                 vars:
                   ansible_callback_diy_runner_on_skipped_msg: Sample output Skipped {{ ansible_callback_diy.task.name }}
-        expected_output: [
-          "",
-          "PLAY [testhost] ****************************************************************",
-          "",
-          "TASK [Sample task name] ********************************************************",
-          "Sample output Skipped Sample task name",
-          "",
-          "PLAY RECAP *********************************************************************",
-          "testhost                   : ok=0    changed=0    unreachable=0    failed=0    skipped=1    rescued=0    ignored=0   "
-        ]
+        expected_output:
+          - ""
+          - "PLAY [testhost] ****************************************************************"
+          - ""
+          - "TASK [Sample task name] ********************************************************"
+          - "Sample output Skipped Sample task name"
+          - ""
+          - "PLAY RECAP *********************************************************************"
+          - "testhost                   : ok=0    changed=0    unreachable=0    failed=0    skipped=1    rescued=0    ignored=0   "
 
       - name: Set runner_item_on_ok_msg callback using task variable
         environment:
@@ -240,18 +232,17 @@
                   - sample item 3
                 vars:
                   ansible_callback_diy_runner_item_on_ok_msg: Sample output Looping {{ ansible_callback_diy.result.output.msg }}
-        expected_output: [
-          "",
-          "PLAY [testhost] ****************************************************************",
-          "",
-          "TASK [Sample task name] ********************************************************",
-          "Sample output Looping sample debug msg sample item 1",
-          "Sample output Looping sample debug msg sample item 2",
-          "Sample output Looping sample debug msg sample item 3",
-          "",
-          "PLAY RECAP *********************************************************************",
-          "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
-        ]
+        expected_output:
+          - ""
+          - "PLAY [testhost] ****************************************************************"
+          - ""
+          - "TASK [Sample task name] ********************************************************"
+          - "Sample output Looping sample debug msg sample item 1"
+          - "Sample output Looping sample debug msg sample item 2"
+          - "Sample output Looping sample debug msg sample item 3"
+          - ""
+          - "PLAY RECAP *********************************************************************"
+          - "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
 
       - name: Set runner_item_on_failed_msg callback using task variable
         environment:
@@ -273,28 +264,25 @@
                 ignore_errors: true
                 vars:
                   ansible_callback_diy_runner_item_on_failed_msg: Sample output Looping sample failure message
-        expected_output: [
-          "",
-          "PLAY [testhost] ****************************************************************",
-          "",
-          "TASK [Sample task name] ********************************************************",
-          "ok: [testhost] => (item=sample item 1) => {",
-          "    \"msg\": \"sample debug msg sample item 1\"",
-          "}",
-          "Sample output Looping sample failure message",
-          "ok: [testhost] => (item=sample item 3) => {",
-          "    \"msg\": \"sample debug msg sample item 3\"",
-          "}",
-          [
-            # Apparently a bug was fixed in Ansible, as before it ran through with "All items completed"
-            "fatal: [testhost]: FAILED! => {\"msg\": \"All items completed\"}",
-            "fatal: [testhost]: FAILED! => {\"msg\": \"One or more items failed\"}",
-          ],
-          "...ignoring",
-          "",
-          "PLAY RECAP *********************************************************************",
-          "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=1   "
-        ]
+        expected_output:
+          - ""
+          - "PLAY [testhost] ****************************************************************"
+          - ""
+          - "TASK [Sample task name] ********************************************************"
+          - "ok: [testhost] => (item=sample item 1) => {"
+          - "    \"msg\": \"sample debug msg sample item 1\""
+          - "}"
+          - "Sample output Looping sample failure message"
+          - "ok: [testhost] => (item=sample item 3) => {"
+          - "    \"msg\": \"sample debug msg sample item 3\""
+          - "}"
+          - # Apparently a bug was fixed in Ansible, as before it ran through with "All items completed"
+            - "fatal: [testhost]: FAILED! => {\"msg\": \"All items completed\"}"
+            - "fatal: [testhost]: FAILED! => {\"msg\": \"One or more items failed\"}"
+          - "...ignoring"
+          - ""
+          - "PLAY RECAP *********************************************************************"
+          - "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=1   "
 
       - name: Set runner_item_on_skipped_msg callback using task variable
         environment:
@@ -315,22 +303,21 @@
                 when: item != 'sample item 2'
                 vars:
                   ansible_callback_diy_runner_item_on_skipped_msg: Sample output Looping Skipped {{ ansible_callback_diy.result.output.item }}
-        expected_output: [
-          "",
-          "PLAY [testhost] ****************************************************************",
-          "",
-          "TASK [Sample task name] ********************************************************",
-          "ok: [testhost] => (item=sample item 1) => {",
-          "    \"msg\": \"sample debug msg sample item 1\"",
-          "}",
-          "Sample output Looping Skipped sample item 2",
-          "ok: [testhost] => (item=sample item 3) => {",
-          "    \"msg\": \"sample debug msg sample item 3\"",
-          "}",
-          "",
-          "PLAY RECAP *********************************************************************",
-          "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
-        ]
+        expected_output:
+          - ""
+          - "PLAY [testhost] ****************************************************************"
+          - ""
+          - "TASK [Sample task name] ********************************************************"
+          - "ok: [testhost] => (item=sample item 1) => {"
+          - "    \"msg\": \"sample debug msg sample item 1\""
+          - "}"
+          - "Sample output Looping Skipped sample item 2"
+          - "ok: [testhost] => (item=sample item 3) => {"
+          - "    \"msg\": \"sample debug msg sample item 3\""
+          - "}"
+          - ""
+          - "PLAY RECAP *********************************************************************"
+          - "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
 
       - name: Set playbook_on_stats_msg callback using play variable
         environment:
@@ -371,20 +358,19 @@
               - name: Sample task name
                 debug:
                   msg: sample debug msg
-        expected_output: [
-          "",
-          "PLAY [testhost] ****************************************************************",
-          "",
-          "TASK [Sample task name] ********************************************************",
-          "ok: [testhost] => {",
-          "    \"msg\": \"sample debug msg\"",
-          "}",
-          "      Sample output stats",
-          "===============================",
-          "      ok     : testhost: 1",
-          "",
-          "  processed  : testhost: 1"
-        ]
+        expected_output:
+          - ""
+          - "PLAY [testhost] ****************************************************************"
+          - ""
+          - "TASK [Sample task name] ********************************************************"
+          - "ok: [testhost] => {"
+          - "    \"msg\": \"sample debug msg\""
+          - "}"
+          - "      Sample output stats"
+          - "==============================="
+          - "      ok     : testhost: 1"
+          - ""
+          - "  processed  : testhost: 1"
 
       - name: Suppress output on playbook_on_task_start_msg callback using task variable
         environment:
@@ -400,16 +386,15 @@
                   msg: sample debug msg
                 vars:
                   ansible_callback_diy_playbook_on_task_start_msg: ''
-        expected_output: [
-          "",
-          "PLAY [testhost] ****************************************************************",
-          "ok: [testhost] => {",
-          "    \"msg\": \"sample debug msg\"",
-          "}",
-          "",
-          "PLAY RECAP *********************************************************************",
-          "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
-        ]
+        expected_output:
+          - ""
+          - "PLAY [testhost] ****************************************************************"
+          - "ok: [testhost] => {"
+          - "    \"msg\": \"sample debug msg\""
+          - "}"
+          - ""
+          - "PLAY RECAP *********************************************************************"
+          - "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
 
       - name: Suppress output on runner_on_ok_msg callback using task variable
         environment:
@@ -425,15 +410,14 @@
                   msg: sample debug msg
                 vars:
                   ansible_callback_diy_runner_on_ok_msg: ''
-        expected_output: [
-          "",
-          "PLAY [testhost] ****************************************************************",
-          "",
-          "TASK [Sample task name] ********************************************************",
-          "",
-          "PLAY RECAP *********************************************************************",
-          "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
-        ]
+        expected_output:
+          - ""
+          - "PLAY [testhost] ****************************************************************"
+          - ""
+          - "TASK [Sample task name] ********************************************************"
+          - ""
+          - "PLAY RECAP *********************************************************************"
+          - "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
 
       - name: Set runner_on_ok_msg_color using task variable
         environment:
@@ -450,13 +434,12 @@
                 vars:
                   ansible_callback_diy_runner_on_ok_msg: Sample output {{ ansible_callback_diy.result.output.msg }}
                   ansible_callback_diy_runner_on_ok_msg_color: blue
-        expected_output: [
-          "",
-          "PLAY [testhost] ****************************************************************",
-          "",
-          "TASK [Sample task name] ********************************************************",
-          "Sample output sample debug msg",
-          "",
-          "PLAY RECAP *********************************************************************",
-          "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
-        ]
+        expected_output:
+          - ""
+          - "PLAY [testhost] ****************************************************************"
+          - ""
+          - "TASK [Sample task name] ********************************************************"
+          - "Sample output sample debug msg"
+          - ""
+          - "PLAY RECAP *********************************************************************"
+          - "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
diff --git a/tests/integration/targets/callback_print_task/tasks/main.yml b/tests/integration/targets/callback_print_task/tasks/main.yml
index 718ba607a7..0324a9d698 100644
--- a/tests/integration/targets/callback_print_task/tasks/main.yml
+++ b/tests/integration/targets/callback_print_task/tasks/main.yml
@@ -24,18 +24,17 @@
               - name: Sample task
                 debug:
                   msg: This is a test
-        expected_output: [
-            "",
-            "PLAY [testhost] ****************************************************************",
-            "",
-            "TASK [Sample task] *************************************************************",
-            "ok: [testhost] => {",
-            "    \"msg\": \"This is a test\"",
-            "}",
-            "",
-            "PLAY RECAP *********************************************************************",
-            "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
-        ]
+        expected_output:
+          - ""
+          - "PLAY [testhost] ****************************************************************"
+          - ""
+          - "TASK [Sample task] *************************************************************"
+          - "ok: [testhost] => {"
+          - "    \"msg\": \"This is a test\""
+          - "}"
+          - ""
+          - "PLAY RECAP *********************************************************************"
+          - "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
 
       - name: community.general.print_task is enabled
         environment:
@@ -49,23 +48,22 @@
               - name: Sample task
                 debug:
                   msg: This is a test
-        expected_output: [
-            "",
-            "PLAY [testhost] ****************************************************************",
-            "",
-            "TASK [Sample task] *************************************************************",
-            "",
-            "- name: Sample task",
-            "  debug:",
-            "    msg: This is a test",
-            "",
-            "ok: [testhost] => {",
-            "    \"msg\": \"This is a test\"",
-            "}",
-            "",
-            "PLAY RECAP *********************************************************************",
-            "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
-        ]
+        expected_output:
+          - ""
+          - "PLAY [testhost] ****************************************************************"
+          - ""
+          - "TASK [Sample task] *************************************************************"
+          - ""
+          - "- name: Sample task"
+          - "  debug:"
+          - "    msg: This is a test"
+          - ""
+          - "ok: [testhost] => {"
+          - "    \"msg\": \"This is a test\""
+          - "}"
+          - ""
+          - "PLAY RECAP *********************************************************************"
+          - "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
 
       - name: Print with msg parameter on the same line
         environment:
@@ -78,22 +76,21 @@
             tasks:
               - name: Sample task
                 debug: msg="This is a test"
-        expected_output: [
-            "",
-            "PLAY [testhost] ****************************************************************",
-            "",
-            "TASK [Sample task] *************************************************************",
-            "",
-            "- name: Sample task",
-            "  debug: msg=\"This is a test\"",
-            "",
-            "ok: [testhost] => {",
-            "    \"msg\": \"This is a test\"",
-            "}",
-            "",
-            "PLAY RECAP *********************************************************************",
-            "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
-        ]
+        expected_output:
+          - ""
+          - "PLAY [testhost] ****************************************************************"
+          - ""
+          - "TASK [Sample task] *************************************************************"
+          - ""
+          - "- name: Sample task"
+          - "  debug: msg=\"This is a test\""
+          - ""
+          - "ok: [testhost] => {"
+          - "    \"msg\": \"This is a test\""
+          - "}"
+          - ""
+          - "PLAY RECAP *********************************************************************"
+          - "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
 
       - name: Task with additional parameters
         environment:
@@ -110,23 +107,22 @@
                   test_var: "Hello World"
                 debug:
                   var: test_var
-        expected_output: [
-            "",
-            "PLAY [testhost] ****************************************************************",
-            "",
-            "TASK [Sample task] *************************************************************",
-            "",
-            "- name: Sample task",
-            "  when: true",
-            "  vars:",
-            "    test_var: Hello World",
-            "  debug:",
-            "    var: test_var",
-            "",
-            "ok: [testhost] => {",
-            "    \"test_var\": \"Hello World\"",
-            "}",
-            "",
-            "PLAY RECAP *********************************************************************",
-            "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
-        ]
\ No newline at end of file
+        expected_output:
+          - ""
+          - "PLAY [testhost] ****************************************************************"
+          - ""
+          - "TASK [Sample task] *************************************************************"
+          - ""
+          - "- name: Sample task"
+          - "  when: true"
+          - "  vars:"
+          - "    test_var: Hello World"
+          - "  debug:"
+          - "    var: test_var"
+          - ""
+          - "ok: [testhost] => {"
+          - "    \"test_var\": \"Hello World\""
+          - "}"
+          - ""
+          - "PLAY RECAP *********************************************************************"
+          - "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
diff --git a/tests/integration/targets/callback_timestamp/tasks/main.yml b/tests/integration/targets/callback_timestamp/tasks/main.yml
index 5e0acc15f0..41681a5f42 100644
--- a/tests/integration/targets/callback_timestamp/tasks/main.yml
+++ b/tests/integration/targets/callback_timestamp/tasks/main.yml
@@ -26,18 +26,17 @@
               - name: Sample task name
                 debug:
                   msg: sample debug msg
-        expected_output: [
-          "",
-          "PLAY [testhost] ******************************************************* 15:04:05",
-          "",
-          "TASK [Sample task name] *********************************************** 15:04:05",
-          "ok: [testhost] => {",
-          "    \"msg\": \"sample debug msg\"",
-          "}",
-          "",
-          "PLAY RECAP ************************************************************ 15:04:05",
-          "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
-        ]
+        expected_output:
+          - ""
+          - "PLAY [testhost] ******************************************************* 15:04:05"
+          - ""
+          - "TASK [Sample task name] *********************************************** 15:04:05"
+          - "ok: [testhost] => {"
+          - "    \"msg\": \"sample debug msg\""
+          - "}"
+          - ""
+          - "PLAY RECAP ************************************************************ 15:04:05"
+          - "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
 
       - name: Enable timestamp in the longer length
         environment:
@@ -52,15 +51,14 @@
               - name: Sample task name
                 debug:
                   msg: sample debug msg
-        expected_output: [
-          "",
-          "PLAY [testhost] ******************************************** 2006-01-02T15:04:05",
-          "",
-          "TASK [Sample task name] ************************************ 2006-01-02T15:04:05",
-          "ok: [testhost] => {",
-          "    \"msg\": \"sample debug msg\"",
-          "}",
-          "",
-          "PLAY RECAP ************************************************* 2006-01-02T15:04:05",
-          "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
-        ]
+        expected_output:
+          - ""
+          - "PLAY [testhost] ******************************************** 2006-01-02T15:04:05"
+          - ""
+          - "TASK [Sample task name] ************************************ 2006-01-02T15:04:05"
+          - "ok: [testhost] => {"
+          - "    \"msg\": \"sample debug msg\""
+          - "}"
+          - ""
+          - "PLAY RECAP ************************************************* 2006-01-02T15:04:05"
+          - "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
diff --git a/tests/integration/targets/callback_yaml/tasks/main.yml b/tests/integration/targets/callback_yaml/tasks/main.yml
index a66892e0f0..82491e3a56 100644
--- a/tests/integration/targets/callback_yaml/tasks/main.yml
+++ b/tests/integration/targets/callback_yaml/tasks/main.yml
@@ -25,17 +25,17 @@
               - name: Sample task name
                 debug:
                   msg: sample debug msg
-        expected_output: [
-          "",
-          "PLAY [testhost] ****************************************************************",
-          "",
-          "TASK [Sample task name] ********************************************************",
-          "ok: [testhost] => ",
-          "  msg: sample debug msg",
-          "",
-          "PLAY RECAP *********************************************************************",
-          "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
-        ]
+        expected_output:
+          - ""
+          - "PLAY [testhost] ****************************************************************"
+          - ""
+          - "TASK [Sample task name] ********************************************************"
+          - "ok: [testhost] => "
+          - "  msg: sample debug msg"
+          - ""
+          - "PLAY RECAP *********************************************************************"
+          - "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
+
       - name: Test umlauts in multiline
         environment:
           ANSIBLE_NOCOLOR: 'true'
@@ -48,20 +48,20 @@
               - name: Umlaut output
                 debug:
                   msg: "äöü\néêè\nßï☺"
-        expected_output: [
-          "",
-          "PLAY [testhost] ****************************************************************",
-          "",
-          "TASK [Umlaut output] ***********************************************************",
-          "ok: [testhost] => ",
-          "  msg: |-",
-          "    äöü",
-          "    éêè",
-          "    ßï☺",
-          "",
-          "PLAY RECAP *********************************************************************",
-          "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
-        ]
+        expected_output:
+          - ""
+          - "PLAY [testhost] ****************************************************************"
+          - ""
+          - "TASK [Umlaut output] ***********************************************************"
+          - "ok: [testhost] => "
+          - "  msg: |-"
+          - "    äöü"
+          - "    éêè"
+          - "    ßï☺"
+          - ""
+          - "PLAY RECAP *********************************************************************"
+          - "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
+
       - name: Test to_yaml
         environment:
           ANSIBLE_NOCOLOR: 'true'
@@ -79,21 +79,20 @@
               - name: Test to_yaml
                 debug:
                   msg: "{{ data | to_yaml }}"
-        expected_output: [
-          "",
-          "PLAY [testhost] ****************************************************************",
-          "",
-          "TASK [Test to_yaml] ************************************************************",
-          "ok: [testhost] => ",
-          "  msg: |-",
-          "    'line 1",
-          "  ",
-          "      line 2",
-          "  ",
-          "      line 3",
-          "  ",
-          "      '",
-          "",
-          "PLAY RECAP *********************************************************************",
-          "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
-        ]
+        expected_output:
+          - ""
+          - "PLAY [testhost] ****************************************************************"
+          - ""
+          - "TASK [Test to_yaml] ************************************************************"
+          - "ok: [testhost] => "
+          - "  msg: |-"
+          - "    'line 1"
+          - "  "
+          - "      line 2"
+          - "  "
+          - "      line 3"
+          - "  "
+          - "      '"
+          - ""
+          - "PLAY RECAP *********************************************************************"
+          - "testhost                   : ok=1    changed=0    unreachable=0    failed=0    skipped=0    rescued=0    ignored=0   "
diff --git a/tests/integration/targets/cargo/tasks/main.yml b/tests/integration/targets/cargo/tasks/main.yml
index d9048f77bf..f28b459864 100644
--- a/tests/integration/targets/cargo/tasks/main.yml
+++ b/tests/integration/targets/cargo/tasks/main.yml
@@ -14,9 +14,9 @@
       CARGO_NET_GIT_FETCH_WITH_CLI: "true"
   when: has_cargo | default(false) and ansible_distribution == 'Alpine'
 - block:
-  - import_tasks: test_general.yml
-  - import_tasks: test_version.yml
-  - import_tasks: test_directory.yml
+    - import_tasks: test_general.yml
+    - import_tasks: test_version.yml
+    - import_tasks: test_directory.yml
   environment: "{{ cargo_environment }}"
   when: has_cargo | default(false)
 - import_tasks: test_rustup_cargo.yml
diff --git a/tests/integration/targets/cargo/tasks/setup.yml b/tests/integration/targets/cargo/tasks/setup.yml
index 7eec97ac4c..6a98494106 100644
--- a/tests/integration/targets/cargo/tasks/setup.yml
+++ b/tests/integration/targets/cargo/tasks/setup.yml
@@ -4,12 +4,12 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 - block:
-  - name: Install cargo
-    package:
-      name: cargo
-      state: present
-  - set_fact:
-      has_cargo: true
+    - name: Install cargo
+      package:
+        name: cargo
+        state: present
+    - set_fact:
+        has_cargo: true
   when:
     - ansible_system != 'FreeBSD'
     - ansible_distribution != 'MacOSX'
@@ -18,25 +18,25 @@
     - ansible_distribution != 'Ubuntu' or ansible_distribution_version is version('18', '>=')
 
 - block:
-  - name: Install rust (containing cargo)
-    package:
-      name: rust
-      state: present
-  - set_fact:
-      has_cargo: true
+    - name: Install rust (containing cargo)
+      package:
+        name: rust
+        state: present
+    - set_fact:
+        has_cargo: true
   when:
     - ansible_system == 'FreeBSD' and ansible_distribution_version is version('13.0', '>')
 
 - block:
-  - name: Download rustup
-    get_url:
-      url: https://sh.rustup.rs
-      dest: /tmp/sh.rustup.rs
-      mode: "0750"
-      force: true
-  - name: Install rustup cargo
-    command: /tmp/sh.rustup.rs -y
-  - set_fact:
-      rustup_cargo_bin: "{{ lookup('env', 'HOME') }}/.cargo/bin/cargo"
+    - name: Download rustup
+      get_url:
+        url: https://sh.rustup.rs
+        dest: /tmp/sh.rustup.rs
+        mode: "0750"
+        force: true
+    - name: Install rustup cargo
+      command: /tmp/sh.rustup.rs -y
+    - set_fact:
+        rustup_cargo_bin: "{{ lookup('env', 'HOME') }}/.cargo/bin/cargo"
   when:
     - ansible_distribution != 'CentOS' or ansible_distribution_version is version('7.0', '>=')
diff --git a/tests/integration/targets/cargo/tasks/test_general.yml b/tests/integration/targets/cargo/tasks/test_general.yml
index 2bffa08f0d..07e96cd4ac 100644
--- a/tests/integration/targets/cargo/tasks/test_general.yml
+++ b/tests/integration/targets/cargo/tasks/test_general.yml
@@ -29,7 +29,7 @@
 - name: Check assertions helloworld
   assert:
     that:
-        - uninstall_absent_helloworld is not changed
-        - install_absent_helloworld is changed
-        - install_present_helloworld is not changed
-        - uninstall_present_helloworld is changed
+      - uninstall_absent_helloworld is not changed
+      - install_absent_helloworld is changed
+      - install_present_helloworld is not changed
+      - uninstall_present_helloworld is changed
diff --git a/tests/integration/targets/cargo/tasks/test_rustup_cargo.yml b/tests/integration/targets/cargo/tasks/test_rustup_cargo.yml
index ec2cf6e6de..638dd2600a 100644
--- a/tests/integration/targets/cargo/tasks/test_rustup_cargo.yml
+++ b/tests/integration/targets/cargo/tasks/test_rustup_cargo.yml
@@ -19,5 +19,5 @@
 - name: Check assertions helloworld
   assert:
     that:
-        - rustup_install_absent_helloworld is changed
-        - rustup_uninstall_present_helloworld is changed
+      - rustup_install_absent_helloworld is changed
+      - rustup_uninstall_present_helloworld is changed
diff --git a/tests/integration/targets/cargo/tasks/test_version.yml b/tests/integration/targets/cargo/tasks/test_version.yml
index c1ab8e198d..701f23e1f5 100644
--- a/tests/integration/targets/cargo/tasks/test_version.yml
+++ b/tests/integration/targets/cargo/tasks/test_version.yml
@@ -42,9 +42,9 @@
 - name: Check assertions helloworld-yliu
   assert:
     that:
-        - install_helloworld_010 is changed
-        - install_helloworld_010_idem is not changed
-        - upgrade_helloworld_010 is changed
-        - upgrade_helloworld_010_idem is not changed
-        - downgrade_helloworld_010 is changed
-        - downgrade_helloworld_010_idem is not changed
+      - install_helloworld_010 is changed
+      - install_helloworld_010_idem is not changed
+      - upgrade_helloworld_010 is changed
+      - upgrade_helloworld_010_idem is not changed
+      - downgrade_helloworld_010 is changed
+      - downgrade_helloworld_010_idem is not changed
diff --git a/tests/integration/targets/cloud_init_data_facts/tasks/main.yml b/tests/integration/targets/cloud_init_data_facts/tasks/main.yml
index 2b67b5c174..71161603f9 100644
--- a/tests/integration/targets/cloud_init_data_facts/tasks/main.yml
+++ b/tests/integration/targets/cloud_init_data_facts/tasks/main.yml
@@ -25,53 +25,53 @@
   # Will also have to skip on OpenSUSE when running on Python 2 on newer Leap versions
   # (!= 42 and >= 15) as cloud-init will install the Python 3 package, breaking our build on py2.
   when:
-  - not (ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int == 14)
-  - not (ansible_os_family == "Suse" and ansible_distribution_major_version|int != 42 and ansible_python.version.major != 3)
-  - not (ansible_os_family == "Suse" and ansible_distribution_major_version|int == 15)
-  - not (ansible_distribution == "CentOS" and ansible_distribution_major_version|int == 8)  # TODO: cannot start service
-  - not (ansible_distribution == 'Archlinux')  # TODO: package seems to be broken, cannot be downloaded from mirrors?
-  - not (ansible_distribution == 'Alpine')  # TODO: not sure what's wrong here, the module doesn't return what the tests expect
+    - not (ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int == 14)
+    - not (ansible_os_family == "Suse" and ansible_distribution_major_version|int != 42 and ansible_python.version.major != 3)
+    - not (ansible_os_family == "Suse" and ansible_distribution_major_version|int == 15)
+    - not (ansible_distribution == "CentOS" and ansible_distribution_major_version|int == 8)  # TODO: cannot start service
+    - not (ansible_distribution == 'Archlinux')  # TODO: package seems to be broken, cannot be downloaded from mirrors?
+    - not (ansible_distribution == 'Alpine')  # TODO: not sure what's wrong here, the module doesn't return what the tests expect
   block:
-  - name: setup install cloud-init
-    package:
-      name:
-      - cloud-init
-      - udev
+    - name: setup install cloud-init
+      package:
+        name:
+          - cloud-init
+          - udev
 
-  - name: Ensure systemd-network user exists
-    user:
-      name: systemd-network
-      state: present
-    when: ansible_distribution == 'Fedora' and ansible_distribution_major_version|int >= 37
+    - name: Ensure systemd-network user exists
+      user:
+        name: systemd-network
+        state: present
+      when: ansible_distribution == 'Fedora' and ansible_distribution_major_version|int >= 37
 
-  - name: setup run cloud-init
-    service:
-      name: cloud-init-local
-      state: restarted
+    - name: setup run cloud-init
+      service:
+        name: cloud-init-local
+        state: restarted
 
-  - name: test gather cloud-init facts in check mode
-    cloud_init_data_facts:
-    check_mode: true
-    register: result
-  - name: verify test gather cloud-init facts in check mode
-    assert:
-      that:
-        - result.cloud_init_data_facts.status.v1 is defined
-        - result.cloud_init_data_facts.status.v1.stage is defined
-        - not result.cloud_init_data_facts.status.v1.stage
-        - cloud_init_data_facts.status.v1 is defined
-        - cloud_init_data_facts.status.v1.stage is defined
-        - not cloud_init_data_facts.status.v1.stage
+    - name: test gather cloud-init facts in check mode
+      cloud_init_data_facts:
+      check_mode: true
+      register: result
+    - name: verify test gather cloud-init facts in check mode
+      assert:
+        that:
+          - result.cloud_init_data_facts.status.v1 is defined
+          - result.cloud_init_data_facts.status.v1.stage is defined
+          - not result.cloud_init_data_facts.status.v1.stage
+          - cloud_init_data_facts.status.v1 is defined
+          - cloud_init_data_facts.status.v1.stage is defined
+          - not cloud_init_data_facts.status.v1.stage
 
-  - name: test gather cloud-init facts
-    cloud_init_data_facts:
-    register: result
-  - name: verify test gather cloud-init facts
-    assert:
-      that:
-        - result.cloud_init_data_facts.status.v1 is defined
-        - result.cloud_init_data_facts.status.v1.stage is defined
-        - not result.cloud_init_data_facts.status.v1.stage
-        - cloud_init_data_facts.status.v1 is defined
-        - cloud_init_data_facts.status.v1.stage is defined
-        - not cloud_init_data_facts.status.v1.stage
+    - name: test gather cloud-init facts
+      cloud_init_data_facts:
+      register: result
+    - name: verify test gather cloud-init facts
+      assert:
+        that:
+          - result.cloud_init_data_facts.status.v1 is defined
+          - result.cloud_init_data_facts.status.v1.stage is defined
+          - not result.cloud_init_data_facts.status.v1.stage
+          - cloud_init_data_facts.status.v1 is defined
+          - cloud_init_data_facts.status.v1.stage is defined
+          - not cloud_init_data_facts.status.v1.stage
diff --git a/tests/integration/targets/connection/test_connection.yml b/tests/integration/targets/connection/test_connection.yml
index bb0a993995..7f8b5697ce 100644
--- a/tests/integration/targets/connection/test_connection.yml
+++ b/tests/integration/targets/connection/test_connection.yml
@@ -8,41 +8,41 @@
   serial: 1
   tasks:
 
-  ### raw with unicode arg and output
+    ### raw with unicode arg and output
 
-  - name: raw with unicode arg and output
-    raw: echo 汉语
-    register: command
-  - name: check output of raw with unicode arg and output
-    assert:
-      that:
-      - "'汉语' in command.stdout"
-      - command is changed # as of 2.2, raw should default to changed: true for consistency w/ shell/command/script modules
+    - name: raw with unicode arg and output
+      raw: echo 汉语
+      register: command
+    - name: check output of raw with unicode arg and output
+      assert:
+        that:
+          - "'汉语' in command.stdout"
+          - command is changed # as of 2.2, raw should default to changed: true for consistency w/ shell/command/script modules
 
-  ### copy local file with unicode filename and content
+    ### copy local file with unicode filename and content
 
-  - name: create local file with unicode filename and content
-    local_action: lineinfile dest={{ local_tmp }}-汉语/汉语.txt create=true line=汉语
-  - name: remove remote file with unicode filename and content
-    action: "{{ action_prefix }}file path={{ remote_tmp }}-汉语/汉语.txt state=absent"
-  - name: create remote directory with unicode name
-    action: "{{ action_prefix }}file path={{ remote_tmp }}-汉语 state=directory"
-  - name: copy local file with unicode filename and content
-    action: "{{ action_prefix }}copy src={{ local_tmp }}-汉语/汉语.txt dest={{ remote_tmp }}-汉语/汉语.txt"
+    - name: create local file with unicode filename and content
+      local_action: lineinfile dest={{ local_tmp }}-汉语/汉语.txt create=true line=汉语
+    - name: remove remote file with unicode filename and content
+      action: "{{ action_prefix }}file path={{ remote_tmp }}-汉语/汉语.txt state=absent"
+    - name: create remote directory with unicode name
+      action: "{{ action_prefix }}file path={{ remote_tmp }}-汉语 state=directory"
+    - name: copy local file with unicode filename and content
+      action: "{{ action_prefix }}copy src={{ local_tmp }}-汉语/汉语.txt dest={{ remote_tmp }}-汉语/汉语.txt"
 
-  ### fetch remote file with unicode filename and content
+    ### fetch remote file with unicode filename and content
 
-  - name: remove local file with unicode filename and content
-    local_action: file path={{ local_tmp }}-汉语/汉语.txt state=absent
-  - name: fetch remote file with unicode filename and content
-    fetch: src={{ remote_tmp }}-汉语/汉语.txt dest={{ local_tmp }}-汉语/汉语.txt fail_on_missing=true validate_checksum=true flat=true
+    - name: remove local file with unicode filename and content
+      local_action: file path={{ local_tmp }}-汉语/汉语.txt state=absent
+    - name: fetch remote file with unicode filename and content
+      fetch: src={{ remote_tmp }}-汉语/汉语.txt dest={{ local_tmp }}-汉语/汉语.txt fail_on_missing=true validate_checksum=true flat=true
 
-  ### remove local and remote temp files
+    ### remove local and remote temp files
 
-  - name: remove local temp file
-    local_action: file path={{ local_tmp }}-汉语 state=absent
-  - name: remove remote temp file
-    action: "{{ action_prefix }}file path={{ remote_tmp }}-汉语 state=absent"
+    - name: remove local temp file
+      local_action: file path={{ local_tmp }}-汉语 state=absent
+    - name: remove remote temp file
+      action: "{{ action_prefix }}file path={{ remote_tmp }}-汉语 state=absent"
 
-  ### test wait_for_connection plugin
-  - ansible.builtin.wait_for_connection:
+    ### test wait_for_connection plugin
+    - ansible.builtin.wait_for_connection:
diff --git a/tests/integration/targets/connection_wsl/plugin-specific-tests.yml b/tests/integration/targets/connection_wsl/plugin-specific-tests.yml
index 228c34dc51..e7d7434b81 100644
--- a/tests/integration/targets/connection_wsl/plugin-specific-tests.yml
+++ b/tests/integration/targets/connection_wsl/plugin-specific-tests.yml
@@ -10,7 +10,7 @@
       copy:
         content: ""
         dest: "{{ remote_tmp }}/test_empty.txt"
-        force: no
+        force: false
         mode: '0644'
 
     - name: assert file without content exists
diff --git a/tests/integration/targets/consul/tasks/consul_kv.yml b/tests/integration/targets/consul/tasks/consul_kv.yml
index 6cca73137a..52b95ddd3d 100644
--- a/tests/integration/targets/consul/tasks/consul_kv.yml
+++ b/tests/integration/targets/consul/tasks/consul_kv.yml
@@ -15,10 +15,10 @@
       - result is changed
       - result.data.Value == 'somevalue'
 
-#- name: Test the lookup
-#  assert:
-#    that:
-#      - lookup('community.general.consul_kv', 'somekey', token=consul_management_token) == 'somevalue'
+# - name: Test the lookup
+#   assert:
+#     that:
+#       - lookup('community.general.consul_kv', 'somekey', token=consul_management_token) == 'somevalue'
 
 - name: Update a key with the same data
   consul_kv:
diff --git a/tests/integration/targets/consul/tasks/consul_role.yml b/tests/integration/targets/consul/tasks/consul_role.yml
index 9b0504e0b6..57193a0b94 100644
--- a/tests/integration/targets/consul/tasks/consul_role.yml
+++ b/tests/integration/targets/consul/tasks/consul_role.yml
@@ -44,7 +44,7 @@
   consul_role:
     name: foo-role-with-policy
     description: "Testing updating description"
-  check_mode: yes
+  check_mode: true
   register: result
 
 - assert:
@@ -106,7 +106,7 @@
         datacenters:
           - dc2
   register: result
-  check_mode: yes
+  check_mode: true
 
 - assert:
     that:
@@ -146,7 +146,7 @@
     name: role-with-service-identity
     node_identities: []
   register: result
-  check_mode: yes
+  check_mode: true
 
 - assert:
     that:
diff --git a/tests/integration/targets/consul/tasks/main.yml b/tests/integration/targets/consul/tasks/main.yml
index 0ac58fc40e..04e2d1b2b5 100644
--- a/tests/integration/targets/consul/tasks/main.yml
+++ b/tests/integration/targets/consul/tasks/main.yml
@@ -14,96 +14,96 @@
     consul_uri: https://releases.hashicorp.com/consul/{{ consul_version }}/consul_{{ consul_version }}_{{ ansible_system | lower }}_{{ consul_arch }}.zip
     consul_cmd: '{{ remote_tmp_dir }}/consul'
   block:
-  - name: Install requests<2.20 (CentOS/RHEL 6)
-    pip:
-      name: requests<2.20
-      extra_args: "-c {{ remote_constraints }}"
-    register: result
-    until: result is success
-    when: ansible_distribution_file_variety|default() == 'RedHat' and ansible_distribution_major_version is version('6', '<=')
-  - name: Install python-consul
-    pip:
-      name: python-consul
-      extra_args: "-c {{ remote_constraints }}"
-    register: result
-    until: result is success
-  - name: Generate privatekey
-    community.crypto.openssl_privatekey:
-      path: '{{ remote_tmp_dir }}/privatekey.pem'
-  - name: Generate CSR
-    community.crypto.openssl_csr:
-      path: '{{ remote_tmp_dir }}/csr.csr'
-      privatekey_path: '{{ remote_tmp_dir }}/privatekey.pem'
-      subject:
-        commonName: localhost
-  - name: Generate selfsigned certificate
-    register: selfsigned_certificate
-    community.crypto.x509_certificate:
-      path: '{{ remote_tmp_dir }}/cert.pem'
-      csr_path: '{{ remote_tmp_dir }}/csr.csr'
-      privatekey_path: '{{ remote_tmp_dir }}/privatekey.pem'
-      provider: selfsigned
-      selfsigned_digest: sha256
-  - name: Install unzip
-    package:
-      name: unzip
-    register: result
-    until: result is success
-    when: ansible_distribution != "MacOSX"
-  - assert:
-      that: ansible_architecture in ['i386', 'x86_64', 'amd64']
-  - set_fact:
-      consul_arch: '386'
-    when: ansible_architecture == 'i386'
-  - set_fact:
-      consul_arch: amd64
-    when: ansible_architecture in ['x86_64', 'amd64']
-  - name: Download consul binary
-    unarchive:
-      src: '{{ consul_uri }}'
-      dest: '{{ remote_tmp_dir }}'
-      remote_src: true
-    register: result
-    until: result is success
-  - vars:
-      remote_dir: '{{ echo_remote_tmp_dir.stdout }}'
-    block:
-    - command: echo {{ remote_tmp_dir }}
-      register: echo_remote_tmp_dir
-    - name: Create configuration file
-      template:
-        src: consul_config.hcl.j2
-        dest: '{{ remote_tmp_dir }}/consul_config.hcl'
-    - name: Start Consul (dev mode enabled)
-      shell: nohup {{ consul_cmd }} agent -dev -config-file {{ remote_tmp_dir }}/consul_config.hcl </dev/null >/dev/null 2>&1 &
-    - name: Bootstrap ACL
-      consul_acl_bootstrap:
-      register: consul_bootstrap_result
+    - name: Install requests<2.20 (CentOS/RHEL 6)
+      pip:
+        name: requests<2.20
+        extra_args: "-c {{ remote_constraints }}"
+      register: result
+      until: result is success
+      when: ansible_distribution_file_variety|default() == 'RedHat' and ansible_distribution_major_version is version('6', '<=')
+    - name: Install python-consul
+      pip:
+        name: python-consul
+        extra_args: "-c {{ remote_constraints }}"
+      register: result
+      until: result is success
+    - name: Generate privatekey
+      community.crypto.openssl_privatekey:
+        path: '{{ remote_tmp_dir }}/privatekey.pem'
+    - name: Generate CSR
+      community.crypto.openssl_csr:
+        path: '{{ remote_tmp_dir }}/csr.csr'
+        privatekey_path: '{{ remote_tmp_dir }}/privatekey.pem'
+        subject:
+          commonName: localhost
+    - name: Generate selfsigned certificate
+      register: selfsigned_certificate
+      community.crypto.x509_certificate:
+        path: '{{ remote_tmp_dir }}/cert.pem'
+        csr_path: '{{ remote_tmp_dir }}/csr.csr'
+        privatekey_path: '{{ remote_tmp_dir }}/privatekey.pem'
+        provider: selfsigned
+        selfsigned_digest: sha256
+    - name: Install unzip
+      package:
+        name: unzip
+      register: result
+      until: result is success
+      when: ansible_distribution != "MacOSX"
+    - assert:
+        that: ansible_architecture in ['i386', 'x86_64', 'amd64']
     - set_fact:
-        consul_management_token: '{{ consul_bootstrap_result.result.SecretID }}'
-    - name: Create some data
-      command: '{{ consul_cmd }} kv put -token={{consul_management_token}} data/value{{ item }} foo{{ item }}'
-      loop:
-      - 1
-      - 2
-      - 3
-    - import_tasks: consul_general.yml
-    - import_tasks: consul_kv.yml
+        consul_arch: '386'
+      when: ansible_architecture == 'i386'
+    - set_fact:
+        consul_arch: amd64
+      when: ansible_architecture in ['x86_64', 'amd64']
+    - name: Download consul binary
+      unarchive:
+        src: '{{ consul_uri }}'
+        dest: '{{ remote_tmp_dir }}'
+        remote_src: true
+      register: result
+      until: result is success
+    - vars:
+        remote_dir: '{{ echo_remote_tmp_dir.stdout }}'
+      block:
+        - command: echo {{ remote_tmp_dir }}
+          register: echo_remote_tmp_dir
+        - name: Create configuration file
+          template:
+            src: consul_config.hcl.j2
+            dest: '{{ remote_tmp_dir }}/consul_config.hcl'
+        - name: Start Consul (dev mode enabled)
+          shell: nohup {{ consul_cmd }} agent -dev -config-file {{ remote_tmp_dir }}/consul_config.hcl </dev/null >/dev/null 2>&1 &
+        - name: Bootstrap ACL
+          consul_acl_bootstrap:
+          register: consul_bootstrap_result
+        - set_fact:
+            consul_management_token: '{{ consul_bootstrap_result.result.SecretID }}'
+        - name: Create some data
+          command: '{{ consul_cmd }} kv put -token={{consul_management_token}} data/value{{ item }} foo{{ item }}'
+          loop:
+            - 1
+            - 2
+            - 3
+        - import_tasks: consul_general.yml
+        - import_tasks: consul_kv.yml
 
-    - block:
-        - import_tasks: consul_session.yml
-        - import_tasks: consul_policy.yml
-        - import_tasks: consul_role.yml
-        - import_tasks: consul_token.yml
-        - import_tasks: consul_auth_method.yml
-        - import_tasks: consul_binding_rule.yml
-        - import_tasks: consul_agent_service.yml
-        - import_tasks: consul_agent_check.yml
-      module_defaults:
-        group/community.general.consul:
-          token: "{{ consul_management_token }}"
+        - block:
+            - import_tasks: consul_session.yml
+            - import_tasks: consul_policy.yml
+            - import_tasks: consul_role.yml
+            - import_tasks: consul_token.yml
+            - import_tasks: consul_auth_method.yml
+            - import_tasks: consul_binding_rule.yml
+            - import_tasks: consul_agent_service.yml
+            - import_tasks: consul_agent_check.yml
+          module_defaults:
+            group/community.general.consul:
+              token: "{{ consul_management_token }}"
 
-    always:
+  always:
     - name: Kill consul process
       shell: kill $(cat {{ remote_tmp_dir }}/consul.pid)
-      ignore_errors: true
\ No newline at end of file
+      ignore_errors: true
diff --git a/tests/integration/targets/copr/tasks/main.yml b/tests/integration/targets/copr/tasks/main.yml
index 0d66378112..4fc5ae5c08 100644
--- a/tests/integration/targets/copr/tasks/main.yml
+++ b/tests/integration/targets/copr/tasks/main.yml
@@ -11,133 +11,133 @@
       or (ansible_os_family == 'RedHat' and ansible_distribution != 'Fedora'
           and ansible_distribution_major_version | int >= 8)
   block:
-  - debug: var=copr_chroot
-  - name: enable copr project
-    copr:
-      host: copr.fedorainfracloud.org
-      state: enabled
-      name: '{{ copr_fullname }}'
-      chroot: "{{ copr_chroot }}"
-    register: result
+    - debug: var=copr_chroot
+    - name: enable copr project
+      copr:
+        host: copr.fedorainfracloud.org
+        state: enabled
+        name: '{{ copr_fullname }}'
+        chroot: "{{ copr_chroot }}"
+      register: result
 
-  - name: assert that the copr project was enabled
-    assert:
-      that:
-        - 'result is changed'
-        - result.msg == 'enabled'
-        - result.info == 'Please note that this repository is not part of the main distribution'
+    - name: assert that the copr project was enabled
+      assert:
+        that:
+          - 'result is changed'
+          - result.msg == 'enabled'
+          - result.info == 'Please note that this repository is not part of the main distribution'
 
-  - name: enable copr project
-    check_mode: true
-    copr:
-      state: enabled
-      name: '{{ copr_fullname }}'
-      chroot: '{{ copr_chroot }}'
-    register: result
+    - name: enable copr project
+      check_mode: true
+      copr:
+        state: enabled
+        name: '{{ copr_fullname }}'
+        chroot: '{{ copr_chroot }}'
+      register: result
 
-  - name: assert that the copr project was enabled
-    assert:
-      that:
-        - result is not changed
-        - result.msg == 'enabled'
+    - name: assert that the copr project was enabled
+      assert:
+        that:
+          - result is not changed
+          - result.msg == 'enabled'
 
-  - name: Ensure the repo is installed and enabled | slurp
-    register: result
-    ansible.builtin.slurp:
-      src: "{{ copr_repofile }}"
+    - name: Ensure the repo is installed and enabled | slurp
+      register: result
+      ansible.builtin.slurp:
+        src: "{{ copr_repofile }}"
 
-  - name: Ensure the repo is installed and enabled
-    vars:
-      content: "{{ result.content | b64decode }}"
-      _baseurl: "{{ 'https://download.copr.fedorainfracloud.org/results/gotmax23/community.general.copr_integration_tests' | regex_escape }}"
-      baseurl: "{{ content | regex_search('baseurl=' ~ _baseurl) }}"
-    block:
-      - ansible.builtin.debug:
-          var: content
-      - ansible.builtin.debug:
-          var: baseurl
-      - name: Ensure the repo is installed and enabled
-        ansible.builtin.assert:
-          that:
-            - "'enabled=1' in content"
-            - baseurl | length > 0
+    - name: Ensure the repo is installed and enabled
+      vars:
+        content: "{{ result.content | b64decode }}"
+        _baseurl: "{{ 'https://download.copr.fedorainfracloud.org/results/gotmax23/community.general.copr_integration_tests' | regex_escape }}"
+        baseurl: "{{ content | regex_search('baseurl=' ~ _baseurl) }}"
+      block:
+        - ansible.builtin.debug:
+            var: content
+        - ansible.builtin.debug:
+            var: baseurl
+        - name: Ensure the repo is installed and enabled
+          ansible.builtin.assert:
+            that:
+              - "'enabled=1' in content"
+              - baseurl | length > 0
 
-  - name: Install test package from Copr
-    when:
-      # Copr does not build new packages for EOL Fedoras.
-      - >
-        not (ansible_distribution == 'Fedora' and
-             ansible_distribution_major_version | int < 35)
-    block:
-      - name: install test package from the copr
-        ansible.builtin.package:
-          update_cache: true
-          name: copr-module-integration-dummy-package
+    - name: Install test package from Copr
+      when:
+        # Copr does not build new packages for EOL Fedoras.
+        - >
+          not (ansible_distribution == 'Fedora' and
+               ansible_distribution_major_version | int < 35)
+      block:
+        - name: install test package from the copr
+          ansible.builtin.package:
+            update_cache: true
+            name: copr-module-integration-dummy-package
 
-      - name: uninstall test package
-        register: result
-        ansible.builtin.package:
-          name: copr-module-integration-dummy-package
-          state: absent
+        - name: uninstall test package
+          register: result
+          ansible.builtin.package:
+            name: copr-module-integration-dummy-package
+            state: absent
 
-      - name: check uninstall test package
-        ansible.builtin.assert:
-          that: result.changed | bool
+        - name: check uninstall test package
+          ansible.builtin.assert:
+            that: result.changed | bool
 
-  - name: remove copr project
-    copr:
-      state: absent
-      name: '{{ copr_fullname }}'
-    register: result
+    - name: remove copr project
+      copr:
+        state: absent
+        name: '{{ copr_fullname }}'
+      register: result
 
-  - name: assert that the copr project was removed
-    assert:
-      that:
-        - 'result is changed'
-        - result.msg == 'absent'
+    - name: assert that the copr project was removed
+      assert:
+        that:
+          - 'result is changed'
+          - result.msg == 'absent'
 
-  - name: Ensure the repo file was removed | stat
-    register: result
-    ansible.builtin.stat:
-      dest: "{{ copr_repofile }}"
+    - name: Ensure the repo file was removed | stat
+      register: result
+      ansible.builtin.stat:
+        dest: "{{ copr_repofile }}"
 
-  - name: Ensure the repo file was removed
-    ansible.builtin.assert:
-      that: not result.stat.exists | bool
+    - name: Ensure the repo file was removed
+      ansible.builtin.assert:
+        that: not result.stat.exists | bool
 
-  - name: disable copr project
-    copr:
-      state: disabled
-      name: '{{ copr_fullname }}'
-      chroot: '{{ copr_chroot }}'
-    register: result
+    - name: disable copr project
+      copr:
+        state: disabled
+        name: '{{ copr_fullname }}'
+        chroot: '{{ copr_chroot }}'
+      register: result
 
-  - name: assert that the copr project was disabled
-    assert:
-      that:
-        - 'result is changed'
-        - result.msg == 'disabled'
+    - name: assert that the copr project was disabled
+      assert:
+        that:
+          - 'result is changed'
+          - result.msg == 'disabled'
 
-  - name: Ensure the repo is installed but disabled | slurp
-    register: result
-    ansible.builtin.slurp:
-      src: "{{ copr_repofile }}"
+    - name: Ensure the repo is installed but disabled | slurp
+      register: result
+      ansible.builtin.slurp:
+        src: "{{ copr_repofile }}"
 
-  - name: Ensure the repo is installed but disabled
-    vars:
-      content: "{{ result.content | b64decode }}"
-      _baseurl: "{{ 'https://download.copr.fedorainfracloud.org/results/gotmax23/community.general.copr_integration_tests' | regex_escape }}"
-      baseurl: "{{ content | regex_search('baseurl=' ~ _baseurl) }}"
-    block:
-      - ansible.builtin.debug:
-          var: content
-      - ansible.builtin.debug:
-          var: baseurl
-      - name: Ensure the repo is installed but disabled
-        ansible.builtin.assert:
-          that:
-            - "'enabled=0' in content"
-            - baseurl | length > 0
+    - name: Ensure the repo is installed but disabled
+      vars:
+        content: "{{ result.content | b64decode }}"
+        _baseurl: "{{ 'https://download.copr.fedorainfracloud.org/results/gotmax23/community.general.copr_integration_tests' | regex_escape }}"
+        baseurl: "{{ content | regex_search('baseurl=' ~ _baseurl) }}"
+      block:
+        - ansible.builtin.debug:
+            var: content
+        - ansible.builtin.debug:
+            var: baseurl
+        - name: Ensure the repo is installed but disabled
+          ansible.builtin.assert:
+            that:
+              - "'enabled=0' in content"
+              - baseurl | length > 0
 
   always:
     - name: clean up
diff --git a/tests/integration/targets/deploy_helper/tasks/main.yml b/tests/integration/targets/deploy_helper/tasks/main.yml
index e0fdee83e9..84eb1640bd 100644
--- a/tests/integration/targets/deploy_helper/tasks/main.yml
+++ b/tests/integration/targets/deploy_helper/tasks/main.yml
@@ -16,43 +16,43 @@
 - name: Assert State=query with default parameters
   assert:
     that:
-    - "'project_path' in deploy_helper"
-    - "deploy_helper.current_path   == deploy_helper.project_path ~ '/current'"
-    - "deploy_helper.releases_path  == deploy_helper.project_path ~ '/releases'"
-    - "deploy_helper.shared_path    == deploy_helper.project_path ~ '/shared'"
-    - "deploy_helper.unfinished_filename == 'DEPLOY_UNFINISHED'"
-    - "'previous_release' in deploy_helper"
-    - "'previous_release_path' in deploy_helper"
-    - "'new_release' in deploy_helper"
-    - "'new_release_path' in deploy_helper"
-    - "deploy_helper.new_release_path == deploy_helper.releases_path ~ '/' ~ deploy_helper.new_release"
+      - "'project_path' in deploy_helper"
+      - "deploy_helper.current_path   == deploy_helper.project_path ~ '/current'"
+      - "deploy_helper.releases_path  == deploy_helper.project_path ~ '/releases'"
+      - "deploy_helper.shared_path    == deploy_helper.project_path ~ '/shared'"
+      - "deploy_helper.unfinished_filename == 'DEPLOY_UNFINISHED'"
+      - "'previous_release' in deploy_helper"
+      - "'previous_release_path' in deploy_helper"
+      - "'new_release' in deploy_helper"
+      - "'new_release_path' in deploy_helper"
+      - "deploy_helper.new_release_path == deploy_helper.releases_path ~ '/' ~ deploy_helper.new_release"
 
 - name: State=query with relative overridden paths
   deploy_helper: path={{ deploy_helper_test_root }} current_path=CURRENT_PATH releases_path=RELEASES_PATH shared_path=SHARED_PATH state=query
 - name: Assert State=query with relative overridden paths
   assert:
     that:
-    - "deploy_helper.current_path   == deploy_helper.project_path ~ '/CURRENT_PATH'"
-    - "deploy_helper.releases_path  == deploy_helper.project_path ~ '/RELEASES_PATH'"
-    - "deploy_helper.shared_path    == deploy_helper.project_path ~ '/SHARED_PATH'"
-    - "deploy_helper.new_release_path == deploy_helper.releases_path ~ '/' ~ deploy_helper.new_release"
+      - "deploy_helper.current_path   == deploy_helper.project_path ~ '/CURRENT_PATH'"
+      - "deploy_helper.releases_path  == deploy_helper.project_path ~ '/RELEASES_PATH'"
+      - "deploy_helper.shared_path    == deploy_helper.project_path ~ '/SHARED_PATH'"
+      - "deploy_helper.new_release_path == deploy_helper.releases_path ~ '/' ~ deploy_helper.new_release"
 
 - name: State=query with absolute overridden paths
   deploy_helper: path={{ deploy_helper_test_root }} current_path=/CURRENT_PATH releases_path=/RELEASES_PATH shared_path=/SHARED_PATH state=query
 - name: Assert State=query with absolute overridden paths
   assert:
     that:
-    - "deploy_helper.current_path   == '/CURRENT_PATH'"
-    - "deploy_helper.releases_path  == '/RELEASES_PATH'"
-    - "deploy_helper.shared_path    == '/SHARED_PATH'"
-    - "deploy_helper.new_release_path == deploy_helper.releases_path ~ '/' ~ deploy_helper.new_release"
+      - "deploy_helper.current_path   == '/CURRENT_PATH'"
+      - "deploy_helper.releases_path  == '/RELEASES_PATH'"
+      - "deploy_helper.shared_path    == '/SHARED_PATH'"
+      - "deploy_helper.new_release_path == deploy_helper.releases_path ~ '/' ~ deploy_helper.new_release"
 
 - name: State=query with overridden unfinished_filename
   deploy_helper: path={{ deploy_helper_test_root }} unfinished_filename=UNFINISHED_DEPLOY state=query
 - name: Assert State=query with overridden unfinished_filename
   assert:
     that:
-    - "'UNFINISHED_DEPLOY' == deploy_helper.unfinished_filename"
+      - "'UNFINISHED_DEPLOY' == deploy_helper.unfinished_filename"
 
 # Remove the root folder just in case it exists
 - file: path={{ deploy_helper_test_root }} state=absent
@@ -66,8 +66,8 @@
 - name: Assert State=present with default parameters
   assert:
     that:
-    - "releases_path.stat.exists"
-    - "shared_path.stat.exists"
+      - "releases_path.stat.exists"
+      - "shared_path.stat.exists"
 
 # Setup older releases for tests
 - file: path={{ deploy_helper.releases_path }}/{{ item }} state=directory
@@ -88,9 +88,9 @@
 - name: Assert State=finalize with default parameters
   assert:
     that:
-    - "current_path.stat.islnk"
-    - "deploy_helper.new_release_path in current_path.stat.lnk_source"
-    - "not current_path_unfinished_filename.stat.exists"
+      - "current_path.stat.islnk"
+      - "deploy_helper.new_release_path in current_path.stat.lnk_source"
+      - "not current_path_unfinished_filename.stat.exists"
 - stat: path={{ deploy_helper.releases_path }}/third
   register: third_release_path
 - shell: "ls {{ deploy_helper.releases_path }} | wc -l"
@@ -98,13 +98,13 @@
 - name: Assert State=finalize with default parameters (clean=true checks)
   assert:
     that:
-    - "not third_release_path.stat.exists"
-    - "releases_count.stdout|trim == '6'"
+      - "not third_release_path.stat.exists"
+      - "releases_count.stdout|trim == '6'"
 - deploy_helper: path={{ deploy_helper_test_root }} release={{ deploy_helper.new_release }} state=query
 - name: Assert State=finalize with default parameters (previous_release checks)
   assert:
     that:
-    - "deploy_helper.new_release == deploy_helper.previous_release"
+      - "deploy_helper.new_release == deploy_helper.previous_release"
 
 - name: State=absent with default parameters
   deploy_helper: path={{ deploy_helper_test_root }} state=absent
@@ -113,7 +113,7 @@
 - name: Assert State=absent with default parameters
   assert:
     that:
-    - "not project_path.stat.exists"
+      - "not project_path.stat.exists"
 
 - debug: msg="Clearing all release data and facts ---------"
 
@@ -127,8 +127,8 @@
 - name: Assert State=present with shared_path set to False
   assert:
     that:
-    - "releases_path.stat.exists"
-    - "deploy_helper.shared_path is falsy or not shared_path.stat.exists"
+      - "releases_path.stat.exists"
+      - "deploy_helper.shared_path is falsy or not shared_path.stat.exists"
 
 # Setup older releases for tests
 - file: path={{ deploy_helper.releases_path }}/{{ item }} state=directory
@@ -151,9 +151,9 @@
 - name: Assert State=finalize with default parameters (clean=true checks)
   assert:
     that:
-    - "not third_release_path.stat.exists"
-    - "before_releases_count.stdout|trim == '6'"
-    - "releases_count.stdout|trim == '3'"
+      - "not third_release_path.stat.exists"
+      - "before_releases_count.stdout|trim == '6'"
+      - "releases_count.stdout|trim == '3'"
 
 # Remove the root folder
 - file: path={{ deploy_helper_test_root }} state=absent
diff --git a/tests/integration/targets/discord/defaults/main.yml b/tests/integration/targets/discord/defaults/main.yml
index ef01141ca0..e53245324c 100644
--- a/tests/integration/targets/discord/defaults/main.yml
+++ b/tests/integration/targets/discord/defaults/main.yml
@@ -3,5 +3,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-discord_id: 000
+discord_id: 0
 discord_token: xxx
diff --git a/tests/integration/targets/filesize/tasks/basics.yml b/tests/integration/targets/filesize/tasks/basics.yml
index 3c06731899..d4675556a0 100644
--- a/tests/integration/targets/filesize/tasks/basics.yml
+++ b/tests/integration/targets/filesize/tasks/basics.yml
@@ -177,7 +177,6 @@
       - filesize_stat_basic_14.stat.checksum == filesize_test_checksum
 
 
-
 - name: Expand the file with 1 byte (57001B) (check mode)
   community.general.filesize:
     path: "{{ filesize_testfile }}"
@@ -253,7 +252,6 @@
       - filesize_stat_basic_24.stat.checksum != filesize_test_checksum
 
 
-
 - name: Expand the file up to 2 MiB (2*1024*1024 bytes) (check mode)
   community.general.filesize:
     path: "{{ filesize_testfile }}"
@@ -327,7 +325,6 @@
       - filesize_stat_basic_34.stat.size == 2*1024**2
 
 
-
 - name: Truncate the file to 57kB (57000B) (check mode)
   community.general.filesize:
     path: "{{ filesize_testfile }}"
@@ -404,7 +401,6 @@
       - filesize_stat_basic_44.stat.checksum == filesize_test_checksum
 
 
-
 - name: Remove test file
   ansible.builtin.file:
     path: "{{ filesize_testfile }}"
diff --git a/tests/integration/targets/filesize/tasks/floats.yml b/tests/integration/targets/filesize/tasks/floats.yml
index 6d1bde22c9..9c743f261d 100644
--- a/tests/integration/targets/filesize/tasks/floats.yml
+++ b/tests/integration/targets/filesize/tasks/floats.yml
@@ -89,7 +89,6 @@
       - filesize_stat_float_04.stat.size == 512512
 
 
-
 - name: Create a file with a size of 512.513kB (check mode)
   community.general.filesize:
     path: "{{ filesize_testfile }}"
@@ -166,7 +165,6 @@
       - filesize_stat_float_14.stat.size == 512513
 
 
-
 - name: Create a file with a size of 4.004MB (check mode)
   community.general.filesize:
     path: "{{ filesize_testfile }}"
diff --git a/tests/integration/targets/filesize/tasks/sparse.yml b/tests/integration/targets/filesize/tasks/sparse.yml
index 348a1eea1b..7c1b6744b2 100644
--- a/tests/integration/targets/filesize/tasks/sparse.yml
+++ b/tests/integration/targets/filesize/tasks/sparse.yml
@@ -119,7 +119,6 @@
       - filesize_stat_sparse_06.stat.size == 2*1000**4
 
 
-
 - name: Change sparse file size to 2TiB (check mode)
   community.general.filesize:
     path: "{{ filesize_testfile }}"
@@ -198,7 +197,6 @@
       - filesize_stat_sparse_14.stat.size == 2199023255552
 
 
-
 - name: Change sparse file size to 2.321TB (check mode)
   community.general.filesize:
     path: "{{ filesize_testfile }}"
@@ -279,7 +277,6 @@
       - filesize_stat_sparse_24.stat.size == 2321000000000
 
 
-
 - name: Remove test file
   ansible.builtin.file:
     path: "{{ filesize_testfile }}"
diff --git a/tests/integration/targets/filesize/tasks/symlinks.yml b/tests/integration/targets/filesize/tasks/symlinks.yml
index 0118896568..4f65d80c8c 100644
--- a/tests/integration/targets/filesize/tasks/symlinks.yml
+++ b/tests/integration/targets/filesize/tasks/symlinks.yml
@@ -13,14 +13,13 @@
 
 - name: Create a broken symlink in the same directory
   ansible.builtin.file:
-    src:  "{{ filesize_testfile | basename }}"
+    src: "{{ filesize_testfile | basename }}"
     dest: "{{ filesize_testlink }}"
     state: link
     force: true
     follow: false
 
 
-
 - name: Create a file with a size of 512 kB (512000 bytes) (check mode)
   community.general.filesize:
     path: "{{ filesize_testlink }}"
@@ -85,7 +84,6 @@
       - filesize_test_symlink_04.path != filesize_testlink
 
 
-
 - name: Remove test file
   ansible.builtin.file:
     path: "{{ filesize_testfile }}"
diff --git a/tests/integration/targets/filesystem/tasks/reset_fs_uuid.yml b/tests/integration/targets/filesystem/tasks/reset_fs_uuid.yml
index 77dad22033..bd9aa607c4 100644
--- a/tests/integration/targets/filesystem/tasks/reset_fs_uuid.yml
+++ b/tests/integration/targets/filesystem/tasks/reset_fs_uuid.yml
@@ -8,52 +8,52 @@
     - new_uuid | default(False)
     - not (ansible_system == "FreeBSD" and fstype == "xfs")
   block:
-  - name: "Create filesystem ({{ fstype }})"
-    community.general.filesystem:
-      dev: '{{ dev }}'
-      fstype: '{{ fstype }}'
-    register: fs_result
+    - name: "Create filesystem ({{ fstype }})"
+      community.general.filesystem:
+        dev: '{{ dev }}'
+        fstype: '{{ fstype }}'
+      register: fs_result
 
-  - name: "Get UUID of created filesystem"
-    ansible.builtin.shell:
-      cmd: "{{ get_uuid_cmd }}"
-    changed_when: false
-    register: uuid
+    - name: "Get UUID of created filesystem"
+      ansible.builtin.shell:
+        cmd: "{{ get_uuid_cmd }}"
+      changed_when: false
+      register: uuid
 
-  - name: "Reset filesystem ({{ fstype }}) UUID"
-    community.general.filesystem:
-      dev: '{{ dev }}'
-      fstype: '{{ fstype }}'
-      uuid: "{{ new_uuid }}"
-    register: fs_resetuuid_result
-
-  - name: "Get UUID of the filesystem"
-    ansible.builtin.shell:
-      cmd: "{{ get_uuid_cmd }}"
-    changed_when: false
-    register: uuid2
-
-  - name: "Assert that filesystem UUID is changed"
-    ansible.builtin.assert:
-      that:
-        - 'fs_resetuuid_result is changed'
-        - 'fs_resetuuid_result is success'
-        - 'uuid.stdout != uuid2.stdout'
-
-  - when:
-    - (grow | bool and (fstype != "vfat" or resize_vfat)) or
-      (fstype == "xfs" and ansible_system == "Linux" and
-      ansible_distribution not in ["CentOS", "Ubuntu"])
-    block:
-    - name: "Reset filesystem ({{ fstype }}) UUID and resizefs"
-      ignore_errors: true
+    - name: "Reset filesystem ({{ fstype }}) UUID"
       community.general.filesystem:
         dev: '{{ dev }}'
         fstype: '{{ fstype }}'
         uuid: "{{ new_uuid }}"
-        resizefs: true
-      register: fs_resetuuid_and_resizefs_result
+      register: fs_resetuuid_result
 
-    - name: "Assert that filesystem UUID reset and resizefs failed"
+    - name: "Get UUID of the filesystem"
+      ansible.builtin.shell:
+        cmd: "{{ get_uuid_cmd }}"
+      changed_when: false
+      register: uuid2
+
+    - name: "Assert that filesystem UUID is changed"
       ansible.builtin.assert:
-        that: fs_resetuuid_and_resizefs_result is failed
+        that:
+          - 'fs_resetuuid_result is changed'
+          - 'fs_resetuuid_result is success'
+          - 'uuid.stdout != uuid2.stdout'
+
+    - when:
+        - (grow | bool and (fstype != "vfat" or resize_vfat)) or
+          (fstype == "xfs" and ansible_system == "Linux" and
+          ansible_distribution not in ["CentOS", "Ubuntu"])
+      block:
+        - name: "Reset filesystem ({{ fstype }}) UUID and resizefs"
+          ignore_errors: true
+          community.general.filesystem:
+            dev: '{{ dev }}'
+            fstype: '{{ fstype }}'
+            uuid: "{{ new_uuid }}"
+            resizefs: true
+          register: fs_resetuuid_and_resizefs_result
+
+        - name: "Assert that filesystem UUID reset and resizefs failed"
+          ansible.builtin.assert:
+            that: fs_resetuuid_and_resizefs_result is failed
diff --git a/tests/integration/targets/filesystem/tasks/set_fs_uuid_on_creation.yml b/tests/integration/targets/filesystem/tasks/set_fs_uuid_on_creation.yml
index f52c44d655..9ec45e9e5c 100644
--- a/tests/integration/targets/filesystem/tasks/set_fs_uuid_on_creation.yml
+++ b/tests/integration/targets/filesystem/tasks/set_fs_uuid_on_creation.yml
@@ -12,33 +12,33 @@
     - new_uuid | default(False)
     - not (ansible_system == "FreeBSD" and fstype == "xfs")
   block:
-  - name: "Create filesystem ({{ fstype }}) with UUID"
-    community.general.filesystem:
-      dev: '{{ dev }}'
-      fstype: '{{ fstype }}'
-      uuid: '{{ random_uuid }}'
-    register: fs_result
+    - name: "Create filesystem ({{ fstype }}) with UUID"
+      community.general.filesystem:
+        dev: '{{ dev }}'
+        fstype: '{{ fstype }}'
+        uuid: '{{ random_uuid }}'
+      register: fs_result
 
-  - name: "Get UUID of the created filesystem"
-    ansible.builtin.shell:
-      cmd: "{{ get_uuid_cmd }}"
-    changed_when: false
-    register: uuid
+    - name: "Get UUID of the created filesystem"
+      ansible.builtin.shell:
+        cmd: "{{ get_uuid_cmd }}"
+      changed_when: false
+      register: uuid
 
-  - name: "Assert that filesystem UUID is the random UUID set on creation"
-    ansible.builtin.assert:
-      that: (random_uuid | replace('-','')) == ( uuid.stdout | replace('-',''))
+    - name: "Assert that filesystem UUID is the random UUID set on creation"
+      ansible.builtin.assert:
+        that: (random_uuid | replace('-','')) == ( uuid.stdout | replace('-',''))
 
 - when: not (new_uuid | default(False))
   block:
-  - name: "Create filesystem ({{ fstype }}) without UUID support"
-    ignore_errors: true
-    community.general.filesystem:
-      dev: '{{ dev }}'
-      fstype: '{{ fstype }}'
-      uuid: '{{ random_uuid }}'
-    register: fs_result
+    - name: "Create filesystem ({{ fstype }}) without UUID support"
+      ignore_errors: true
+      community.general.filesystem:
+        dev: '{{ dev }}'
+        fstype: '{{ fstype }}'
+        uuid: '{{ random_uuid }}'
+      register: fs_result
 
-  - name: "Assert that filesystem creation failed"
-    ansible.builtin.assert:
-      that: fs_result is failed
+    - name: "Assert that filesystem creation failed"
+      ansible.builtin.assert:
+        that: fs_result is failed
diff --git a/tests/integration/targets/filesystem/tasks/set_fs_uuid_on_creation_with_opts.yml b/tests/integration/targets/filesystem/tasks/set_fs_uuid_on_creation_with_opts.yml
index fc73e57ee2..e89668bad0 100644
--- a/tests/integration/targets/filesystem/tasks/set_fs_uuid_on_creation_with_opts.yml
+++ b/tests/integration/targets/filesystem/tasks/set_fs_uuid_on_creation_with_opts.yml
@@ -9,25 +9,25 @@
     - fstype != "xfs"
   block:
 
-  - name: "Generate random UUIDs"
-    ansible.builtin.set_fact:
-      random_uuid: '{{ "first_random_uuid" | ansible.builtin.to_uuid }}'
-      random_uuid2: '{{ "second_random_uuid" | ansible.builtin.to_uuid }}'
+    - name: "Generate random UUIDs"
+      ansible.builtin.set_fact:
+        random_uuid: '{{ "first_random_uuid" | ansible.builtin.to_uuid }}'
+        random_uuid2: '{{ "second_random_uuid" | ansible.builtin.to_uuid }}'
 
-  - name: "Create filesystem ({{ fstype }}) with fix UUID as opt"
-    community.general.filesystem:
-      dev: '{{ dev }}'
-      fstype: '{{ fstype }}'
-      opts: "{{ ((fstype == 'lvm') | ansible.builtin.ternary('--norestorefile --uuid ', '-U ')) + random_uuid2 }}"
-      uuid: '{{ random_uuid }}'
-    register: fs_result2
+    - name: "Create filesystem ({{ fstype }}) with fix UUID as opt"
+      community.general.filesystem:
+        dev: '{{ dev }}'
+        fstype: '{{ fstype }}'
+        opts: "{{ ((fstype == 'lvm') | ansible.builtin.ternary('--norestorefile --uuid ', '-U ')) + random_uuid2 }}"
+        uuid: '{{ random_uuid }}'
+      register: fs_result2
 
-  - name: "Get UUID of the created filesystem"
-    ansible.builtin.shell:
-      cmd: "{{ get_uuid_cmd }}"
-    changed_when: false
-    register: uuid2
+    - name: "Get UUID of the created filesystem"
+      ansible.builtin.shell:
+        cmd: "{{ get_uuid_cmd }}"
+      changed_when: false
+      register: uuid2
 
-  - name: "Assert that filesystem UUID is the one set on creation with opt"
-    ansible.builtin.assert:
-      that: (random_uuid2 | replace('-','')) == ( uuid2.stdout | replace('-',''))
+    - name: "Assert that filesystem UUID is the one set on creation with opt"
+      ansible.builtin.assert:
+        that: (random_uuid2 | replace('-','')) == ( uuid2.stdout | replace('-',''))
diff --git a/tests/integration/targets/filter_keep_keys/vars/main/tests.yml b/tests/integration/targets/filter_keep_keys/vars/main/tests.yml
index f1abceddda..c480a675d0 100644
--- a/tests/integration/targets/filter_keep_keys/vars/main/tests.yml
+++ b/tests/integration/targets/filter_keep_keys/vars/main/tests.yml
@@ -11,8 +11,8 @@ tests:
       - {k0_x0: A0, k1_x1: B0, k2_x2: [C0], k3_x3: foo}
       - {k0_x0: A1, k1_x1: B1, k2_x2: [C1], k3_x3: bar}
     result:
-       - {k0_x0: A0, k1_x1: B0}
-       - {k0_x0: A1, k1_x1: B1}
+      - {k0_x0: A0, k1_x1: B0}
+      - {k0_x0: A1, k1_x1: B1}
   - template: mp.j2
     group:
       - {mp: equal, tt: [k0_x0, k1_x1], d: Match keys that equal any of the items in the target.}
@@ -24,8 +24,8 @@ tests:
       - {k0_x0: A0, k1_x1: B0, k2_x2: [C0], k3_x3: foo}
       - {k0_x0: A1, k1_x1: B1, k2_x2: [C1], k3_x3: bar}
     result:
-       - {k0_x0: A0, k1_x1: B0}
-       - {k0_x0: A1, k1_x1: B1}
+      - {k0_x0: A0, k1_x1: B0}
+      - {k0_x0: A1, k1_x1: B1}
   - template: mp.j2
     group:
       - {mp: equal, tt: k0_x0, d: Match keys that equal the target.}
@@ -36,5 +36,5 @@ tests:
       - {k0_x0: A0, k1_x1: B0, k2_x2: [C0], k3_x3: foo}
       - {k0_x0: A1, k1_x1: B1, k2_x2: [C1], k3_x3: bar}
     result:
-       - {k0_x0: A0}
-       - {k0_x0: A1}
+      - {k0_x0: A0}
+      - {k0_x0: A1}
diff --git a/tests/integration/targets/filter_random_mac/tasks/main.yml b/tests/integration/targets/filter_random_mac/tasks/main.yml
index db47011927..583ef498a3 100644
--- a/tests/integration/targets/filter_random_mac/tasks/main.yml
+++ b/tests/integration/targets/filter_random_mac/tasks/main.yml
@@ -45,15 +45,15 @@
       - _bad_random_mac_filter is failed
       - "_bad_random_mac_filter.msg is search('Invalid value (.*) for random_mac: 5 colon.* separated items max')"
 
-- name:  Verify random_mac filter
+- name: Verify random_mac filter
   assert:
     that:
-            - "'00' | community.general.random_mac is match('^00:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]$')"
-            - "'00:00' | community.general.random_mac is match('^00:00:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]$')"
-            - "'00:00:00' | community.general.random_mac is match('^00:00:00:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]$')"
-            - "'00:00:00:00' | community.general.random_mac is match('^00:00:00:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]$')"
-            - "'00:00:00:00:00' | community.general.random_mac is match('^00:00:00:00:00:[a-f0-9][a-f0-9]$')"
-            - "'00:00:00' | community.general.random_mac != '00:00:00' | community.general.random_mac"
+      - "'00' | community.general.random_mac is match('^00:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]$')"
+      - "'00:00' | community.general.random_mac is match('^00:00:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]$')"
+      - "'00:00:00' | community.general.random_mac is match('^00:00:00:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]$')"
+      - "'00:00:00:00' | community.general.random_mac is match('^00:00:00:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]:[a-f0-9][a-f0-9]$')"
+      - "'00:00:00:00:00' | community.general.random_mac is match('^00:00:00:00:00:[a-f0-9][a-f0-9]$')"
+      - "'00:00:00' | community.general.random_mac != '00:00:00' | community.general.random_mac"
 
 - name: Verify random_mac filter with seed
   assert:
diff --git a/tests/integration/targets/filter_replace_keys/vars/main/tests.yml b/tests/integration/targets/filter_replace_keys/vars/main/tests.yml
index ca906a770b..a6e04f3b2e 100644
--- a/tests/integration/targets/filter_replace_keys/vars/main/tests.yml
+++ b/tests/integration/targets/filter_replace_keys/vars/main/tests.yml
@@ -14,8 +14,8 @@ tests:
       - {k0_x0: A0, k1_x1: B0, k2_x2: [C0], k3_x3: foo}
       - {k0_x0: A1, k1_x1: B1, k2_x2: [C1], k3_x3: bar}
     result:
-       - {a0: A0, a1: B0, k2_x2: [C0], k3_x3: foo}
-       - {a0: A1, a1: B1, k2_x2: [C1], k3_x3: bar}
+      - {a0: A0, a1: B0, k2_x2: [C0], k3_x3: foo}
+      - {a0: A1, a1: B1, k2_x2: [C1], k3_x3: bar}
   - template: mp.j2
     group:
       - d: Replace keys that starts with any of the attributes before.
@@ -37,8 +37,8 @@ tests:
       - {k0_x0: A0, k1_x1: B0, k2_x2: [C0], k3_x3: foo}
       - {k0_x0: A1, k1_x1: B1, k2_x2: [C1], k3_x3: bar}
     result:
-       - {a0: A0, a1: B0, k2_x2: [C0], k3_x3: foo}
-       - {a0: A1, a1: B1, k2_x2: [C1], k3_x3: bar}
+      - {a0: A0, a1: B0, k2_x2: [C0], k3_x3: foo}
+      - {a0: A1, a1: B1, k2_x2: [C1], k3_x3: bar}
   - template: mp.j2
     group:
       - d: If more keys match the same attribute before the last one will be used.
@@ -54,8 +54,8 @@ tests:
       - {k0_x0: A0, k1_x1: B0, k2_x2: [C0], k3_x3: foo}
       - {k0_x0: A1, k1_x1: B1, k2_x2: [C1], k3_x3: bar}
     result:
-       - X: foo
-       - X: bar
+      - X: foo
+      - X: bar
   - template: mp.j2
     group:
       - d: If there are more matches for a key the first one will be used.
diff --git a/tests/integration/targets/filter_reveal_ansible_type/tasks/tasks.yml b/tests/integration/targets/filter_reveal_ansible_type/tasks/tasks.yml
index 79b42ff7b2..48a819f62d 100644
--- a/tests/integration/targets/filter_reveal_ansible_type/tasks/tasks.yml
+++ b/tests/integration/targets/filter_reveal_ansible_type/tasks/tasks.yml
@@ -64,7 +64,7 @@
   assert:
     that: result == dtype
     success_msg: '"abc" is {{ dtype }}'
-    fail_msg:  '"abc" is {{ result }}, not {{ dtype }}'
+    fail_msg: '"abc" is {{ result }}, not {{ dtype }}'
     quiet: '{{ quiet_test | default(true) | bool }}'
   vars:
     result: '{{ "abc" | community.general.reveal_ansible_type }}'
@@ -74,7 +74,7 @@
   assert:
     that: result == dtype
     success_msg: '123 is {{ dtype }}'
-    fail_msg:  '123 is {{ result }}, not {{ dtype }}'
+    fail_msg: '123 is {{ result }}, not {{ dtype }}'
     quiet: '{{ quiet_test | default(true) | bool }}'
   vars:
     result: '{{ 123 | community.general.reveal_ansible_type }}'
@@ -84,7 +84,7 @@
   assert:
     that: result == dtype
     success_msg: '123.45 is {{ dtype }}'
-    fail_msg:  '123.45 is {{ result }}, not {{ dtype }}'
+    fail_msg: '123.45 is {{ result }}, not {{ dtype }}'
     quiet: '{{ quiet_test | default(true) | bool }}'
   vars:
     result: '{{ 123.45 | community.general.reveal_ansible_type }}'
@@ -94,7 +94,7 @@
   assert:
     that: result == dtype
     success_msg: 'true is {{ dtype }}'
-    fail_msg:  'true is {{ result }}, not {{ dtype }}'
+    fail_msg: 'true is {{ result }}, not {{ dtype }}'
     quiet: '{{ quiet_test | default(true) | bool }}'
   vars:
     result: '{{ true | community.general.reveal_ansible_type }}'
@@ -104,7 +104,7 @@
   assert:
     that: result == dtype
     success_msg: '["a", "b", "c"] is {{ dtype }}'
-    fail_msg:  '["a", "b", "c"] is {{ result }}, not {{ dtype }}'
+    fail_msg: '["a", "b", "c"] is {{ result }}, not {{ dtype }}'
     quiet: '{{ quiet_test | default(true) | bool }}'
   vars:
     result: '{{ ["a", "b", "c"] | community.general.reveal_ansible_type }}'
@@ -114,7 +114,7 @@
   assert:
     that: result == dtype
     success_msg: '[{"a": 1}, {"b": 2}] is {{ dtype }}'
-    fail_msg:  '[{"a": 1}, {"b": 2}] is {{ result }}, not {{ dtype }}'
+    fail_msg: '[{"a": 1}, {"b": 2}] is {{ result }}, not {{ dtype }}'
     quiet: '{{ quiet_test | default(true) | bool }}'
   vars:
     result: '{{ [{"a": 1}, {"b": 2}] | community.general.reveal_ansible_type }}'
@@ -124,7 +124,7 @@
   assert:
     that: result == dtype
     success_msg: '{"a": 1} is {{ dtype }}'
-    fail_msg:  '{"a": 1} is {{ result }}, not {{ dtype }}'
+    fail_msg: '{"a": 1} is {{ result }}, not {{ dtype }}'
     quiet: '{{ quiet_test | default(true) | bool }}'
   vars:
     result: '{{ {"a": 1} | community.general.reveal_ansible_type }}'
@@ -134,7 +134,7 @@
   assert:
     that: result == dtype
     success_msg: '{"a": 1, "b": 2} is {{ dtype }}'
-    fail_msg:  '{"a": 1, "b": 2} is {{ result }}, not {{ dtype }}'
+    fail_msg: '{"a": 1, "b": 2} is {{ result }}, not {{ dtype }}'
     quiet: '{{ quiet_test | default(true) | bool }}'
   vars:
     result: '{{ {"a": 1, "b": 2} | community.general.reveal_ansible_type }}'
@@ -175,7 +175,7 @@
     quiet: '{{ quiet_test | default(true) | bool }}'
   vars:
     alias: {"AnsibleUnicode": "str", "_AnsibleTaggedStr": "str", "_AnsibleTaggedInt": "int", "_AnsibleTaggedFloat": "float"}
-    data: {'a': 1, 'b': 1.1, 'c': 'abc', 'd': True, 'e': ['x', 'y', 'z'], 'f': {'x': 1, 'y': 2}}
+    data: {'a': 1, 'b': 1.1, 'c': 'abc', 'd': true, 'e': ['x', 'y', 'z'], 'f': {'x': 1, 'y': 2}}
     result: '{{ data | community.general.reveal_ansible_type(alias) }}'
     dtype: dict[str, bool|dict|float|int|list|str]
 
@@ -187,6 +187,6 @@
     quiet: '{{ quiet_test | default(true) | bool }}'
   vars:
     alias: {"AnsibleUnicode": "str", "_AnsibleTaggedStr": "str", "_AnsibleTaggedInt": "int", "_AnsibleTaggedFloat": "float"}
-    data: [1, 2, 1.1, 'abc', True, ['x', 'y', 'z'], {'x': 1, 'y': 2}]
+    data: [1, 2, 1.1, 'abc', true, ['x', 'y', 'z'], {'x': 1, 'y': 2}]
     result: '{{ data | community.general.reveal_ansible_type(alias) }}'
     dtype: list[bool|dict|float|int|list|str]
diff --git a/tests/integration/targets/flatpak/tasks/main.yml b/tests/integration/targets/flatpak/tasks/main.yml
index deaf354e8a..e05e2a168e 100644
--- a/tests/integration/targets/flatpak/tasks/main.yml
+++ b/tests/integration/targets/flatpak/tasks/main.yml
@@ -11,53 +11,53 @@
 
 - block:
 
-  - import_tasks: setup.yml
-    become: true
+    - import_tasks: setup.yml
+      become: true
 
-  # executable override
+    # executable override
 
-  - name: Test executable override
-    flatpak:
-      name: com.dummy.App1
-      remote: dummy-remote
-      state: present
-      executable: nothing-that-exists
-    ignore_errors: true
-    register: executable_override_result
+    - name: Test executable override
+      flatpak:
+        name: com.dummy.App1
+        remote: dummy-remote
+        state: present
+        executable: nothing-that-exists
+      ignore_errors: true
+      register: executable_override_result
 
-  - name: Verify executable override test result
-    assert:
-      that:
-        - executable_override_result is failed
-        - executable_override_result is not changed
-      msg: "Specifying non-existing executable shall fail module execution"
+    - name: Verify executable override test result
+      assert:
+        that:
+          - executable_override_result is failed
+          - executable_override_result is not changed
+        msg: "Specifying non-existing executable shall fail module execution"
 
-  - import_tasks: check_mode.yml
-    become: false
+    - import_tasks: check_mode.yml
+      become: false
 
-  - import_tasks: test.yml
-    become: false
-    vars:
-      method: user
+    - import_tasks: test.yml
+      become: false
+      vars:
+        method: user
 
-  - import_tasks: test.yml
-    become: true
-    vars:
-      method: system
+    - import_tasks: test.yml
+      become: true
+      vars:
+        method: system
 
   always:
 
-  - name: Check HTTP server status
-    async_status:
-      jid: "{{ webserver_status.ansible_job_id }}"
-    ignore_errors: true
+    - name: Check HTTP server status
+      async_status:
+        jid: "{{ webserver_status.ansible_job_id }}"
+      ignore_errors: true
 
-  - name: List processes
-    command: ps aux
+    - name: List processes
+      command: ps aux
 
-  - name: Stop HTTP server
-    command: >-
-      pkill -f -- '{{ remote_tmp_dir }}/serve.py'
+    - name: Stop HTTP server
+      command: >-
+        pkill -f -- '{{ remote_tmp_dir }}/serve.py'
 
   when: |
       ansible_distribution == 'Fedora' or
diff --git a/tests/integration/targets/flatpak/tasks/setup.yml b/tests/integration/targets/flatpak/tasks/setup.yml
index 4dfdd68cb9..041c736624 100644
--- a/tests/integration/targets/flatpak/tasks/setup.yml
+++ b/tests/integration/targets/flatpak/tasks/setup.yml
@@ -11,17 +11,17 @@
   when: ansible_distribution == 'Fedora'
 
 - block:
-  - name: Activate flatpak ppa on Ubuntu
-    apt_repository:
-      repo: ppa:alexlarsson/flatpak
-      state: present
-      mode: '0644'
-    when: ansible_lsb.major_release | int < 18
+    - name: Activate flatpak ppa on Ubuntu
+      apt_repository:
+        repo: ppa:alexlarsson/flatpak
+        state: present
+        mode: '0644'
+      when: ansible_lsb.major_release | int < 18
 
-  - name: Install flatpak package on Ubuntu
-    apt:
-      name: flatpak
-      state: present
+    - name: Install flatpak package on Ubuntu
+      apt:
+        name: flatpak
+        state: present
 
   when: ansible_distribution == 'Ubuntu'
 
diff --git a/tests/integration/targets/flatpak/tasks/test.yml b/tests/integration/targets/flatpak/tasks/test.yml
index 658f7b1168..1c580b6fbf 100644
--- a/tests/integration/targets/flatpak/tasks/test.yml
+++ b/tests/integration/targets/flatpak/tasks/test.yml
@@ -164,25 +164,25 @@
 - when: url_removal_result is not failed
   block:
 
-  - name: Verify removal test result - {{ method }}
-    assert:
-      that:
-        - url_removal_result is changed
-      msg: "state=absent with url as name shall remove flatpak when present"
+    - name: Verify removal test result - {{ method }}
+      assert:
+        that:
+          - url_removal_result is changed
+        msg: "state=absent with url as name shall remove flatpak when present"
 
-  - name: Test idempotency of removal with url - {{ method }}
-    flatpak:
-      name: http://127.0.0.1:8000/repo/com.dummy.App1.flatpakref
-      state: absent
-      method: "{{ method }}"
-      no_dependencies: true
-    register: double_url_removal_result
+    - name: Test idempotency of removal with url - {{ method }}
+      flatpak:
+        name: http://127.0.0.1:8000/repo/com.dummy.App1.flatpakref
+        state: absent
+        method: "{{ method }}"
+        no_dependencies: true
+      register: double_url_removal_result
 
-  - name: Verify idempotency of removal with url test result - {{ method }}
-    assert:
-      that:
-        - double_url_removal_result is not changed
-      msg: "state=absent with url as name shall not do anything when flatpak is not present"
+    - name: Verify idempotency of removal with url test result - {{ method }}
+      assert:
+        that:
+          - double_url_removal_result is not changed
+        msg: "state=absent with url as name shall not do anything when flatpak is not present"
 
 - name: Make sure flatpak is really gone - {{ method }}
   flatpak:
diff --git a/tests/integration/targets/flatpak_remote/tasks/main.yml b/tests/integration/targets/flatpak_remote/tasks/main.yml
index 1c50912328..951ab5aefb 100644
--- a/tests/integration/targets/flatpak_remote/tasks/main.yml
+++ b/tests/integration/targets/flatpak_remote/tasks/main.yml
@@ -11,39 +11,39 @@
 
 - block:
 
-  - import_tasks: setup.yml
-    become: true
+    - import_tasks: setup.yml
+      become: true
 
-  # executable override
+    # executable override
 
-  - name: Test executable override
-    flatpak_remote:
-      name: irrelevant
-      remote: irrelevant
-      state: present
-      executable: nothing-that-exists
-    ignore_errors: true
-    register: executable_override_result
+    - name: Test executable override
+      flatpak_remote:
+        name: irrelevant
+        remote: irrelevant
+        state: present
+        executable: nothing-that-exists
+      ignore_errors: true
+      register: executable_override_result
 
-  - name: Verify executable override test result
-    assert:
-      that:
-        - executable_override_result is failed
-        - executable_override_result is not changed
-      msg: "Specifying non-existing executable shall fail module execution"
+    - name: Verify executable override test result
+      assert:
+        that:
+          - executable_override_result is failed
+          - executable_override_result is not changed
+        msg: "Specifying non-existing executable shall fail module execution"
 
-  - import_tasks: check_mode.yml
-    become: false
+    - import_tasks: check_mode.yml
+      become: false
 
-  - import_tasks: test.yml
-    become: false
-    vars:
-      method: user
+    - import_tasks: test.yml
+      become: false
+      vars:
+        method: user
 
-  - import_tasks: test.yml
-    become: true
-    vars:
-      method: system
+    - import_tasks: test.yml
+      become: true
+      vars:
+        method: system
 
   when: |
       ansible_distribution == 'Fedora' or
diff --git a/tests/integration/targets/flatpak_remote/tasks/setup.yml b/tests/integration/targets/flatpak_remote/tasks/setup.yml
index 55a14c9724..9fbf4cbe15 100644
--- a/tests/integration/targets/flatpak_remote/tasks/setup.yml
+++ b/tests/integration/targets/flatpak_remote/tasks/setup.yml
@@ -9,16 +9,16 @@
     state: present
   when: ansible_distribution == 'Fedora'
 - block:
-  - name: Activate flatpak ppa on Ubuntu versions older than 18.04/bionic
-    apt_repository:
-      repo: ppa:alexlarsson/flatpak
-      state: present
-      mode: '0644'
-    when: ansible_lsb.major_release | int < 18
-  - name: Install flatpak package on Ubuntu
-    apt:
-      name: flatpak
-      state: present
+    - name: Activate flatpak ppa on Ubuntu versions older than 18.04/bionic
+      apt_repository:
+        repo: ppa:alexlarsson/flatpak
+        state: present
+        mode: '0644'
+      when: ansible_lsb.major_release | int < 18
+    - name: Install flatpak package on Ubuntu
+      apt:
+        name: flatpak
+        state: present
   when: ansible_distribution == 'Ubuntu'
 - name: Install flatpak remote for testing check mode
   flatpak_remote:
diff --git a/tests/integration/targets/gandi_livedns/defaults/main.yml b/tests/integration/targets/gandi_livedns/defaults/main.yml
index ec1808d8b5..7acd5c0cab 100644
--- a/tests/integration/targets/gandi_livedns/defaults/main.yml
+++ b/tests/integration/targets/gandi_livedns/defaults/main.yml
@@ -6,32 +6,32 @@
 gandi_livedns_domain_name: "ansible-tests.org"
 gandi_livedns_record_items:
 
-# Single A record
-- record: test-www
-  type: A
-  values:
+  # Single A record
+  - record: test-www
+    type: A
+    values:
       - 10.10.10.10
-  ttl: 400
-  update_values:
+    ttl: 400
+    update_values:
       - 10.10.10.11
-  update_ttl: 800
+    update_ttl: 800
 
-# Multiple A records
-- record: test-www-multiple
-  type: A
-  ttl: 3600
-  values:
+  # Multiple A records
+  - record: test-www-multiple
+    type: A
+    ttl: 3600
+    values:
       - 10.10.11.10
       - 10.10.11.10
-  update_values:
+    update_values:
       - 10.10.11.11
       - 10.10.11.13
 
-# CNAME
-- record: test-cname
-  type: CNAME
-  ttl: 10800
-  values:
+  # CNAME
+  - record: test-cname
+    type: CNAME
+    ttl: 10800
+    values:
       - test-www2
-  update_values:
+    update_values:
       - test-www
diff --git a/tests/integration/targets/gandi_livedns/tasks/create_record.yml b/tests/integration/targets/gandi_livedns/tasks/create_record.yml
index 87056aa865..708fa02715 100644
--- a/tests/integration/targets/gandi_livedns/tasks/create_record.yml
+++ b/tests/integration/targets/gandi_livedns/tasks/create_record.yml
@@ -15,7 +15,7 @@
 - name: verify test absent dns record
   assert:
     that:
-    - result is successful
+      - result is successful
 
 - name: test create a dns record in check mode
   community.general.gandi_livedns:
@@ -30,7 +30,7 @@
 - name: verify test create a dns record in check mode
   assert:
     that:
-    - result is changed
+      - result is changed
 
 - name: test create a dns record
   community.general.gandi_livedns:
@@ -44,11 +44,11 @@
 - name: verify test create a dns record
   assert:
     that:
-    - result is changed
-    - result.record['values'] == item['values']
-    - result.record.record == item.record
-    - result.record.type == item.type
-    - result.record.ttl == item.ttl
+      - result is changed
+      - result.record['values'] == item['values']
+      - result.record.record == item.record
+      - result.record.type == item.type
+      - result.record.ttl == item.ttl
 
 - name: test create a dns record idempotence
   community.general.gandi_livedns:
@@ -62,11 +62,11 @@
 - name: verify test create a dns record idempotence
   assert:
     that:
-    - result is not changed
-    - result.record['values'] == item['values']
-    - result.record.record == item.record
-    - result.record.type == item.type
-    - result.record.ttl == item.ttl
+      - result is not changed
+      - result.record['values'] == item['values']
+      - result.record.record == item.record
+      - result.record.type == item.type
+      - result.record.ttl == item.ttl
 
 - name: test create a DNS record with personal access token
   community.general.gandi_livedns:
diff --git a/tests/integration/targets/gandi_livedns/tasks/remove_record.yml b/tests/integration/targets/gandi_livedns/tasks/remove_record.yml
index c4b937fd5a..1e46ac32f8 100644
--- a/tests/integration/targets/gandi_livedns/tasks/remove_record.yml
+++ b/tests/integration/targets/gandi_livedns/tasks/remove_record.yml
@@ -16,7 +16,7 @@
 - name: verify test remove a dns record in check mode
   assert:
     that:
-    - result is changed
+      - result is changed
 
 - name: test remove a dns record
   community.general.gandi_livedns:
@@ -30,7 +30,7 @@
 - name: verify test remove a dns record
   assert:
     that:
-    - result is changed
+      - result is changed
 
 - name: test remove a dns record idempotence
   community.general.gandi_livedns:
@@ -44,7 +44,7 @@
 - name: verify test remove a dns record idempotence
   assert:
     that:
-    - result is not changed
+      - result is not changed
 
 - name: test remove second dns record idempotence
   community.general.gandi_livedns:
@@ -58,4 +58,4 @@
 - name: verify test remove a dns record idempotence
   assert:
     that:
-    - result is not changed
+      - result is not changed
diff --git a/tests/integration/targets/gandi_livedns/tasks/update_record.yml b/tests/integration/targets/gandi_livedns/tasks/update_record.yml
index 5f19bfa244..1bcd82fb3f 100644
--- a/tests/integration/targets/gandi_livedns/tasks/update_record.yml
+++ b/tests/integration/targets/gandi_livedns/tasks/update_record.yml
@@ -16,11 +16,11 @@
 - name: verify test update in check mode
   assert:
     that:
-    - result is changed
-    - result.record['values'] == (item.update_values | default(item['values']))
-    - result.record.record == item.record
-    - result.record.type == item.type
-    - result.record.ttl == (item.update_ttl | default(item.ttl))
+      - result is changed
+      - result.record['values'] == (item.update_values | default(item['values']))
+      - result.record.record == item.record
+      - result.record.type == item.type
+      - result.record.ttl == (item.update_ttl | default(item.ttl))
 
 - name: test update or add another dns record
   community.general.gandi_livedns:
@@ -34,11 +34,11 @@
 - name: verify test update a dns record
   assert:
     that:
-    - result is changed
-    - result.record['values'] == (item.update_values | default(item['values']))
-    - result.record.record == item.record
-    - result.record.ttl == (item.update_ttl | default(item.ttl))
-    - result.record.type == item.type
+      - result is changed
+      - result.record['values'] == (item.update_values | default(item['values']))
+      - result.record.record == item.record
+      - result.record.ttl == (item.update_ttl | default(item.ttl))
+      - result.record.type == item.type
 
 - name: test update or add another dns record idempotence
   community.general.gandi_livedns:
@@ -52,8 +52,8 @@
 - name: verify test update a dns record idempotence
   assert:
     that:
-    - result is not changed
-    - result.record['values'] == (item.update_values | default(item['values']))
-    - result.record.record == item.record
-    - result.record.ttl == (item.update_ttl | default(item.ttl))
-    - result.record.type == item.type
+      - result is not changed
+      - result.record['values'] == (item.update_values | default(item['values']))
+      - result.record.record == item.record
+      - result.record.ttl == (item.update_ttl | default(item.ttl))
+      - result.record.type == item.type
diff --git a/tests/integration/targets/gem/tasks/main.yml b/tests/integration/targets/gem/tasks/main.yml
index 2848a92bfb..0c85e56489 100644
--- a/tests/integration/targets/gem/tasks/main.yml
+++ b/tests/integration/targets/gem/tasks/main.yml
@@ -13,202 +13,202 @@
     - not (ansible_os_family == 'Alpine')  # TODO
   block:
 
-  - include_vars: '{{ item }}'
-    with_first_found:
-      - files:
-          - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml'
-          - '{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml'
-          - '{{ ansible_distribution }}.yml'
-          - '{{ ansible_os_family }}.yml'
-          - 'default.yml'
-        paths: '../vars'
+    - include_vars: '{{ item }}'
+      with_first_found:
+        - files:
+            - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml'
+            - '{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml'
+            - '{{ ansible_distribution }}.yml'
+            - '{{ ansible_os_family }}.yml'
+            - 'default.yml'
+          paths: '../vars'
 
-  - name: Install dependencies for test
-    package:
-      name: "{{ item }}"
-      state: present
-    loop: "{{ test_packages }}"
-    when: ansible_distribution != "MacOSX"
+    - name: Install dependencies for test
+      package:
+        name: "{{ item }}"
+        state: present
+      loop: "{{ test_packages }}"
+      when: ansible_distribution != "MacOSX"
 
-  - name: Install a gem
-    gem:
-      name: gist
-      state: present
-    register: install_gem_result
-    ignore_errors: true
-
-  # when running as root on Fedora, '--install-dir' is set in the os defaults which is
-  # incompatible with '--user-install', we ignore this error for this case only
-  - name: fail if failed to install gem
-    fail:
-      msg: "failed to install gem: {{ install_gem_result.msg }}"
-    when:
-    - install_gem_result is failed
-    - not (ansible_user_uid == 0 and "User --install-dir or --user-install but not both" not in install_gem_result.msg)
-
-  - block:
-    - name: List gems
-      command: gem list
-      register: current_gems
-
-    - name: Ensure gem was installed
-      assert:
-        that:
-          - install_gem_result is changed
-          - current_gems.stdout is search('gist\s+\([0-9.]+\)')
-
-    - name: Remove a gem
+    - name: Install a gem
       gem:
         name: gist
-        state: absent
-      register: remove_gem_results
+        state: present
+      register: install_gem_result
+      ignore_errors: true
 
-    - name: List gems
-      command: gem list
-      register: current_gems
+    # when running as root on Fedora, '--install-dir' is set in the os defaults which is
+    # incompatible with '--user-install', we ignore this error for this case only
+    - name: fail if failed to install gem
+      fail:
+        msg: "failed to install gem: {{ install_gem_result.msg }}"
+      when:
+        - install_gem_result is failed
+        - not (ansible_user_uid == 0 and "User --install-dir or --user-install but not both" not in install_gem_result.msg)
 
-    - name: Verify gem is not installed
+    - block:
+        - name: List gems
+          command: gem list
+          register: current_gems
+
+        - name: Ensure gem was installed
+          assert:
+            that:
+              - install_gem_result is changed
+              - current_gems.stdout is search('gist\s+\([0-9.]+\)')
+
+        - name: Remove a gem
+          gem:
+            name: gist
+            state: absent
+          register: remove_gem_results
+
+        - name: List gems
+          command: gem list
+          register: current_gems
+
+        - name: Verify gem is not installed
+          assert:
+            that:
+              - remove_gem_results is changed
+              - current_gems.stdout is not search('gist\s+\([0-9.]+\)')
+      when: not install_gem_result is failed
+
+    # install gem in --no-user-install
+    - block:
+        - name: Install a gem with --no-user-install
+          gem:
+            name: gist
+            state: present
+            user_install: false
+          register: install_gem_result
+
+        - name: List gems
+          command: gem list
+          register: current_gems
+
+        - name: Ensure gem was installed
+          assert:
+            that:
+              - install_gem_result is changed
+              - current_gems.stdout is search('gist\s+\([0-9.]+\)')
+
+        - name: Remove a gem
+          gem:
+            name: gist
+            state: absent
+          register: remove_gem_results
+
+        - name: List gems
+          command: gem list
+          register: current_gems
+
+        - name: Verify gem is not installed
+          assert:
+            that:
+              - remove_gem_results is changed
+              - current_gems.stdout is not search('gist\s+\([0-9.]+\)')
+      when: ansible_user_uid == 0
+
+    # Check custom gem directory
+    - name: Install gem in a custom directory with incorrect options
+      gem:
+        name: gist
+        state: present
+        install_dir: "{{ remote_tmp_dir }}/gems"
+      ignore_errors: true
+      register: install_gem_fail_result
+
+    - debug:
+        var: install_gem_fail_result
+      tags: debug
+
+    - name: Ensure previous task failed
       assert:
         that:
-          - remove_gem_results is changed
-          - current_gems.stdout is not search('gist\s+\([0-9.]+\)')
-    when: not install_gem_result is failed
+          - install_gem_fail_result is failed
+          - install_gem_fail_result.msg == 'install_dir requires user_install=false'
 
-  # install gem in --no-user-install
-  - block:
-    - name: Install a gem with --no-user-install
+    - name: Install a gem in a custom directory
       gem:
         name: gist
         state: present
         user_install: false
+        install_dir: "{{ remote_tmp_dir }}/gems"
       register: install_gem_result
 
-    - name: List gems
-      command: gem list
-      register: current_gems
+    - name: Find gems in custom directory
+      find:
+        paths: "{{ remote_tmp_dir }}/gems/gems"
+        file_type: directory
+        contains: gist
+      register: gem_search
 
-    - name: Ensure gem was installed
+    - name: Ensure gem was installed in custom directory
       assert:
         that:
           - install_gem_result is changed
-          - current_gems.stdout is search('gist\s+\([0-9.]+\)')
+          - gem_search.files[0].path is search('gist-[0-9.]+')
+      ignore_errors: true
 
-    - name: Remove a gem
+    - name: Remove a gem in a custom directory
       gem:
         name: gist
         state: absent
-      register: remove_gem_results
+        user_install: false
+        install_dir: "{{ remote_tmp_dir }}/gems"
+      register: install_gem_result
 
-    - name: List gems
-      command: gem list
-      register: current_gems
+    - name: Find gems in custom directory
+      find:
+        paths: "{{ remote_tmp_dir }}/gems/gems"
+        file_type: directory
+        contains: gist
+      register: gem_search
 
-    - name: Verify gem is not installed
+    - name: Ensure gem was removed in custom directory
       assert:
         that:
-          - remove_gem_results is changed
-          - current_gems.stdout is not search('gist\s+\([0-9.]+\)')
-    when: ansible_user_uid == 0
+          - install_gem_result is changed
+          - gem_search.files | length == 0
 
-  # Check custom gem directory
-  - name: Install gem in a custom directory with incorrect options
-    gem:
-      name: gist
-      state: present
-      install_dir: "{{ remote_tmp_dir }}/gems"
-    ignore_errors: true
-    register: install_gem_fail_result
+    # Custom directory for executables (--bindir)
+    - name: Install gem with custom bindir
+      gem:
+        name: gist
+        state: present
+        bindir: "{{ remote_tmp_dir }}/custom_bindir"
+        norc: true
+        user_install: false  # Avoid conflicts between --install-dir and --user-install when running as root on CentOS / Fedora / RHEL
+      register: install_gem_result
 
-  - debug:
-      var: install_gem_fail_result
-    tags: debug
+    - name: Get stats of gem executable
+      stat:
+        path: "{{ remote_tmp_dir }}/custom_bindir/gist"
+      register: gem_bindir_stat
 
-  - name: Ensure previous task failed
-    assert:
-      that:
-        - install_gem_fail_result is failed
-        - install_gem_fail_result.msg == 'install_dir requires user_install=false'
+    - name: Ensure gem executable was installed in custom directory
+      assert:
+        that:
+          - install_gem_result is changed
+          - gem_bindir_stat.stat.exists and gem_bindir_stat.stat.isreg
 
-  - name: Install a gem in a custom directory
-    gem:
-      name: gist
-      state: present
-      user_install: false
-      install_dir: "{{ remote_tmp_dir }}/gems"
-    register: install_gem_result
+    - name: Remove gem with custom bindir
+      gem:
+        name: gist
+        state: absent
+        bindir: "{{ remote_tmp_dir }}/custom_bindir"
+        norc: true
+        user_install: false  # Avoid conflicts between --install-dir and --user-install when running as root on CentOS / Fedora / RHEL
+      register: install_gem_result
 
-  - name: Find gems in custom directory
-    find:
-      paths: "{{ remote_tmp_dir }}/gems/gems"
-      file_type: directory
-      contains: gist
-    register: gem_search
+    - name: Get stats of gem executable
+      stat:
+        path: "{{ remote_tmp_dir }}/custom_bindir/gist"
+      register: gem_bindir_stat
 
-  - name: Ensure gem was installed in custom directory
-    assert:
-      that:
-        - install_gem_result is changed
-        - gem_search.files[0].path is search('gist-[0-9.]+')
-    ignore_errors: true
-
-  - name: Remove a gem in a custom directory
-    gem:
-      name: gist
-      state: absent
-      user_install: false
-      install_dir: "{{ remote_tmp_dir }}/gems"
-    register: install_gem_result
-
-  - name: Find gems in custom directory
-    find:
-      paths: "{{ remote_tmp_dir }}/gems/gems"
-      file_type: directory
-      contains: gist
-    register: gem_search
-
-  - name: Ensure gem was removed in custom directory
-    assert:
-      that:
-        - install_gem_result is changed
-        - gem_search.files | length == 0
-
-  # Custom directory for executables (--bindir)
-  - name: Install gem with custom bindir
-    gem:
-      name: gist
-      state: present
-      bindir: "{{ remote_tmp_dir }}/custom_bindir"
-      norc: true
-      user_install: false  # Avoid conflicts between --install-dir and --user-install when running as root on CentOS / Fedora / RHEL
-    register: install_gem_result
-
-  - name: Get stats of gem executable
-    stat:
-      path: "{{ remote_tmp_dir }}/custom_bindir/gist"
-    register: gem_bindir_stat
-
-  - name: Ensure gem executable was installed in custom directory
-    assert:
-      that:
-        - install_gem_result is changed
-        - gem_bindir_stat.stat.exists and gem_bindir_stat.stat.isreg
-
-  - name: Remove gem with custom bindir
-    gem:
-      name: gist
-      state: absent
-      bindir: "{{ remote_tmp_dir }}/custom_bindir"
-      norc: true
-      user_install: false  # Avoid conflicts between --install-dir and --user-install when running as root on CentOS / Fedora / RHEL
-    register: install_gem_result
-
-  - name: Get stats of gem executable
-    stat:
-      path: "{{ remote_tmp_dir }}/custom_bindir/gist"
-    register: gem_bindir_stat
-
-  - name: Ensure gem executable was removed from custom directory
-    assert:
-      that:
-        - install_gem_result is changed
-        - not gem_bindir_stat.stat.exists
+    - name: Ensure gem executable was removed from custom directory
+      assert:
+        that:
+          - install_gem_result is changed
+          - not gem_bindir_stat.stat.exists
diff --git a/tests/integration/targets/git_config/tasks/set_value_with_tilde.yml b/tests/integration/targets/git_config/tasks/set_value_with_tilde.yml
index 3f73752a10..e4b1195194 100644
--- a/tests/integration/targets/git_config/tasks/set_value_with_tilde.yml
+++ b/tests/integration/targets/git_config/tasks/set_value_with_tilde.yml
@@ -3,7 +3,7 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-#- import_tasks: setup_no_value.yml
+# - import_tasks: setup_no_value.yml
 
 - name: setting value
   git_config:
diff --git a/tests/integration/targets/git_config_info/tasks/main.yml b/tests/integration/targets/git_config_info/tasks/main.yml
index 993238805e..20042e7427 100644
--- a/tests/integration/targets/git_config_info/tasks/main.yml
+++ b/tests/integration/targets/git_config_info/tasks/main.yml
@@ -15,18 +15,27 @@
 - block:
     - include_tasks: get_simple_value.yml
       loop:
-      - { import_file: setup_global.yml, git_scope: 'global' }
-      - { import_file: setup_file.yml,   git_scope: 'file', git_file: "{{ remote_tmp_dir }}/gitconfig_file" }
+        - import_file: setup_global.yml
+          git_scope: 'global'
+        - import_file: setup_file.yml
+          git_scope: 'file'
+          git_file: "{{ remote_tmp_dir }}/gitconfig_file"
 
     - include_tasks: get_multi_value.yml
       loop:
-      - { import_file: setup_global.yml, git_scope: 'global' }
-      - { import_file: setup_file.yml,   git_scope: 'file', git_file: "{{ remote_tmp_dir }}/gitconfig_file" }
+        - import_file: setup_global.yml
+          git_scope: 'global'
+        - import_file: setup_file.yml
+          git_scope: 'file'
+          git_file: "{{ remote_tmp_dir }}/gitconfig_file"
 
     - include_tasks: get_all_values.yml
       loop:
-      - { import_file: setup_global.yml, git_scope: 'global' }
-      - { import_file: setup_file.yml,   git_scope: 'file', git_file: "{{ remote_tmp_dir }}/gitconfig_file" }
+        - import_file: setup_global.yml
+          git_scope: 'global'
+        - import_file: setup_file.yml
+          git_scope: 'file'
+          git_file: "{{ remote_tmp_dir }}/gitconfig_file"
 
     - include_tasks: error_handling.yml
   when: git_installed is succeeded and git_version.stdout is version(git_version_supporting_includes, ">=")
diff --git a/tests/integration/targets/github_app_access_token/tasks/main.yml b/tests/integration/targets/github_app_access_token/tasks/main.yml
index 9b7ba5d2c1..dbaa61d230 100644
--- a/tests/integration/targets/github_app_access_token/tasks/main.yml
+++ b/tests/integration/targets/github_app_access_token/tasks/main.yml
@@ -12,7 +12,7 @@
 - name: Install JWT
   ansible.builtin.pip:
     name:
-    - jwt
+      - jwt
 
 - name: Read file
   ansible.builtin.set_fact:
@@ -26,5 +26,5 @@
 
 - assert:
     that:
-    - github_app_access_token is failed
-    - '"Github return error" in github_app_access_token.msg'
+      - github_app_access_token is failed
+      - '"Github return error" in github_app_access_token.msg'
diff --git a/tests/integration/targets/gitlab_group_access_token/tasks/main.yml b/tests/integration/targets/gitlab_group_access_token/tasks/main.yml
index 4e6234238e..da2c9698f7 100644
--- a/tests/integration/targets/gitlab_group_access_token/tasks/main.yml
+++ b/tests/integration/targets/gitlab_group_access_token/tasks/main.yml
@@ -25,8 +25,8 @@
         expires_at: '2025-01-01'
         access_level: developer
         scopes:
-        - api
-        - read_api
+          - api
+          - read_api
       register: create_pfail_token_status
   always:
     - name: Assert that token creation in nonexisting group failed
@@ -47,8 +47,8 @@
         expires_at: '2025-13-01'
         access_level: developer
         scopes:
-        - api
-        - read_api
+          - api
+          - read_api
       register: create_efail_token_status
   always:
     - name: Assert that token creation with invalid expires_at failed
@@ -68,8 +68,8 @@
     expires_at: '2024-12-31'
     access_level: developer
     scopes:
-    - api
-    - read_api
+      - api
+      - read_api
   register: create_token_status
 - name: Assert that token creation with valid arguments is successfull
   assert:
@@ -88,8 +88,8 @@
     expires_at: '2024-12-31'
     access_level: developer
     scopes:
-    - api
-    - read_api
+      - api
+      - read_api
   register: check_token_status
 - name: Assert that token creation without changes and recreate=never succeeds with status not changed
   assert:
@@ -108,8 +108,8 @@
     expires_at: '2024-12-31'
     access_level: developer
     scopes:
-    - api
-    - read_api
+      - api
+      - read_api
     recreate: state_change
   register: check_recreate_token_status
 - name: Assert that token creation without changes and recreate=state_change succeeds with status not changed
@@ -130,8 +130,8 @@
         expires_at: '2025-01-01'
         access_level: developer
         scopes:
-        - api
-        - read_api
+          - api
+          - read_api
       register: change_token_status
   always:
     - name: Assert that token change with recreate=never fails
@@ -151,8 +151,8 @@
     expires_at: '2025-01-01'
     access_level: developer
     scopes:
-    - api
-    - read_api
+      - api
+      - read_api
     recreate: state_change
   register: change_recreate_token_status
 - name: Assert that token change with recreate=state_change succeeds
@@ -172,8 +172,8 @@
     expires_at: '2025-01-01'
     access_level: developer
     scopes:
-    - api
-    - read_api
+      - api
+      - read_api
     recreate: always
   register: change_recreate1_token_status
 - name: Assert that token change with recreate=always succeeds
@@ -193,8 +193,8 @@
     expires_at: '2024-12-31'
     access_level: developer
     scopes:
-    - api
-    - read_api
+      - api
+      - read_api
   register: revoke_token_status
 - name: Assert that token revocation succeeds
   assert:
@@ -212,8 +212,8 @@
     expires_at: '2024-12-31'
     access_level: developer
     scopes:
-    - api
-    - read_api
+      - api
+      - read_api
   register: revoke_token_status
 - name: Assert that token revocation succeeds with status not changed
   assert:
diff --git a/tests/integration/targets/gitlab_instance_variable/tasks/main.yml b/tests/integration/targets/gitlab_instance_variable/tasks/main.yml
index 94a81698bc..36079e3957 100644
--- a/tests/integration/targets/gitlab_instance_variable/tasks/main.yml
+++ b/tests/integration/targets/gitlab_instance_variable/tasks/main.yml
@@ -438,7 +438,7 @@
       - gitlab_instance_variable_state.instance_variable.removed|length == 0
       - gitlab_instance_variable_state.instance_variable.updated|length == 0
       # VALUE_SPECIFIED_IN_NO_LOG_PARAMETER
-      #- gitlab_instance_variable_state.instance_variable.added[0] == "my_test_var"
+      # - gitlab_instance_variable_state.instance_variable.added[0] == "my_test_var"
 
 - name: change variable_type attribute
   gitlab_instance_variable:
diff --git a/tests/integration/targets/gitlab_issue/tasks/main.yml b/tests/integration/targets/gitlab_issue/tasks/main.yml
index af1416c3dd..5667851f19 100644
--- a/tests/integration/targets/gitlab_issue/tasks/main.yml
+++ b/tests/integration/targets/gitlab_issue/tasks/main.yml
@@ -14,137 +14,137 @@
     state: present
 
 - block:
-  - name: Create {{ gitlab_project_name }} project
-    gitlab_project:
-      api_url: "{{ gitlab_host }}"
-      validate_certs: true
-      api_token: "{{ gitlab_api_token }}"
-      name: "{{ gitlab_project_name }}"
-      group: "{{ gitlab_project_group }}"
-      default_branch: "{{ gitlab_branch }}"
-      initialize_with_readme: true
-      state: present
+    - name: Create {{ gitlab_project_name }} project
+      gitlab_project:
+        api_url: "{{ gitlab_host }}"
+        validate_certs: true
+        api_token: "{{ gitlab_api_token }}"
+        name: "{{ gitlab_project_name }}"
+        group: "{{ gitlab_project_group }}"
+        default_branch: "{{ gitlab_branch }}"
+        initialize_with_readme: true
+        state: present
 
-  - name: Create Issue
-    gitlab_issue:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      description: "Test description"
-      project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
-      state: present
-      title: "Ansible test issue"
-    register: gitlab_issue_create
+    - name: Create Issue
+      gitlab_issue:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        description: "Test description"
+        project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
+        state: present
+        title: "Ansible test issue"
+      register: gitlab_issue_create
 
-  - name: Test Issue Created
-    assert:
-      that:
-        - gitlab_issue_create is changed
+    - name: Test Issue Created
+      assert:
+        that:
+          - gitlab_issue_create is changed
 
-  - name: Create Issue ( Idempotency test )
-    gitlab_issue:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      description: "Test description"
-      project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
-      state: present
-      title: "Ansible test issue"
-    register: gitlab_issue_create_idempotence
+    - name: Create Issue ( Idempotency test )
+      gitlab_issue:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        description: "Test description"
+        project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
+        state: present
+        title: "Ansible test issue"
+      register: gitlab_issue_create_idempotence
 
-  - name: Test Create Issue is Idempotent
-    assert:
-      that:
-        - gitlab_issue_create_idempotence is not changed
+    - name: Test Create Issue is Idempotent
+      assert:
+        that:
+          - gitlab_issue_create_idempotence is not changed
 
-  - name: Update Issue Test ( Additions )
-    gitlab_issue:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      assignee_ids: "{{ gitlab_assignee_ids }}"
-      description_path: "{{ gitlab_description_path }}"
-      labels: "{{ gitlab_labels }}"
-      milestone_search: "{{ gitlab_milestone_search }}"
-      milestone_group_id: "{{ gitlab_milestone_group_id }}"
-      project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
-      state: present
-      title: "Ansible test issue"
-    register: gitlab_issue_update_additions
+    - name: Update Issue Test ( Additions )
+      gitlab_issue:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        assignee_ids: "{{ gitlab_assignee_ids }}"
+        description_path: "{{ gitlab_description_path }}"
+        labels: "{{ gitlab_labels }}"
+        milestone_search: "{{ gitlab_milestone_search }}"
+        milestone_group_id: "{{ gitlab_milestone_group_id }}"
+        project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
+        state: present
+        title: "Ansible test issue"
+      register: gitlab_issue_update_additions
 
-  - name: Test Issue Updated ( Additions )
-    assert:
-      that:
-        - gitlab_issue_update_additions.issue.labels[0] == "{{ gitlab_labels[0] }}"
-        - gitlab_issue_update_additions.issue.assignees[0].username == "{{ gitlab_assignee_ids[0] }}"
-        - "'### Description\n\nIssue test description' in gitlab_issue_update_additions.issue.description"
-        - gitlab_issue_update_additions.issue.milestone.title == "{{ gitlab_milestone_search }}"
+    - name: Test Issue Updated ( Additions )
+      assert:
+        that:
+          - gitlab_issue_update_additions.issue.labels[0] == "{{ gitlab_labels[0] }}"
+          - gitlab_issue_update_additions.issue.assignees[0].username == "{{ gitlab_assignee_ids[0] }}"
+          - "'### Description\n\nIssue test description' in gitlab_issue_update_additions.issue.description"
+          - gitlab_issue_update_additions.issue.milestone.title == "{{ gitlab_milestone_search }}"
 
-  - name: Update Issue Test ( Persistence )
-    gitlab_issue:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      description_path: "{{ gitlab_description_path }}"
-      milestone_search: "{{ gitlab_milestone_search }}"
-      milestone_group_id: "{{ gitlab_milestone_group_id }}"
-      project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
-      state: present
-      title: "Ansible test issue"
-    register: gitlab_issue_update_persistence
+    - name: Update Issue Test ( Persistence )
+      gitlab_issue:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        description_path: "{{ gitlab_description_path }}"
+        milestone_search: "{{ gitlab_milestone_search }}"
+        milestone_group_id: "{{ gitlab_milestone_group_id }}"
+        project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
+        state: present
+        title: "Ansible test issue"
+      register: gitlab_issue_update_persistence
 
-  - name: Test issue Not Updated ( Persistence )
-    assert:
-      that:
-        - gitlab_issue_update_persistence.issue.labels[0] == "{{ gitlab_labels[0] }}"
-        - gitlab_issue_update_persistence.issue.assignees[0].username == "{{ gitlab_assignee_ids[0] }}"
+    - name: Test issue Not Updated ( Persistence )
+      assert:
+        that:
+          - gitlab_issue_update_persistence.issue.labels[0] == "{{ gitlab_labels[0] }}"
+          - gitlab_issue_update_persistence.issue.assignees[0].username == "{{ gitlab_assignee_ids[0] }}"
 
-  - name: Update Issue Test ( Removals )
-    gitlab_issue:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      assignee_ids: []
-      description_path: "{{ gitlab_description_path }}"
-      labels: []
-      milestone_search: ""
-      milestone_group_id: ""
-      project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
-      state: present
-      title: "Ansible test issue"
-    register: gitlab_issue_update_removal
+    - name: Update Issue Test ( Removals )
+      gitlab_issue:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        assignee_ids: []
+        description_path: "{{ gitlab_description_path }}"
+        labels: []
+        milestone_search: ""
+        milestone_group_id: ""
+        project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
+        state: present
+        title: "Ansible test issue"
+      register: gitlab_issue_update_removal
 
-  - name: Test issue updated
-    assert:
-      that:
-        - gitlab_issue_update_removal.issue.labels == []
-        - gitlab_issue_update_removal.issue.assignees == []
-        - gitlab_issue_update_removal.issue.milestone == None
+    - name: Test issue updated
+      assert:
+        that:
+          - gitlab_issue_update_removal.issue.labels == []
+          - gitlab_issue_update_removal.issue.assignees == []
+          - gitlab_issue_update_removal.issue.milestone == None
 
-  - name: Delete Issue
-    gitlab_issue:
-      api_url: "{{ gitlab_host }}"
-      api_token: "{{ gitlab_api_token }}"
-      project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
-      title: "Ansible test issue"
-      state: absent
-    register: gitlab_issue_delete
+    - name: Delete Issue
+      gitlab_issue:
+        api_url: "{{ gitlab_host }}"
+        api_token: "{{ gitlab_api_token }}"
+        project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
+        title: "Ansible test issue"
+        state: absent
+      register: gitlab_issue_delete
 
-  - name: Test issue is deleted
-    assert:
-      that:
-        - gitlab_issue_delete is changed
+    - name: Test issue is deleted
+      assert:
+        that:
+          - gitlab_issue_delete is changed
 
   always:
-  - name: Delete Issue
-    gitlab_issue:
-      api_url: "{{ gitlab_host }}"
-      api_token: "{{ gitlab_api_token }}"
-      project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
-      title: "Ansible test issue"
-      state_filter: "opened"
-      state: absent
-    register: gitlab_issue_delete
-  - name: Clean up {{ gitlab_project_name }}
-    gitlab_project:
-      api_url: "{{ gitlab_host }}"
-      validate_certs: false
-      api_token: "{{ gitlab_api_token }}"
-      name: "{{ gitlab_project_name }}"
-      group: "{{ gitlab_project_group }}"
-      state: absent
+    - name: Delete Issue
+      gitlab_issue:
+        api_url: "{{ gitlab_host }}"
+        api_token: "{{ gitlab_api_token }}"
+        project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
+        title: "Ansible test issue"
+        state_filter: "opened"
+        state: absent
+      register: gitlab_issue_delete
+    - name: Clean up {{ gitlab_project_name }}
+      gitlab_project:
+        api_url: "{{ gitlab_host }}"
+        validate_certs: false
+        api_token: "{{ gitlab_api_token }}"
+        name: "{{ gitlab_project_name }}"
+        group: "{{ gitlab_project_group }}"
+        state: absent
diff --git a/tests/integration/targets/gitlab_label/tasks/main.yml b/tests/integration/targets/gitlab_label/tasks/main.yml
index 880b72cebf..bdf77f9847 100644
--- a/tests/integration/targets/gitlab_label/tasks/main.yml
+++ b/tests/integration/targets/gitlab_label/tasks/main.yml
@@ -14,450 +14,450 @@
     state: present
 
 - block:
-###
-### Group label
-###
+  ###
+  ### Group label
+  ###
 
-  - name: Create {{ gitlab_project_group }}
-    gitlab_group:
-      api_url: "{{ gitlab_host }}"
-      validate_certs: true
-      api_token: "{{ gitlab_api_token }}"
-      name: "{{ gitlab_project_group }}"
-      state: present
+    - name: Create {{ gitlab_project_group }}
+      gitlab_group:
+        api_url: "{{ gitlab_host }}"
+        validate_certs: true
+        api_token: "{{ gitlab_api_token }}"
+        name: "{{ gitlab_project_group }}"
+        state: present
 
-  - name: Purge all group labels for check_mode test
-    gitlab_label:
-      api_url: "{{ gitlab_host }}"
-      api_token: "{{ gitlab_api_token }}"
-      group: "{{ gitlab_project_group }}"
-      purge: true
+    - name: Purge all group labels for check_mode test
+      gitlab_label:
+        api_url: "{{ gitlab_host }}"
+        api_token: "{{ gitlab_api_token }}"
+        group: "{{ gitlab_project_group }}"
+        purge: true
 
-  - name: Group label - Add a label in check_mode
-    gitlab_label:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      group: "{{ gitlab_project_group }}"
-      labels:
-        - name: "{{ gitlab_second_label }}"
-          color: "{{ gitlab_second_label_color }}"
-    check_mode: true
-    register: gitlab_group_label_state
+    - name: Group label - Add a label in check_mode
+      gitlab_label:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        group: "{{ gitlab_project_group }}"
+        labels:
+          - name: "{{ gitlab_second_label }}"
+            color: "{{ gitlab_second_label_color }}"
+      check_mode: true
+      register: gitlab_group_label_state
 
-  - name: Group label - Check_mode state must be changed
-    assert:
-      that:
-        - gitlab_group_label_state is changed
+    - name: Group label - Check_mode state must be changed
+      assert:
+        that:
+          - gitlab_group_label_state is changed
 
-  - name: Group label - Create label {{ gitlab_first_label }} and {{ gitlab_second_label }}
-    gitlab_label:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      group: "{{ gitlab_project_group }}"
-      labels:
-        - name: "{{ gitlab_first_label }}"
-          color: "{{ gitlab_first_label_color }}"
-          description: "{{ gitlab_first_label_description }}"
-          priority: "{{ gitlab_first_label_priority }}"
-        - name: "{{ gitlab_second_label }}"
-          color: "{{ gitlab_second_label_color }}"
-      state: present
-    register: gitlab_group_label_create
+    - name: Group label - Create label {{ gitlab_first_label }} and {{ gitlab_second_label }}
+      gitlab_label:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        group: "{{ gitlab_project_group }}"
+        labels:
+          - name: "{{ gitlab_first_label }}"
+            color: "{{ gitlab_first_label_color }}"
+            description: "{{ gitlab_first_label_description }}"
+            priority: "{{ gitlab_first_label_priority }}"
+          - name: "{{ gitlab_second_label }}"
+            color: "{{ gitlab_second_label_color }}"
+        state: present
+      register: gitlab_group_label_create
 
-  - name: Group label - Test Label Created
-    assert:
-      that:
-        - gitlab_group_label_create is changed
-        - gitlab_group_label_create.labels.added|length == 2
-        - gitlab_group_label_create.labels.untouched|length == 0
-        - gitlab_group_label_create.labels.removed|length == 0
-        - gitlab_group_label_create.labels.updated|length == 0
-        - gitlab_group_label_create.labels.added[0] == "{{ gitlab_first_label }}"
-        - gitlab_group_label_create.labels.added[1] == "{{ gitlab_second_label }}"
+    - name: Group label - Test Label Created
+      assert:
+        that:
+          - gitlab_group_label_create is changed
+          - gitlab_group_label_create.labels.added|length == 2
+          - gitlab_group_label_create.labels.untouched|length == 0
+          - gitlab_group_label_create.labels.removed|length == 0
+          - gitlab_group_label_create.labels.updated|length == 0
+          - gitlab_group_label_create.labels.added[0] == "{{ gitlab_first_label }}"
+          - gitlab_group_label_create.labels.added[1] == "{{ gitlab_second_label }}"
 
-  - name: Group label - Create Label ( Idempotency test )
-    gitlab_label:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      group: "{{ gitlab_project_group }}"
-      labels:
-        - name: "{{ gitlab_first_label }}"
-          color: "{{ gitlab_first_label_color }}"
-          description: "{{ gitlab_first_label_description }}"
-          priority: "{{ gitlab_first_label_priority }}"
-      state: present
-    register: gitlab_group_label_create_idempotence
+    - name: Group label - Create Label ( Idempotency test )
+      gitlab_label:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        group: "{{ gitlab_project_group }}"
+        labels:
+          - name: "{{ gitlab_first_label }}"
+            color: "{{ gitlab_first_label_color }}"
+            description: "{{ gitlab_first_label_description }}"
+            priority: "{{ gitlab_first_label_priority }}"
+        state: present
+      register: gitlab_group_label_create_idempotence
 
-  - name: Group label - Test Create Label is Idempotent
-    assert:
-      that:
-        - gitlab_group_label_create_idempotence is not changed
+    - name: Group label - Test Create Label is Idempotent
+      assert:
+        that:
+          - gitlab_group_label_create_idempotence is not changed
 
-  - name: Group label - Update Label {{ gitlab_first_label }} changing color
-    gitlab_label:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      group: "{{ gitlab_project_group }}"
-      labels:
-        - name: "{{ gitlab_first_label }}"
-          color: "{{ gitlab_second_label_color }}"
-      state: present
-    register: gitlab_group_label_update
+    - name: Group label - Update Label {{ gitlab_first_label }} changing color
+      gitlab_label:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        group: "{{ gitlab_project_group }}"
+        labels:
+          - name: "{{ gitlab_first_label }}"
+            color: "{{ gitlab_second_label_color }}"
+        state: present
+      register: gitlab_group_label_update
 
-  - name: Group label - Test Label Updated
-    assert:
-      that:
-        - gitlab_group_label_update.labels.added|length == 0
-        - gitlab_group_label_update.labels.untouched|length == 0
-        - gitlab_group_label_update.labels.removed|length == 0
-        - gitlab_group_label_update.labels.updated|length == 1
-        - gitlab_group_label_update.labels.updated[0] == "{{ gitlab_first_label }}"
+    - name: Group label - Test Label Updated
+      assert:
+        that:
+          - gitlab_group_label_update.labels.added|length == 0
+          - gitlab_group_label_update.labels.untouched|length == 0
+          - gitlab_group_label_update.labels.removed|length == 0
+          - gitlab_group_label_update.labels.updated|length == 1
+          - gitlab_group_label_update.labels.updated[0] == "{{ gitlab_first_label }}"
 
-  - name: Group label - Change label {{ gitlab_second_label }} name to {{ gitlab_second_label_new_name }}
-    gitlab_label:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      group: "{{ gitlab_project_group }}"
-      labels:
-        - name: "{{ gitlab_second_label }}"
-          new_name: "{{ gitlab_second_label_new_name }}"
-      state: present
-    register: gitlab_group_label_new_name
+    - name: Group label - Change label {{ gitlab_second_label }} name to {{ gitlab_second_label_new_name }}
+      gitlab_label:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        group: "{{ gitlab_project_group }}"
+        labels:
+          - name: "{{ gitlab_second_label }}"
+            new_name: "{{ gitlab_second_label_new_name }}"
+        state: present
+      register: gitlab_group_label_new_name
 
-  - name: Group label - Test Label name changed
-    assert:
-      that:
-        - gitlab_group_label_new_name.labels.added|length == 0
-        - gitlab_group_label_new_name.labels.untouched|length == 0
-        - gitlab_group_label_new_name.labels.removed|length == 0
-        - gitlab_group_label_new_name.labels.updated|length == 1
-        - gitlab_group_label_new_name.labels.updated[0] == "{{ gitlab_second_label }}"
+    - name: Group label - Test Label name changed
+      assert:
+        that:
+          - gitlab_group_label_new_name.labels.added|length == 0
+          - gitlab_group_label_new_name.labels.untouched|length == 0
+          - gitlab_group_label_new_name.labels.removed|length == 0
+          - gitlab_group_label_new_name.labels.updated|length == 1
+          - gitlab_group_label_new_name.labels.updated[0] == "{{ gitlab_second_label }}"
 
-  - name: Group label - Change label name back to {{ gitlab_second_label }}
-    gitlab_label:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      group: "{{ gitlab_project_group }}"
-      labels:
-        - name: "{{ gitlab_second_label_new_name }}"
-          new_name: "{{ gitlab_second_label }}"
-      state: present
-    register: gitlab_group_label_orig_name
+    - name: Group label - Change label name back to {{ gitlab_second_label }}
+      gitlab_label:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        group: "{{ gitlab_project_group }}"
+        labels:
+          - name: "{{ gitlab_second_label_new_name }}"
+            new_name: "{{ gitlab_second_label }}"
+        state: present
+      register: gitlab_group_label_orig_name
 
-  - name: Group label - Test Label name changed back
-    assert:
-      that:
-        - gitlab_group_label_orig_name.labels.added|length == 0
-        - gitlab_group_label_orig_name.labels.untouched|length == 0
-        - gitlab_group_label_orig_name.labels.removed|length == 0
-        - gitlab_group_label_orig_name.labels.updated|length == 1
-        - gitlab_group_label_orig_name.labels.updated[0] == "{{ gitlab_second_label_new_name }}"
+    - name: Group label - Test Label name changed back
+      assert:
+        that:
+          - gitlab_group_label_orig_name.labels.added|length == 0
+          - gitlab_group_label_orig_name.labels.untouched|length == 0
+          - gitlab_group_label_orig_name.labels.removed|length == 0
+          - gitlab_group_label_orig_name.labels.updated|length == 1
+          - gitlab_group_label_orig_name.labels.updated[0] == "{{ gitlab_second_label_new_name }}"
 
-  - name: Group label - Update Label Test ( Additions )
-    gitlab_label:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      group: "{{ gitlab_project_group }}"
-      labels:
-        - name: "{{ gitlab_second_label }}"
-          description: "{{ gitlab_first_label_description }}"
-          priority: "{{ gitlab_first_label_priority }}"
-      state: present
-    register: gitlab_group_label_update_additions
+    - name: Group label - Update Label Test ( Additions )
+      gitlab_label:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        group: "{{ gitlab_project_group }}"
+        labels:
+          - name: "{{ gitlab_second_label }}"
+            description: "{{ gitlab_first_label_description }}"
+            priority: "{{ gitlab_first_label_priority }}"
+        state: present
+      register: gitlab_group_label_update_additions
 
-  - name: Group label - Test Label Updated ( Additions )
-    assert:
-      that:
-        - gitlab_group_label_update_additions.labels.added|length == 0
-        - gitlab_group_label_update_additions.labels.untouched|length == 0
-        - gitlab_group_label_update_additions.labels.removed|length == 0
-        - gitlab_group_label_update_additions.labels.updated|length == 1
-        - gitlab_group_label_update_additions.labels.updated[0] == "{{ gitlab_second_label }}"
+    - name: Group label - Test Label Updated ( Additions )
+      assert:
+        that:
+          - gitlab_group_label_update_additions.labels.added|length == 0
+          - gitlab_group_label_update_additions.labels.untouched|length == 0
+          - gitlab_group_label_update_additions.labels.removed|length == 0
+          - gitlab_group_label_update_additions.labels.updated|length == 1
+          - gitlab_group_label_update_additions.labels.updated[0] == "{{ gitlab_second_label }}"
 
-  - name: Group label - Delete Label {{ gitlab_second_label }}
-    gitlab_label:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      group: "{{ gitlab_project_group }}"
-      labels:
-        - name: "{{ gitlab_second_label }}"
-      state: absent
-    register: gitlab_group_label_delete
+    - name: Group label - Delete Label {{ gitlab_second_label }}
+      gitlab_label:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        group: "{{ gitlab_project_group }}"
+        labels:
+          - name: "{{ gitlab_second_label }}"
+        state: absent
+      register: gitlab_group_label_delete
 
-  - name: Group label - Test label is deleted
-    assert:
-      that:
-        - gitlab_group_label_delete is changed
-        - gitlab_group_label_delete.labels.added|length == 0
-        - gitlab_group_label_delete.labels.untouched|length == 0
-        - gitlab_group_label_delete.labels.removed|length == 1
-        - gitlab_group_label_delete.labels.updated|length == 0
-        - gitlab_group_label_delete.labels.removed[0] == "{{ gitlab_second_label }}"
+    - name: Group label - Test label is deleted
+      assert:
+        that:
+          - gitlab_group_label_delete is changed
+          - gitlab_group_label_delete.labels.added|length == 0
+          - gitlab_group_label_delete.labels.untouched|length == 0
+          - gitlab_group_label_delete.labels.removed|length == 1
+          - gitlab_group_label_delete.labels.updated|length == 0
+          - gitlab_group_label_delete.labels.removed[0] == "{{ gitlab_second_label }}"
 
-  - name: Group label - Create label {{ gitlab_second_label }} again purging the other
-    gitlab_label:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      group: "{{ gitlab_project_group }}"
-      purge: true
-      labels:
-        - name: "{{ gitlab_second_label }}"
-          color: "{{ gitlab_second_label_color }}"
-      state: present
-    register: gitlab_group_label_create_purging
+    - name: Group label - Create label {{ gitlab_second_label }} again purging the other
+      gitlab_label:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        group: "{{ gitlab_project_group }}"
+        purge: true
+        labels:
+          - name: "{{ gitlab_second_label }}"
+            color: "{{ gitlab_second_label_color }}"
+        state: present
+      register: gitlab_group_label_create_purging
 
-  - name: Group label - Test Label Created again
-    assert:
-      that:
-        - gitlab_group_label_create_purging is changed
-        - gitlab_group_label_create_purging.labels.added|length == 1
-        - gitlab_group_label_create_purging.labels.untouched|length == 0
-        - gitlab_group_label_create_purging.labels.removed|length == 1
-        - gitlab_group_label_create_purging.labels.updated|length == 0
-        - gitlab_group_label_create_purging.labels.added[0] == "{{ gitlab_second_label }}"
-        - gitlab_group_label_create_purging.labels.removed[0] == "{{ gitlab_first_label }}"
+    - name: Group label - Test Label Created again
+      assert:
+        that:
+          - gitlab_group_label_create_purging is changed
+          - gitlab_group_label_create_purging.labels.added|length == 1
+          - gitlab_group_label_create_purging.labels.untouched|length == 0
+          - gitlab_group_label_create_purging.labels.removed|length == 1
+          - gitlab_group_label_create_purging.labels.updated|length == 0
+          - gitlab_group_label_create_purging.labels.added[0] == "{{ gitlab_second_label }}"
+          - gitlab_group_label_create_purging.labels.removed[0] == "{{ gitlab_first_label }}"
 
-###
-### Project label
-###
+  ###
+  ### Project label
+  ###
 
-  - name: Create {{ gitlab_project_name }}
-    gitlab_project:
-      api_url: "{{ gitlab_host }}"
-      validate_certs: true
-      api_token: "{{ gitlab_api_token }}"
-      name: "{{ gitlab_project_name }}"
-      group: "{{ gitlab_project_group }}"
-      default_branch: "{{ gitlab_branch }}"
-      initialize_with_readme: true
-      state: present
+    - name: Create {{ gitlab_project_name }}
+      gitlab_project:
+        api_url: "{{ gitlab_host }}"
+        validate_certs: true
+        api_token: "{{ gitlab_api_token }}"
+        name: "{{ gitlab_project_name }}"
+        group: "{{ gitlab_project_group }}"
+        default_branch: "{{ gitlab_branch }}"
+        initialize_with_readme: true
+        state: present
 
-  - name: Purge all labels for check_mode test
-    gitlab_label:
-      api_url: "{{ gitlab_host }}"
-      api_token: "{{ gitlab_api_token }}"
-      project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
-      purge: true
+    - name: Purge all labels for check_mode test
+      gitlab_label:
+        api_url: "{{ gitlab_host }}"
+        api_token: "{{ gitlab_api_token }}"
+        project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
+        purge: true
 
-  - name: Add a label in check_mode
-    gitlab_label:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
-      labels:
-        - name: "{{ gitlab_second_label }}"
-          color: "{{ gitlab_second_label_color }}"
-    check_mode: true
-    register: gitlab_first_label_state
+    - name: Add a label in check_mode
+      gitlab_label:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
+        labels:
+          - name: "{{ gitlab_second_label }}"
+            color: "{{ gitlab_second_label_color }}"
+      check_mode: true
+      register: gitlab_first_label_state
 
-  - name: Check_mode state must be changed
-    assert:
-      that:
-        - gitlab_first_label_state is changed
+    - name: Check_mode state must be changed
+      assert:
+        that:
+          - gitlab_first_label_state is changed
 
-  - name: Create label {{ gitlab_first_label }} and {{ gitlab_second_label }}
-    gitlab_label:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
-      labels:
-        - name: "{{ gitlab_first_label }}"
-          color: "{{ gitlab_first_label_color }}"
-          description: "{{ gitlab_first_label_description }}"
-          priority: "{{ gitlab_first_label_priority }}"
-        - name: "{{ gitlab_second_label }}"
-          color: "{{ gitlab_second_label_color }}"
-      state: present
-    register: gitlab_first_label_create
+    - name: Create label {{ gitlab_first_label }} and {{ gitlab_second_label }}
+      gitlab_label:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
+        labels:
+          - name: "{{ gitlab_first_label }}"
+            color: "{{ gitlab_first_label_color }}"
+            description: "{{ gitlab_first_label_description }}"
+            priority: "{{ gitlab_first_label_priority }}"
+          - name: "{{ gitlab_second_label }}"
+            color: "{{ gitlab_second_label_color }}"
+        state: present
+      register: gitlab_first_label_create
 
-  - name: Test Label Created
-    assert:
-      that:
-        - gitlab_first_label_create is changed
-        - gitlab_first_label_create.labels.added|length == 2
-        - gitlab_first_label_create.labels.untouched|length == 0
-        - gitlab_first_label_create.labels.removed|length == 0
-        - gitlab_first_label_create.labels.updated|length == 0
-        - gitlab_first_label_create.labels.added[0] == "{{ gitlab_first_label }}"
-        - gitlab_first_label_create.labels.added[1] == "{{ gitlab_second_label }}"
+    - name: Test Label Created
+      assert:
+        that:
+          - gitlab_first_label_create is changed
+          - gitlab_first_label_create.labels.added|length == 2
+          - gitlab_first_label_create.labels.untouched|length == 0
+          - gitlab_first_label_create.labels.removed|length == 0
+          - gitlab_first_label_create.labels.updated|length == 0
+          - gitlab_first_label_create.labels.added[0] == "{{ gitlab_first_label }}"
+          - gitlab_first_label_create.labels.added[1] == "{{ gitlab_second_label }}"
 
-  - name: Create Label ( Idempotency test )
-    gitlab_label:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
-      labels:
-        - name: "{{ gitlab_first_label }}"
-          color: "{{ gitlab_first_label_color }}"
-          description: "{{ gitlab_first_label_description }}"
-          priority: "{{ gitlab_first_label_priority }}"
-      state: present
-    register: gitlab_first_label_create_idempotence
+    - name: Create Label ( Idempotency test )
+      gitlab_label:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
+        labels:
+          - name: "{{ gitlab_first_label }}"
+            color: "{{ gitlab_first_label_color }}"
+            description: "{{ gitlab_first_label_description }}"
+            priority: "{{ gitlab_first_label_priority }}"
+        state: present
+      register: gitlab_first_label_create_idempotence
 
-  - name: Test Create Label is Idempotent
-    assert:
-      that:
-        - gitlab_first_label_create_idempotence is not changed
+    - name: Test Create Label is Idempotent
+      assert:
+        that:
+          - gitlab_first_label_create_idempotence is not changed
 
-  - name: Update Label {{ gitlab_first_label }} changing color
-    gitlab_label:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
-      labels:
-        - name: "{{ gitlab_first_label }}"
-          color: "{{ gitlab_second_label_color }}"
-      state: present
-    register: gitlab_first_label_update
+    - name: Update Label {{ gitlab_first_label }} changing color
+      gitlab_label:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
+        labels:
+          - name: "{{ gitlab_first_label }}"
+            color: "{{ gitlab_second_label_color }}"
+        state: present
+      register: gitlab_first_label_update
 
-  - name: Test Label Updated
-    assert:
-      that:
-        - gitlab_first_label_update.labels.added|length == 0
-        - gitlab_first_label_update.labels.untouched|length == 0
-        - gitlab_first_label_update.labels.removed|length == 0
-        - gitlab_first_label_update.labels.updated|length == 1
-        - gitlab_first_label_update.labels.updated[0] == "{{ gitlab_first_label }}"
+    - name: Test Label Updated
+      assert:
+        that:
+          - gitlab_first_label_update.labels.added|length == 0
+          - gitlab_first_label_update.labels.untouched|length == 0
+          - gitlab_first_label_update.labels.removed|length == 0
+          - gitlab_first_label_update.labels.updated|length == 1
+          - gitlab_first_label_update.labels.updated[0] == "{{ gitlab_first_label }}"
 
-  - name: Change label {{ gitlab_second_label }} name to {{ gitlab_second_label_new_name }}
-    gitlab_label:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
-      labels:
-        - name: "{{ gitlab_second_label }}"
-          new_name: "{{ gitlab_second_label_new_name }}"
-      state: present
-    register: gitlab_first_label_new_name
+    - name: Change label {{ gitlab_second_label }} name to {{ gitlab_second_label_new_name }}
+      gitlab_label:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
+        labels:
+          - name: "{{ gitlab_second_label }}"
+            new_name: "{{ gitlab_second_label_new_name }}"
+        state: present
+      register: gitlab_first_label_new_name
 
-  - name: Test Label name changed
-    assert:
-      that:
-        - gitlab_first_label_new_name.labels.added|length == 0
-        - gitlab_first_label_new_name.labels.untouched|length == 0
-        - gitlab_first_label_new_name.labels.removed|length == 0
-        - gitlab_first_label_new_name.labels.updated|length == 1
-        - gitlab_first_label_new_name.labels.updated[0] == "{{ gitlab_second_label }}"
+    - name: Test Label name changed
+      assert:
+        that:
+          - gitlab_first_label_new_name.labels.added|length == 0
+          - gitlab_first_label_new_name.labels.untouched|length == 0
+          - gitlab_first_label_new_name.labels.removed|length == 0
+          - gitlab_first_label_new_name.labels.updated|length == 1
+          - gitlab_first_label_new_name.labels.updated[0] == "{{ gitlab_second_label }}"
 
-  - name: Change label name back to {{ gitlab_second_label }}
-    gitlab_label:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
-      labels:
-        - name: "{{ gitlab_second_label_new_name }}"
-          new_name: "{{ gitlab_second_label }}"
-      state: present
-    register: gitlab_first_label_orig_name
+    - name: Change label name back to {{ gitlab_second_label }}
+      gitlab_label:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
+        labels:
+          - name: "{{ gitlab_second_label_new_name }}"
+            new_name: "{{ gitlab_second_label }}"
+        state: present
+      register: gitlab_first_label_orig_name
 
-  - name: Test Label name changed back
-    assert:
-      that:
-        - gitlab_first_label_orig_name.labels.added|length == 0
-        - gitlab_first_label_orig_name.labels.untouched|length == 0
-        - gitlab_first_label_orig_name.labels.removed|length == 0
-        - gitlab_first_label_orig_name.labels.updated|length == 1
-        - gitlab_first_label_orig_name.labels.updated[0] == "{{ gitlab_second_label_new_name }}"
+    - name: Test Label name changed back
+      assert:
+        that:
+          - gitlab_first_label_orig_name.labels.added|length == 0
+          - gitlab_first_label_orig_name.labels.untouched|length == 0
+          - gitlab_first_label_orig_name.labels.removed|length == 0
+          - gitlab_first_label_orig_name.labels.updated|length == 1
+          - gitlab_first_label_orig_name.labels.updated[0] == "{{ gitlab_second_label_new_name }}"
 
-  - name: Update Label Test ( Additions )
-    gitlab_label:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
-      labels:
-        - name: "{{ gitlab_second_label }}"
-          description: "{{ gitlab_first_label_description }}"
-          priority: "{{ gitlab_first_label_priority }}"
-      state: present
-    register: gitlab_first_label_update_additions
+    - name: Update Label Test ( Additions )
+      gitlab_label:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
+        labels:
+          - name: "{{ gitlab_second_label }}"
+            description: "{{ gitlab_first_label_description }}"
+            priority: "{{ gitlab_first_label_priority }}"
+        state: present
+      register: gitlab_first_label_update_additions
 
-  - name: Test Label Updated ( Additions )
-    assert:
-      that:
-        - gitlab_first_label_update_additions.labels.added|length == 0
-        - gitlab_first_label_update_additions.labels.untouched|length == 0
-        - gitlab_first_label_update_additions.labels.removed|length == 0
-        - gitlab_first_label_update_additions.labels.updated|length == 1
-        - gitlab_first_label_update_additions.labels.updated[0] == "{{ gitlab_second_label }}"
+    - name: Test Label Updated ( Additions )
+      assert:
+        that:
+          - gitlab_first_label_update_additions.labels.added|length == 0
+          - gitlab_first_label_update_additions.labels.untouched|length == 0
+          - gitlab_first_label_update_additions.labels.removed|length == 0
+          - gitlab_first_label_update_additions.labels.updated|length == 1
+          - gitlab_first_label_update_additions.labels.updated[0] == "{{ gitlab_second_label }}"
 
-  - name: Delete Label {{ gitlab_second_label }}
-    gitlab_label:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
-      labels:
-        - name: "{{ gitlab_second_label }}"
-      state: absent
-    register: gitlab_first_label_delete
+    - name: Delete Label {{ gitlab_second_label }}
+      gitlab_label:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
+        labels:
+          - name: "{{ gitlab_second_label }}"
+        state: absent
+      register: gitlab_first_label_delete
 
-  - name: Test label is deleted
-    assert:
-      that:
-        - gitlab_first_label_delete is changed
-        - gitlab_first_label_delete.labels.added|length == 0
-        - gitlab_first_label_delete.labels.untouched|length == 0
-        - gitlab_first_label_delete.labels.removed|length == 1
-        - gitlab_first_label_delete.labels.updated|length == 0
-        - gitlab_first_label_delete.labels.removed[0] == "{{ gitlab_second_label }}"
+    - name: Test label is deleted
+      assert:
+        that:
+          - gitlab_first_label_delete is changed
+          - gitlab_first_label_delete.labels.added|length == 0
+          - gitlab_first_label_delete.labels.untouched|length == 0
+          - gitlab_first_label_delete.labels.removed|length == 1
+          - gitlab_first_label_delete.labels.updated|length == 0
+          - gitlab_first_label_delete.labels.removed[0] == "{{ gitlab_second_label }}"
 
-  - name: Create label {{ gitlab_second_label }} again purging the other
-    gitlab_label:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
-      purge: true
-      labels:
-        - name: "{{ gitlab_second_label }}"
-          color: "{{ gitlab_second_label_color }}"
-      state: present
-    register: gitlab_first_label_create_purging
+    - name: Create label {{ gitlab_second_label }} again purging the other
+      gitlab_label:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
+        purge: true
+        labels:
+          - name: "{{ gitlab_second_label }}"
+            color: "{{ gitlab_second_label_color }}"
+        state: present
+      register: gitlab_first_label_create_purging
 
-  - name: Test Label Created again
-    assert:
-      that:
-        - gitlab_first_label_create_purging is changed
-        - gitlab_first_label_create_purging.labels.added|length == 1
-        - gitlab_first_label_create_purging.labels.untouched|length == 0
-        - gitlab_first_label_create_purging.labels.removed|length == 1
-        - gitlab_first_label_create_purging.labels.updated|length == 0
-        - gitlab_first_label_create_purging.labels.added[0] == "{{ gitlab_second_label }}"
-        - gitlab_first_label_create_purging.labels.removed[0] == "{{ gitlab_first_label }}"
+    - name: Test Label Created again
+      assert:
+        that:
+          - gitlab_first_label_create_purging is changed
+          - gitlab_first_label_create_purging.labels.added|length == 1
+          - gitlab_first_label_create_purging.labels.untouched|length == 0
+          - gitlab_first_label_create_purging.labels.removed|length == 1
+          - gitlab_first_label_create_purging.labels.updated|length == 0
+          - gitlab_first_label_create_purging.labels.added[0] == "{{ gitlab_second_label }}"
+          - gitlab_first_label_create_purging.labels.removed[0] == "{{ gitlab_first_label }}"
 
   always:
-  - name: Delete Labels
-    gitlab_label:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
-      purge: true
-      labels:
-        - name: "{{ gitlab_first_label }}"
-        - name: "{{ gitlab_second_label }}"
-      state: absent
-    register: gitlab_first_label_always_delete
+    - name: Delete Labels
+      gitlab_label:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
+        purge: true
+        labels:
+          - name: "{{ gitlab_first_label }}"
+          - name: "{{ gitlab_second_label }}"
+        state: absent
+      register: gitlab_first_label_always_delete
 
-  - name: Test label are deleted
-    assert:
-      that:
-        - gitlab_first_label_always_delete is changed
-        - gitlab_first_label_always_delete.labels.added|length == 0
-        - gitlab_first_label_always_delete.labels.untouched|length == 0
-        - gitlab_first_label_always_delete.labels.removed|length > 0
-        - gitlab_first_label_always_delete.labels.updated|length == 0
+    - name: Test label are deleted
+      assert:
+        that:
+          - gitlab_first_label_always_delete is changed
+          - gitlab_first_label_always_delete.labels.added|length == 0
+          - gitlab_first_label_always_delete.labels.untouched|length == 0
+          - gitlab_first_label_always_delete.labels.removed|length > 0
+          - gitlab_first_label_always_delete.labels.updated|length == 0
 
-  - name: Clean up {{ gitlab_project_name }}
-    gitlab_project:
-      api_url: "{{ gitlab_host }}"
-      validate_certs: false
-      api_token: "{{ gitlab_api_token }}"
-      name: "{{ gitlab_project_name }}"
-      group: "{{ gitlab_project_group }}"
-      state: absent
+    - name: Clean up {{ gitlab_project_name }}
+      gitlab_project:
+        api_url: "{{ gitlab_host }}"
+        validate_certs: false
+        api_token: "{{ gitlab_api_token }}"
+        name: "{{ gitlab_project_name }}"
+        group: "{{ gitlab_project_group }}"
+        state: absent
 
-  - name: Clean up {{ gitlab_project_group }}
-    gitlab_group:
-      api_url: "{{ gitlab_host }}"
-      validate_certs: true
-      api_token: "{{ gitlab_api_token }}"
-      name: "{{ gitlab_project_group }}"
-      state: absent
\ No newline at end of file
+    - name: Clean up {{ gitlab_project_group }}
+      gitlab_group:
+        api_url: "{{ gitlab_host }}"
+        validate_certs: true
+        api_token: "{{ gitlab_api_token }}"
+        name: "{{ gitlab_project_group }}"
+        state: absent
diff --git a/tests/integration/targets/gitlab_merge_request/tasks/main.yml b/tests/integration/targets/gitlab_merge_request/tasks/main.yml
index 18da900a2d..672c75f576 100644
--- a/tests/integration/targets/gitlab_merge_request/tasks/main.yml
+++ b/tests/integration/targets/gitlab_merge_request/tasks/main.yml
@@ -14,116 +14,116 @@
     state: present
 
 - block:
-  - name: Create {{ gitlab_project_name }}
-    gitlab_project:
-      api_url: "{{ gitlab_host }}"
-      validate_certs: true
-      api_token: "{{ gitlab_api_token }}"
-      name: "{{ gitlab_project_name }}"
-      group: "{{ gitlab_project_group }}"
-      default_branch: "{{ gitlab_target_branch }}"
-      initialize_with_readme: true
-      state: present
+    - name: Create {{ gitlab_project_name }}
+      gitlab_project:
+        api_url: "{{ gitlab_host }}"
+        validate_certs: true
+        api_token: "{{ gitlab_api_token }}"
+        name: "{{ gitlab_project_name }}"
+        group: "{{ gitlab_project_group }}"
+        default_branch: "{{ gitlab_target_branch }}"
+        initialize_with_readme: true
+        state: present
 
-  - name: Create branch {{ gitlab_source_branch }}
-    gitlab_branch:
-      api_url: "{{ gitlab_host }}"
-      api_token: "{{ gitlab_api_token }}"
-      project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
-      branch: "{{ gitlab_source_branch }}"
-      ref_branch: "{{ gitlab_target_branch }}"
-      state: present
+    - name: Create branch {{ gitlab_source_branch }}
+      gitlab_branch:
+        api_url: "{{ gitlab_host }}"
+        api_token: "{{ gitlab_api_token }}"
+        project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
+        branch: "{{ gitlab_source_branch }}"
+        ref_branch: "{{ gitlab_target_branch }}"
+        state: present
 
-  - name: Create Merge Request
-    gitlab_merge_request:
-      api_url: "{{ gitlab_host }}"
-      api_token: "{{ gitlab_api_token }}"
-      project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
-      source_branch: "{{gitlab_source_branch}}"
-      target_branch: "{{gitlab_target_branch}}"
-      title: "Ansible test merge request"
-      description: "Test description"
-      labels: ""
-      state_filter: "opened"
-      assignee_ids: ""
-      reviewer_ids: ""
-      remove_source_branch: True
-      state: present
-    register: gitlab_merge_request_create
+    - name: Create Merge Request
+      gitlab_merge_request:
+        api_url: "{{ gitlab_host }}"
+        api_token: "{{ gitlab_api_token }}"
+        project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
+        source_branch: "{{gitlab_source_branch}}"
+        target_branch: "{{gitlab_target_branch}}"
+        title: "Ansible test merge request"
+        description: "Test description"
+        labels: ""
+        state_filter: "opened"
+        assignee_ids: ""
+        reviewer_ids: ""
+        remove_source_branch: true
+        state: present
+      register: gitlab_merge_request_create
 
-  - name: Test Merge Request Created
-    assert:
-      that:
-        - gitlab_merge_request_create is changed
+    - name: Test Merge Request Created
+      assert:
+        that:
+          - gitlab_merge_request_create is changed
 
-  - name: Create Merge Request ( Idempotency test )
-    gitlab_merge_request:
-      api_url: "{{ gitlab_host }}"
-      api_token: "{{ gitlab_api_token }}"
-      project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
-      source_branch: "{{gitlab_source_branch}}"
-      target_branch: "{{gitlab_target_branch}}"
-      title: "Ansible test merge request"
-      description: "Test description"
-      labels: ""
-      state_filter: "opened"
-      assignee_ids: ""
-      reviewer_ids: ""
-      remove_source_branch: True
-      state: present
-    register: gitlab_merge_request_create_idempotence
+    - name: Create Merge Request ( Idempotency test )
+      gitlab_merge_request:
+        api_url: "{{ gitlab_host }}"
+        api_token: "{{ gitlab_api_token }}"
+        project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
+        source_branch: "{{gitlab_source_branch}}"
+        target_branch: "{{gitlab_target_branch}}"
+        title: "Ansible test merge request"
+        description: "Test description"
+        labels: ""
+        state_filter: "opened"
+        assignee_ids: ""
+        reviewer_ids: ""
+        remove_source_branch: true
+        state: present
+      register: gitlab_merge_request_create_idempotence
 
-  - name: Test module is idempotent
-    assert:
-      that:
-        - gitlab_merge_request_create_idempotence is not changed
+    - name: Test module is idempotent
+      assert:
+        that:
+          - gitlab_merge_request_create_idempotence is not changed
 
-  - name: Update Merge Request Test
-    gitlab_merge_request:
-      api_url: "{{ gitlab_host }}"
-      api_token: "{{ gitlab_api_token }}"
-      project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
-      source_branch: "{{gitlab_source_branch}}"
-      target_branch: "{{gitlab_target_branch}}"
-      title: "Ansible test merge request"
-      description_path: "{{gitlab_description_path}}"
-      labels: "{{ gitlab_labels }}"
-      state_filter: "opened"
-      assignee_ids: "{{ gitlab_assignee_ids }}"
-      reviewer_ids: ""
-      remove_source_branch: True
-      state: present
-    register: gitlab_merge_request_udpate
+    - name: Update Merge Request Test
+      gitlab_merge_request:
+        api_url: "{{ gitlab_host }}"
+        api_token: "{{ gitlab_api_token }}"
+        project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
+        source_branch: "{{gitlab_source_branch}}"
+        target_branch: "{{gitlab_target_branch}}"
+        title: "Ansible test merge request"
+        description_path: "{{gitlab_description_path}}"
+        labels: "{{ gitlab_labels }}"
+        state_filter: "opened"
+        assignee_ids: "{{ gitlab_assignee_ids }}"
+        reviewer_ids: ""
+        remove_source_branch: true
+        state: present
+      register: gitlab_merge_request_udpate
 
-  - name: Test merge request updated
-    assert:
-      that:
-        - gitlab_merge_request_udpate.mr.labels[0] == "{{ gitlab_labels }}"
-        - gitlab_merge_request_udpate.mr.assignees[0].username == "{{ gitlab_assignee_ids }}"
-        - "'### Description\n\nMerge Request test description' in gitlab_merge_request_udpate.mr.description"
+    - name: Test merge request updated
+      assert:
+        that:
+          - gitlab_merge_request_udpate.mr.labels[0] == "{{ gitlab_labels }}"
+          - gitlab_merge_request_udpate.mr.assignees[0].username == "{{ gitlab_assignee_ids }}"
+          - "'### Description\n\nMerge Request test description' in gitlab_merge_request_udpate.mr.description"
 
-  - name: Delete Merge Request
-    gitlab_merge_request:
-      api_url: "{{ gitlab_host }}"
-      api_token: "{{ gitlab_api_token }}"
-      project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
-      source_branch: "{{gitlab_source_branch}}"
-      target_branch: "{{gitlab_target_branch}}"
-      title: "Ansible test merge request"
-      state: absent
-    register: gitlab_merge_request_delete
+    - name: Delete Merge Request
+      gitlab_merge_request:
+        api_url: "{{ gitlab_host }}"
+        api_token: "{{ gitlab_api_token }}"
+        project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
+        source_branch: "{{gitlab_source_branch}}"
+        target_branch: "{{gitlab_target_branch}}"
+        title: "Ansible test merge request"
+        state: absent
+      register: gitlab_merge_request_delete
 
-  - name: Test merge request is deleted
-    assert:
-      that:
-        - gitlab_merge_request_delete is changed
+    - name: Test merge request is deleted
+      assert:
+        that:
+          - gitlab_merge_request_delete is changed
 
   always:
-  - name: Clean up {{ gitlab_project_name }}
-    gitlab_project:
-      api_url: "{{ gitlab_host }}"
-      validate_certs: false
-      api_token: "{{ gitlab_api_token }}"
-      name: "{{ gitlab_project_name }}"
-      group: "{{ gitlab_project_group }}"
-      state: absent
+    - name: Clean up {{ gitlab_project_name }}
+      gitlab_project:
+        api_url: "{{ gitlab_host }}"
+        validate_certs: false
+        api_token: "{{ gitlab_api_token }}"
+        name: "{{ gitlab_project_name }}"
+        group: "{{ gitlab_project_group }}"
+        state: absent
diff --git a/tests/integration/targets/gitlab_milestone/tasks/main.yml b/tests/integration/targets/gitlab_milestone/tasks/main.yml
index ce78c2eeff..5a3303d3ef 100644
--- a/tests/integration/targets/gitlab_milestone/tasks/main.yml
+++ b/tests/integration/targets/gitlab_milestone/tasks/main.yml
@@ -14,375 +14,375 @@
     state: present
 
 - block:
-###
-### Group milestone
-###
-  - name: Create {{ gitlab_project_group }}
-    gitlab_group:
-      api_url: "{{ gitlab_host }}"
-      validate_certs: true
-      api_token: "{{ gitlab_api_token }}"
-      name: "{{ gitlab_project_group }}"
-      state: present
+  ###
+  ### Group milestone
+  ###
+    - name: Create {{ gitlab_project_group }}
+      gitlab_group:
+        api_url: "{{ gitlab_host }}"
+        validate_certs: true
+        api_token: "{{ gitlab_api_token }}"
+        name: "{{ gitlab_project_group }}"
+        state: present
 
-  - name: Purge all group milestones for check_mode test
-    gitlab_milestone:
-      api_url: "{{ gitlab_host }}"
-      api_token: "{{ gitlab_api_token }}"
-      group: "{{ gitlab_project_group }}"
-      purge: true
+    - name: Purge all group milestones for check_mode test
+      gitlab_milestone:
+        api_url: "{{ gitlab_host }}"
+        api_token: "{{ gitlab_api_token }}"
+        group: "{{ gitlab_project_group }}"
+        purge: true
 
-  - name: Group milestone - Add a milestone in check_mode
-    gitlab_milestone:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      group: "{{ gitlab_project_group }}"
-      milestones:
-        - title: "{{ gitlab_second_milestone }}"
-    check_mode: true
-    register: gitlab_group_milestone_state
+    - name: Group milestone - Add a milestone in check_mode
+      gitlab_milestone:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        group: "{{ gitlab_project_group }}"
+        milestones:
+          - title: "{{ gitlab_second_milestone }}"
+      check_mode: true
+      register: gitlab_group_milestone_state
 
-  - name: Group milestone - Check_mode state must be changed
-    assert:
-      that:
-        - gitlab_group_milestone_state is changed
+    - name: Group milestone - Check_mode state must be changed
+      assert:
+        that:
+          - gitlab_group_milestone_state is changed
 
-  - name: Purge all group milestones for project milestone test - cannot exist with same name
-    gitlab_milestone:
-      api_url: "{{ gitlab_host }}"
-      api_token: "{{ gitlab_api_token }}"
-      group: "{{ gitlab_project_group }}"
-      purge: true
-    register: gitlab_group_milestone_purged
+    - name: Purge all group milestones for project milestone test - cannot exist with same name
+      gitlab_milestone:
+        api_url: "{{ gitlab_host }}"
+        api_token: "{{ gitlab_api_token }}"
+        group: "{{ gitlab_project_group }}"
+        purge: true
+      register: gitlab_group_milestone_purged
 
-  - name: Group milestone - Create milestone {{ gitlab_first_milestone }} and {{ gitlab_second_milestone }}
-    gitlab_milestone:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      group: "{{ gitlab_project_group }}"
-      milestones:
-        - title: "{{ gitlab_first_milestone }}"
-          start_date: "{{ gitlab_first_milestone_start_date }}"
-          due_date: "{{ gitlab_first_milestone_due_date }}"
-        - title: "{{ gitlab_second_milestone }}"
-      state: present
-    register: gitlab_group_milestone_create
+    - name: Group milestone - Create milestone {{ gitlab_first_milestone }} and {{ gitlab_second_milestone }}
+      gitlab_milestone:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        group: "{{ gitlab_project_group }}"
+        milestones:
+          - title: "{{ gitlab_first_milestone }}"
+            start_date: "{{ gitlab_first_milestone_start_date }}"
+            due_date: "{{ gitlab_first_milestone_due_date }}"
+          - title: "{{ gitlab_second_milestone }}"
+        state: present
+      register: gitlab_group_milestone_create
 
-  - name: Group milestone - Test milestone Created
-    assert:
-      that:
-        - gitlab_group_milestone_create is changed
-        - gitlab_group_milestone_create.milestones.added|length == 2
-        - gitlab_group_milestone_create.milestones.untouched|length == 0
-        - gitlab_group_milestone_create.milestones.removed|length == 0
-        - gitlab_group_milestone_create.milestones.updated|length == 0
-        - gitlab_group_milestone_create.milestones.added[0] == "{{ gitlab_first_milestone }}"
-        - gitlab_group_milestone_create.milestones.added[1] == "{{ gitlab_second_milestone }}"
+    - name: Group milestone - Test milestone Created
+      assert:
+        that:
+          - gitlab_group_milestone_create is changed
+          - gitlab_group_milestone_create.milestones.added|length == 2
+          - gitlab_group_milestone_create.milestones.untouched|length == 0
+          - gitlab_group_milestone_create.milestones.removed|length == 0
+          - gitlab_group_milestone_create.milestones.updated|length == 0
+          - gitlab_group_milestone_create.milestones.added[0] == "{{ gitlab_first_milestone }}"
+          - gitlab_group_milestone_create.milestones.added[1] == "{{ gitlab_second_milestone }}"
 
-  - name: Group milestone - Create milestone ( Idempotency test )
-    gitlab_milestone:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      group: "{{ gitlab_project_group }}"
-      milestones:
-        - title: "{{ gitlab_first_milestone }}"
-          start_date: "{{ gitlab_first_milestone_start_date }}"
-          due_date: "{{ gitlab_first_milestone_due_date }}"
-      state: present
-    register: gitlab_group_milestone_create_idempotence
+    - name: Group milestone - Create milestone ( Idempotency test )
+      gitlab_milestone:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        group: "{{ gitlab_project_group }}"
+        milestones:
+          - title: "{{ gitlab_first_milestone }}"
+            start_date: "{{ gitlab_first_milestone_start_date }}"
+            due_date: "{{ gitlab_first_milestone_due_date }}"
+        state: present
+      register: gitlab_group_milestone_create_idempotence
 
-  - name: Group milestone - Test Create milestone is Idempotent
-    assert:
-      that:
-        - gitlab_group_milestone_create_idempotence is not changed
+    - name: Group milestone - Test Create milestone is Idempotent
+      assert:
+        that:
+          - gitlab_group_milestone_create_idempotence is not changed
 
-  - name: Group milestone - Update milestone {{ gitlab_first_milestone }} changing dates
-    gitlab_milestone:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      group: "{{ gitlab_project_group }}"
-      milestones:
-        - title: "{{ gitlab_first_milestone }}"
-          start_date: "{{ gitlab_first_milestone_new_start_date }}"
-          due_date: "{{ gitlab_first_milestone_new_due_date }}"
-      state: present
-    register: gitlab_group_milestone_update
+    - name: Group milestone - Update milestone {{ gitlab_first_milestone }} changing dates
+      gitlab_milestone:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        group: "{{ gitlab_project_group }}"
+        milestones:
+          - title: "{{ gitlab_first_milestone }}"
+            start_date: "{{ gitlab_first_milestone_new_start_date }}"
+            due_date: "{{ gitlab_first_milestone_new_due_date }}"
+        state: present
+      register: gitlab_group_milestone_update
 
-  - name: Group milestone - Test milestone Updated
-    assert:
-      that:
-        - gitlab_group_milestone_update.milestones.added|length == 0
-        - gitlab_group_milestone_update.milestones.untouched|length == 0
-        - gitlab_group_milestone_update.milestones.removed|length == 0
-        - gitlab_group_milestone_update.milestones.updated|length == 1
-        - gitlab_group_milestone_update.milestones.updated[0] == "{{ gitlab_first_milestone }}"
+    - name: Group milestone - Test milestone Updated
+      assert:
+        that:
+          - gitlab_group_milestone_update.milestones.added|length == 0
+          - gitlab_group_milestone_update.milestones.untouched|length == 0
+          - gitlab_group_milestone_update.milestones.removed|length == 0
+          - gitlab_group_milestone_update.milestones.updated|length == 1
+          - gitlab_group_milestone_update.milestones.updated[0] == "{{ gitlab_first_milestone }}"
 
-  - name: Group milestone - Update milestone Test ( Additions )
-    gitlab_milestone:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      group: "{{ gitlab_project_group }}"
-      milestones:
-        - title: "{{ gitlab_second_milestone }}"
-          description: "{{ gitlab_first_milestone_description }}"
-      state: present
-    register: gitlab_group_milestone_update_additions
+    - name: Group milestone - Update milestone Test ( Additions )
+      gitlab_milestone:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        group: "{{ gitlab_project_group }}"
+        milestones:
+          - title: "{{ gitlab_second_milestone }}"
+            description: "{{ gitlab_first_milestone_description }}"
+        state: present
+      register: gitlab_group_milestone_update_additions
 
-  - name: Group milestone - Test milestone Updated ( Additions )
-    assert:
-      that:
-        - gitlab_group_milestone_update_additions.milestones.added|length == 0
-        - gitlab_group_milestone_update_additions.milestones.untouched|length == 0
-        - gitlab_group_milestone_update_additions.milestones.removed|length == 0
-        - gitlab_group_milestone_update_additions.milestones.updated|length == 1
-        - gitlab_group_milestone_update_additions.milestones.updated[0] == "{{ gitlab_second_milestone }}"
+    - name: Group milestone - Test milestone Updated ( Additions )
+      assert:
+        that:
+          - gitlab_group_milestone_update_additions.milestones.added|length == 0
+          - gitlab_group_milestone_update_additions.milestones.untouched|length == 0
+          - gitlab_group_milestone_update_additions.milestones.removed|length == 0
+          - gitlab_group_milestone_update_additions.milestones.updated|length == 1
+          - gitlab_group_milestone_update_additions.milestones.updated[0] == "{{ gitlab_second_milestone }}"
 
-  - name: Group milestone - Delete milestone {{ gitlab_second_milestone }}
-    gitlab_milestone:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      group: "{{ gitlab_project_group }}"
-      milestones:
-        - title: "{{ gitlab_second_milestone }}"
-      state: absent
-    register: gitlab_group_milestone_delete
+    - name: Group milestone - Delete milestone {{ gitlab_second_milestone }}
+      gitlab_milestone:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        group: "{{ gitlab_project_group }}"
+        milestones:
+          - title: "{{ gitlab_second_milestone }}"
+        state: absent
+      register: gitlab_group_milestone_delete
 
-  - name: Group milestone - Test milestone is deleted
-    assert:
-      that:
-        - gitlab_group_milestone_delete is changed
-        - gitlab_group_milestone_delete.milestones.added|length == 0
-        - gitlab_group_milestone_delete.milestones.untouched|length == 0
-        - gitlab_group_milestone_delete.milestones.removed|length == 1
-        - gitlab_group_milestone_delete.milestones.updated|length == 0
-        - gitlab_group_milestone_delete.milestones.removed[0] == "{{ gitlab_second_milestone }}"
+    - name: Group milestone - Test milestone is deleted
+      assert:
+        that:
+          - gitlab_group_milestone_delete is changed
+          - gitlab_group_milestone_delete.milestones.added|length == 0
+          - gitlab_group_milestone_delete.milestones.untouched|length == 0
+          - gitlab_group_milestone_delete.milestones.removed|length == 1
+          - gitlab_group_milestone_delete.milestones.updated|length == 0
+          - gitlab_group_milestone_delete.milestones.removed[0] == "{{ gitlab_second_milestone }}"
 
-  - name: Group milestone - Create group milestone {{ gitlab_second_milestone }} again purging the other
-    gitlab_milestone:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      group: "{{ gitlab_project_group }}"
-      purge: true
-      milestones:
-        - title: "{{ gitlab_second_milestone }}"
-      state: present
-    register: gitlab_group_milestone_create_purging
+    - name: Group milestone - Create group milestone {{ gitlab_second_milestone }} again purging the other
+      gitlab_milestone:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        group: "{{ gitlab_project_group }}"
+        purge: true
+        milestones:
+          - title: "{{ gitlab_second_milestone }}"
+        state: present
+      register: gitlab_group_milestone_create_purging
 
-  - name: Group milestone - Test milestone Created again
-    assert:
-      that:
-        - gitlab_group_milestone_create_purging is changed
-        - gitlab_group_milestone_create_purging.milestones.added|length == 1
-        - gitlab_group_milestone_create_purging.milestones.untouched|length == 0
-        - gitlab_group_milestone_create_purging.milestones.removed|length == 1
-        - gitlab_group_milestone_create_purging.milestones.updated|length == 0
-        - gitlab_group_milestone_create_purging.milestones.added[0] == "{{ gitlab_second_milestone }}"
-        - gitlab_group_milestone_create_purging.milestones.removed[0] == "{{ gitlab_first_milestone }}"
+    - name: Group milestone - Test milestone Created again
+      assert:
+        that:
+          - gitlab_group_milestone_create_purging is changed
+          - gitlab_group_milestone_create_purging.milestones.added|length == 1
+          - gitlab_group_milestone_create_purging.milestones.untouched|length == 0
+          - gitlab_group_milestone_create_purging.milestones.removed|length == 1
+          - gitlab_group_milestone_create_purging.milestones.updated|length == 0
+          - gitlab_group_milestone_create_purging.milestones.added[0] == "{{ gitlab_second_milestone }}"
+          - gitlab_group_milestone_create_purging.milestones.removed[0] == "{{ gitlab_first_milestone }}"
 
-###
-### Project milestone
-###
-  - name: Purge all group milestones for project milestone test - cannot exist with same name
-    gitlab_milestone:
-      api_url: "{{ gitlab_host }}"
-      api_token: "{{ gitlab_api_token }}"
-      group: "{{ gitlab_project_group }}"
-      purge: true
-    register: gitlab_group_milestone_purged
+  ###
+  ### Project milestone
+  ###
+    - name: Purge all group milestones for project milestone test - cannot exist with same name
+      gitlab_milestone:
+        api_url: "{{ gitlab_host }}"
+        api_token: "{{ gitlab_api_token }}"
+        group: "{{ gitlab_project_group }}"
+        purge: true
+      register: gitlab_group_milestone_purged
 
-  - name: Create {{ gitlab_project_name }}
-    gitlab_project:
-      api_url: "{{ gitlab_host }}"
-      validate_certs: true
-      api_token: "{{ gitlab_api_token }}"
-      name: "{{ gitlab_project_name }}"
-      group: "{{ gitlab_project_group }}"
-      default_branch: "{{ gitlab_branch }}"
-      initialize_with_readme: true
-      state: present
+    - name: Create {{ gitlab_project_name }}
+      gitlab_project:
+        api_url: "{{ gitlab_host }}"
+        validate_certs: true
+        api_token: "{{ gitlab_api_token }}"
+        name: "{{ gitlab_project_name }}"
+        group: "{{ gitlab_project_group }}"
+        default_branch: "{{ gitlab_branch }}"
+        initialize_with_readme: true
+        state: present
 
-  - name: Purge all milestones for check_mode test
-    gitlab_milestone:
-      api_url: "{{ gitlab_host }}"
-      api_token: "{{ gitlab_api_token }}"
-      project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
-      purge: true
+    - name: Purge all milestones for check_mode test
+      gitlab_milestone:
+        api_url: "{{ gitlab_host }}"
+        api_token: "{{ gitlab_api_token }}"
+        project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
+        purge: true
 
-  - name: Add a milestone in check_mode
-    gitlab_milestone:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
-      milestones:
-        - title: "{{ gitlab_second_milestone }}"
-          description: "{{ gitlab_second_milestone_description }}"
-    check_mode: true
-    register: gitlab_first_milestone_state
+    - name: Add a milestone in check_mode
+      gitlab_milestone:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
+        milestones:
+          - title: "{{ gitlab_second_milestone }}"
+            description: "{{ gitlab_second_milestone_description }}"
+      check_mode: true
+      register: gitlab_first_milestone_state
 
-  - name: Check_mode state must be changed
-    assert:
-      that:
-        - gitlab_first_milestone_state is changed
+    - name: Check_mode state must be changed
+      assert:
+        that:
+          - gitlab_first_milestone_state is changed
 
-  - name: Create milestone {{ gitlab_first_milestone }} and {{ gitlab_second_milestone }}
-    gitlab_milestone:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
-      milestones:
-        - title: "{{ gitlab_first_milestone }}"
-          start_date: "{{ gitlab_first_milestone_start_date }}"
-          due_date: "{{ gitlab_first_milestone_due_date }}"
-        - title: "{{ gitlab_second_milestone }}"
-      state: present
-    register: gitlab_milestones_create
+    - name: Create milestone {{ gitlab_first_milestone }} and {{ gitlab_second_milestone }}
+      gitlab_milestone:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
+        milestones:
+          - title: "{{ gitlab_first_milestone }}"
+            start_date: "{{ gitlab_first_milestone_start_date }}"
+            due_date: "{{ gitlab_first_milestone_due_date }}"
+          - title: "{{ gitlab_second_milestone }}"
+        state: present
+      register: gitlab_milestones_create
 
-  - name: Test milestone Created
-    assert:
-      that:
-        - gitlab_milestones_create is changed
-        - gitlab_milestones_create.milestones.added|length == 2
-        - gitlab_milestones_create.milestones.untouched|length == 0
-        - gitlab_milestones_create.milestones.removed|length == 0
-        - gitlab_milestones_create.milestones.updated|length == 0
-        - gitlab_milestones_create.milestones.added[0] == "{{ gitlab_first_milestone }}"
-        - gitlab_milestones_create.milestones.added[1] == "{{ gitlab_second_milestone }}"
+    - name: Test milestone Created
+      assert:
+        that:
+          - gitlab_milestones_create is changed
+          - gitlab_milestones_create.milestones.added|length == 2
+          - gitlab_milestones_create.milestones.untouched|length == 0
+          - gitlab_milestones_create.milestones.removed|length == 0
+          - gitlab_milestones_create.milestones.updated|length == 0
+          - gitlab_milestones_create.milestones.added[0] == "{{ gitlab_first_milestone }}"
+          - gitlab_milestones_create.milestones.added[1] == "{{ gitlab_second_milestone }}"
 
-  - name: Create milestone ( Idempotency test )
-    gitlab_milestone:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
-      milestones:
-        - title: "{{ gitlab_first_milestone }}"
-          start_date: "{{ gitlab_first_milestone_start_date }}"
-          due_date: "{{ gitlab_first_milestone_due_date }}"
-      state: present
-    register: gitlab_first_milestone_create_idempotence
+    - name: Create milestone ( Idempotency test )
+      gitlab_milestone:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
+        milestones:
+          - title: "{{ gitlab_first_milestone }}"
+            start_date: "{{ gitlab_first_milestone_start_date }}"
+            due_date: "{{ gitlab_first_milestone_due_date }}"
+        state: present
+      register: gitlab_first_milestone_create_idempotence
 
-  - name: Test Create milestone is Idempotent
-    assert:
-      that:
-        - gitlab_first_milestone_create_idempotence is not changed
+    - name: Test Create milestone is Idempotent
+      assert:
+        that:
+          - gitlab_first_milestone_create_idempotence is not changed
 
-  - name: Update milestone {{ gitlab_first_milestone }} changing dates
-    gitlab_milestone:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
-      milestones:
-        - title: "{{ gitlab_first_milestone }}"
-          start_date: "{{ gitlab_first_milestone_new_start_date }}"
-          due_date: "{{ gitlab_first_milestone_new_due_date }}"
-      state: present
-    register: gitlab_first_milestone_update
+    - name: Update milestone {{ gitlab_first_milestone }} changing dates
+      gitlab_milestone:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
+        milestones:
+          - title: "{{ gitlab_first_milestone }}"
+            start_date: "{{ gitlab_first_milestone_new_start_date }}"
+            due_date: "{{ gitlab_first_milestone_new_due_date }}"
+        state: present
+      register: gitlab_first_milestone_update
 
-  - name: Test milestone Updated
-    assert:
-      that:
-        - gitlab_first_milestone_update.milestones.added|length == 0
-        - gitlab_first_milestone_update.milestones.untouched|length == 0
-        - gitlab_first_milestone_update.milestones.removed|length == 0
-        - gitlab_first_milestone_update.milestones.updated|length == 1
-        - gitlab_first_milestone_update.milestones.updated[0] == "{{ gitlab_first_milestone }}"
+    - name: Test milestone Updated
+      assert:
+        that:
+          - gitlab_first_milestone_update.milestones.added|length == 0
+          - gitlab_first_milestone_update.milestones.untouched|length == 0
+          - gitlab_first_milestone_update.milestones.removed|length == 0
+          - gitlab_first_milestone_update.milestones.updated|length == 1
+          - gitlab_first_milestone_update.milestones.updated[0] == "{{ gitlab_first_milestone }}"
 
-  - name: Update milestone Test ( Additions )
-    gitlab_milestone:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
-      milestones:
-        - title: "{{ gitlab_second_milestone }}"
-          description: "{{ gitlab_second_milestone_description }}"
-      state: present
-    register: gitlab_first_milestone_update_additions
+    - name: Update milestone Test ( Additions )
+      gitlab_milestone:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
+        milestones:
+          - title: "{{ gitlab_second_milestone }}"
+            description: "{{ gitlab_second_milestone_description }}"
+        state: present
+      register: gitlab_first_milestone_update_additions
 
-  - name: Test milestone Updated ( Additions )
-    assert:
-      that:
-        - gitlab_first_milestone_update_additions.milestones.added|length == 0
-        - gitlab_first_milestone_update_additions.milestones.untouched|length == 0
-        - gitlab_first_milestone_update_additions.milestones.removed|length == 0
-        - gitlab_first_milestone_update_additions.milestones.updated|length == 1
-        - gitlab_first_milestone_update_additions.milestones.updated[0] == "{{ gitlab_second_milestone }}"
+    - name: Test milestone Updated ( Additions )
+      assert:
+        that:
+          - gitlab_first_milestone_update_additions.milestones.added|length == 0
+          - gitlab_first_milestone_update_additions.milestones.untouched|length == 0
+          - gitlab_first_milestone_update_additions.milestones.removed|length == 0
+          - gitlab_first_milestone_update_additions.milestones.updated|length == 1
+          - gitlab_first_milestone_update_additions.milestones.updated[0] == "{{ gitlab_second_milestone }}"
 
-  - name: Delete milestone {{ gitlab_second_milestone }}
-    gitlab_milestone:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
-      milestones:
-        - title: "{{ gitlab_second_milestone }}"
-      state: absent
-    register: gitlab_first_milestone_delete
+    - name: Delete milestone {{ gitlab_second_milestone }}
+      gitlab_milestone:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
+        milestones:
+          - title: "{{ gitlab_second_milestone }}"
+        state: absent
+      register: gitlab_first_milestone_delete
 
-  - name: Test milestone is deleted
-    assert:
-      that:
-        - gitlab_first_milestone_delete is changed
-        - gitlab_first_milestone_delete.milestones.added|length == 0
-        - gitlab_first_milestone_delete.milestones.untouched|length == 0
-        - gitlab_first_milestone_delete.milestones.removed|length == 1
-        - gitlab_first_milestone_delete.milestones.updated|length == 0
-        - gitlab_first_milestone_delete.milestones.removed[0] == "{{ gitlab_second_milestone }}"
+    - name: Test milestone is deleted
+      assert:
+        that:
+          - gitlab_first_milestone_delete is changed
+          - gitlab_first_milestone_delete.milestones.added|length == 0
+          - gitlab_first_milestone_delete.milestones.untouched|length == 0
+          - gitlab_first_milestone_delete.milestones.removed|length == 1
+          - gitlab_first_milestone_delete.milestones.updated|length == 0
+          - gitlab_first_milestone_delete.milestones.removed[0] == "{{ gitlab_second_milestone }}"
 
-  - name: Create milestone {{ gitlab_second_milestone }} again purging the other
-    gitlab_milestone:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
-      purge: true
-      milestones:
-        - title: "{{ gitlab_second_milestone }}"
-      state: present
-    register: gitlab_first_milestone_create_purging
+    - name: Create milestone {{ gitlab_second_milestone }} again purging the other
+      gitlab_milestone:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
+        purge: true
+        milestones:
+          - title: "{{ gitlab_second_milestone }}"
+        state: present
+      register: gitlab_first_milestone_create_purging
 
-  - name: Test milestone Created again
-    assert:
-      that:
-        - gitlab_first_milestone_create_purging is changed
-        - gitlab_first_milestone_create_purging.milestones.added|length == 1
-        - gitlab_first_milestone_create_purging.milestones.untouched|length == 0
-        - gitlab_first_milestone_create_purging.milestones.removed|length == 1
-        - gitlab_first_milestone_create_purging.milestones.updated|length == 0
-        - gitlab_first_milestone_create_purging.milestones.added[0] == "{{ gitlab_second_milestone }}"
-        - gitlab_first_milestone_create_purging.milestones.removed[0] == "{{ gitlab_first_milestone }}"
+    - name: Test milestone Created again
+      assert:
+        that:
+          - gitlab_first_milestone_create_purging is changed
+          - gitlab_first_milestone_create_purging.milestones.added|length == 1
+          - gitlab_first_milestone_create_purging.milestones.untouched|length == 0
+          - gitlab_first_milestone_create_purging.milestones.removed|length == 1
+          - gitlab_first_milestone_create_purging.milestones.updated|length == 0
+          - gitlab_first_milestone_create_purging.milestones.added[0] == "{{ gitlab_second_milestone }}"
+          - gitlab_first_milestone_create_purging.milestones.removed[0] == "{{ gitlab_first_milestone }}"
 
   always:
-  - name: Delete milestones
-    gitlab_milestone:
-      api_token: "{{ gitlab_api_token }}"
-      api_url: "{{ gitlab_host }}"
-      project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
-      purge: true
-      milestones:
-        - title: "{{ gitlab_first_milestone }}"
-        - title: "{{ gitlab_second_milestone }}"
-      state: absent
-    register: gitlab_first_milestone_always_delete
+    - name: Delete milestones
+      gitlab_milestone:
+        api_token: "{{ gitlab_api_token }}"
+        api_url: "{{ gitlab_host }}"
+        project: "{{ gitlab_project_group }}/{{ gitlab_project_name }}"
+        purge: true
+        milestones:
+          - title: "{{ gitlab_first_milestone }}"
+          - title: "{{ gitlab_second_milestone }}"
+        state: absent
+      register: gitlab_first_milestone_always_delete
 
-  - name: Test milestone are deleted
-    assert:
-      that:
-        - gitlab_first_milestone_always_delete is changed
-        - gitlab_first_milestone_always_delete.milestones.added|length == 0
-        - gitlab_first_milestone_always_delete.milestones.untouched|length == 0
-        - gitlab_first_milestone_always_delete.milestones.removed|length > 0
-        - gitlab_first_milestone_always_delete.milestones.updated|length == 0
+    - name: Test milestone are deleted
+      assert:
+        that:
+          - gitlab_first_milestone_always_delete is changed
+          - gitlab_first_milestone_always_delete.milestones.added|length == 0
+          - gitlab_first_milestone_always_delete.milestones.untouched|length == 0
+          - gitlab_first_milestone_always_delete.milestones.removed|length > 0
+          - gitlab_first_milestone_always_delete.milestones.updated|length == 0
 
-  - name: Clean up {{ gitlab_project_name }}
-    gitlab_project:
-      api_url: "{{ gitlab_host }}"
-      validate_certs: false
-      api_token: "{{ gitlab_api_token }}"
-      name: "{{ gitlab_project_name }}"
-      group: "{{ gitlab_project_group }}"
-      state: absent
+    - name: Clean up {{ gitlab_project_name }}
+      gitlab_project:
+        api_url: "{{ gitlab_host }}"
+        validate_certs: false
+        api_token: "{{ gitlab_api_token }}"
+        name: "{{ gitlab_project_name }}"
+        group: "{{ gitlab_project_group }}"
+        state: absent
 
-  - name: Clean up {{ gitlab_project_group }}
-    gitlab_group:
-      api_url: "{{ gitlab_host }}"
-      validate_certs: true
-      api_token: "{{ gitlab_api_token }}"
-      name: "{{ gitlab_project_group }}"
-      state: absent
\ No newline at end of file
+    - name: Clean up {{ gitlab_project_group }}
+      gitlab_group:
+        api_url: "{{ gitlab_host }}"
+        validate_certs: true
+        api_token: "{{ gitlab_api_token }}"
+        name: "{{ gitlab_project_group }}"
+        state: absent
\ No newline at end of file
diff --git a/tests/integration/targets/gitlab_project_access_token/tasks/main.yml b/tests/integration/targets/gitlab_project_access_token/tasks/main.yml
index c3125d740b..0e1ec2fddf 100644
--- a/tests/integration/targets/gitlab_project_access_token/tasks/main.yml
+++ b/tests/integration/targets/gitlab_project_access_token/tasks/main.yml
@@ -25,8 +25,8 @@
         expires_at: '2025-01-01'
         access_level: developer
         scopes:
-        - api
-        - read_api
+          - api
+          - read_api
       register: create_pfail_token_status
   always:
     - name: Assert that token creation in nonexisting project failed
@@ -47,8 +47,8 @@
         expires_at: '2025-13-01'
         access_level: developer
         scopes:
-        - api
-        - read_api
+          - api
+          - read_api
       register: create_efail_token_status
   always:
     - name: Assert that token creation with invalid expires_at failed
@@ -68,8 +68,8 @@
     expires_at: '2024-12-31'
     access_level: developer
     scopes:
-    - api
-    - read_api
+      - api
+      - read_api
   register: create_token_status
 - name: Assert that token creation with valid arguments is successfull
   assert:
@@ -88,8 +88,8 @@
     expires_at: '2024-12-31'
     access_level: developer
     scopes:
-    - api
-    - read_api
+      - api
+      - read_api
   register: check_token_status
 - name: Assert that token creation without changes and recreate=never succeeds with status not changed
   assert:
@@ -108,8 +108,8 @@
     expires_at: '2024-12-31'
     access_level: developer
     scopes:
-    - api
-    - read_api
+      - api
+      - read_api
     recreate: state_change
   register: check_recreate_token_status
 - name: Assert that token creation without changes and recreate=state_change succeeds with status not changed
@@ -130,8 +130,8 @@
         expires_at: '2025-01-01'
         access_level: developer
         scopes:
-        - api
-        - read_api
+          - api
+          - read_api
       register: change_token_status
   always:
     - name: Assert that token change with recreate=never fails
@@ -151,8 +151,8 @@
     expires_at: '2025-01-01'
     access_level: developer
     scopes:
-    - api
-    - read_api
+      - api
+      - read_api
     recreate: state_change
   register: change_recreate_token_status
 - name: Assert that token change with recreate=state_change succeeds
@@ -172,8 +172,8 @@
     expires_at: '2025-01-01'
     access_level: developer
     scopes:
-    - api
-    - read_api
+      - api
+      - read_api
     recreate: always
   register: change_recreate1_token_status
 - name: Assert that token change with recreate=always succeeds
@@ -193,8 +193,8 @@
     expires_at: '2024-12-31'
     access_level: developer
     scopes:
-    - api
-    - read_api
+      - api
+      - read_api
   register: revoke_token_status
 - name: Assert that token revocation succeeds
   assert:
@@ -212,8 +212,8 @@
     expires_at: '2024-12-31'
     access_level: developer
     scopes:
-    - api
-    - read_api
+      - api
+      - read_api
   register: revoke_token_status
 - name: Assert that token revocation succeeds with status not changed
   assert:
diff --git a/tests/integration/targets/gitlab_project_variable/tasks/main.yml b/tests/integration/targets/gitlab_project_variable/tasks/main.yml
index fee768f431..cb2baa6f12 100644
--- a/tests/integration/targets/gitlab_project_variable/tasks/main.yml
+++ b/tests/integration/targets/gitlab_project_variable/tasks/main.yml
@@ -479,7 +479,7 @@
       - gitlab_project_variable_state.project_variable.removed|length == 0
       - gitlab_project_variable_state.project_variable.updated|length == 0
       # VALUE_SPECIFIED_IN_NO_LOG_PARAMETER
-      #- gitlab_project_variable_state.project_variable.added[0] == "my_test_var"
+      # - gitlab_project_variable_state.project_variable.added[0] == "my_test_var"
 
 - name: change variable_type attribute
   gitlab_project_variable:
diff --git a/tests/integration/targets/hg/tasks/main.yml b/tests/integration/targets/hg/tasks/main.yml
index 1ca30459c8..8c79d20b86 100644
--- a/tests/integration/targets/hg/tasks/main.yml
+++ b/tests/integration/targets/hg/tasks/main.yml
@@ -22,16 +22,16 @@
   when: (ansible_distribution == "Ubuntu" and ansible_distribution_version == "14.04") or ansible_python_version is version("2.7.9", "<")
 
 - block:
-  - name: install mercurial
-    include_tasks: install.yml
-    when: has_hg is failed
+    - name: install mercurial
+      include_tasks: install.yml
+      when: has_hg is failed
 
-  - name: test mercurial
-    include_tasks: run-tests.yml
+    - name: test mercurial
+      include_tasks: run-tests.yml
 
-  - name: uninstall mercurial
-    include_tasks: uninstall.yml
-    when: has_hg is failed
+    - name: uninstall mercurial
+      include_tasks: uninstall.yml
+      when: has_hg is failed
 
   # As per the bitbucket changes in https://bitbucket.org/blog/deprecating-tlsv1-tlsv1-1-2018-12-01 , this
   #  test will fail under certain circumstances, to avoid false positives, we skip these tests under the following
@@ -41,5 +41,5 @@
   # - When ansible_python_version is not 2.7.9 or higher, mercurial is likely to also run using this same (old)
   #   python version, which causes issues as per the link above.
   when:
-  - not (ansible_distribution == "Ubuntu" and ansible_distribution_version == "14.04")
-  - ansible_python_version is version("2.7.9", ">=")
+    - not (ansible_distribution == "Ubuntu" and ansible_distribution_version == "14.04")
+    - ansible_python_version is version("2.7.9", ">=")
diff --git a/tests/integration/targets/homebrew/tasks/casks.yml b/tests/integration/targets/homebrew/tasks/casks.yml
index 176ab1faaf..842d209f52 100644
--- a/tests/integration/targets/homebrew/tasks/casks.yml
+++ b/tests/integration/targets/homebrew/tasks/casks.yml
@@ -18,89 +18,89 @@
     path: "{{ brew_which.stdout }}"
   register: brew_stat
 
-#- name: Use ignored-pinned option while upgrading all
-#  homebrew:
-#    upgrade_all: true
-#    upgrade_options: ignore-pinned
-#  become: true
-#  become_user: "{{ brew_stat.stat.pw_name }}"
-#  register: upgrade_option_result
-#  environment:
-#    HOMEBREW_NO_AUTO_UPDATE: True
+# - name: Use ignored-pinned option while upgrading all
+#   homebrew:
+#     upgrade_all: true
+#     upgrade_options: ignore-pinned
+#   become: true
+#   become_user: "{{ brew_stat.stat.pw_name }}"
+#   register: upgrade_option_result
+#   environment:
+#     HOMEBREW_NO_AUTO_UPDATE: True
 
-#- assert:
-#    that:
-#      - upgrade_option_result.changed
+# - assert:
+#     that:
+#       - upgrade_option_result.changed
 
 - vars:
     package_name: kitty
 
   block:
-  - name: Make sure {{ package_name }} package is not installed
-    homebrew:
-      name: "{{ package_name }}"
-      state: absent
-      update_homebrew: false
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
+    - name: Make sure {{ package_name }} package is not installed
+      homebrew:
+        name: "{{ package_name }}"
+        state: absent
+        update_homebrew: false
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
 
-  - name: Install {{ package_name }} package using homebrew
-    homebrew:
-      name: "{{ package_name }}"
-      state: present
-      update_homebrew: false
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
-    register: package_result
+    - name: Install {{ package_name }} package using homebrew
+      homebrew:
+        name: "{{ package_name }}"
+        state: present
+        update_homebrew: false
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
+      register: package_result
 
-  - assert:
-      that:
-        - package_result is changed
+    - assert:
+        that:
+          - package_result is changed
 
-  - name: Again install {{ package_name }} package using homebrew
-    homebrew:
-      name: "{{ package_name }}"
-      state: present
-      update_homebrew: false
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
-    register: package_result
+    - name: Again install {{ package_name }} package using homebrew
+      homebrew:
+        name: "{{ package_name }}"
+        state: present
+        update_homebrew: false
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
+      register: package_result
 
-  - assert:
-      that:
-        - package_result is not changed
+    - assert:
+        that:
+          - package_result is not changed
 
-  - name: Uninstall {{ package_name }} package using homebrew
-    homebrew:
-      name: "{{ package_name }}"
-      state: absent
-      update_homebrew: false
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
-    register: package_result
+    - name: Uninstall {{ package_name }} package using homebrew
+      homebrew:
+        name: "{{ package_name }}"
+        state: absent
+        update_homebrew: false
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
+      register: package_result
 
-  - assert:
-      that:
-        - package_result is changed
+    - assert:
+        that:
+          - package_result is changed
 
-  - name: Again uninstall {{ package_name }} package using homebrew
-    homebrew:
-      name: "{{ package_name }}"
-      state: absent
-      update_homebrew: false
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
-    register: package_result
+    - name: Again uninstall {{ package_name }} package using homebrew
+      homebrew:
+        name: "{{ package_name }}"
+        state: absent
+        update_homebrew: false
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
+      register: package_result
 
-  - assert:
-      that:
-        - package_result is not changed
+    - assert:
+        that:
+          - package_result is not changed
 
-  # This crashed on 4867eb4 - Ref: issue #9777
-  - name: Install cask using homelab/cask syntax
-    homebrew:
-      package: "homebrew/cask/{{ package_name }}"
-      state: present
-      update_homebrew: false
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
\ No newline at end of file
+    # This crashed on 4867eb4 - Ref: issue #9777
+    - name: Install cask using homelab/cask syntax
+      homebrew:
+        package: "homebrew/cask/{{ package_name }}"
+        state: present
+        update_homebrew: false
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
\ No newline at end of file
diff --git a/tests/integration/targets/homebrew/tasks/formulae.yml b/tests/integration/targets/homebrew/tasks/formulae.yml
index af4acf4a45..4cb4d5bd91 100644
--- a/tests/integration/targets/homebrew/tasks/formulae.yml
+++ b/tests/integration/targets/homebrew/tasks/formulae.yml
@@ -18,150 +18,150 @@
     path: "{{ brew_which.stdout }}"
   register: brew_stat
 
-#- name: Use ignored-pinned option while upgrading all
-#  homebrew:
-#    upgrade_all: true
-#    upgrade_options: ignore-pinned
-#  become: true
-#  become_user: "{{ brew_stat.stat.pw_name }}"
-#  register: upgrade_option_result
-#  environment:
-#    HOMEBREW_NO_AUTO_UPDATE: True
+# - name: Use ignored-pinned option while upgrading all
+#   homebrew:
+#     upgrade_all: true
+#     upgrade_options: ignore-pinned
+#   become: true
+#   become_user: "{{ brew_stat.stat.pw_name }}"
+#   register: upgrade_option_result
+#   environment:
+#     HOMEBREW_NO_AUTO_UPDATE: True
 
-#- assert:
-#    that:
-#      - upgrade_option_result.changed
+# - assert:
+#     that:
+#       - upgrade_option_result.changed
 
 - vars:
     package_name: gnu-tar
 
   block:
-  - name: Make sure {{ package_name }} package is not installed
-    homebrew:
-      name: "{{ package_name }}"
-      state: absent
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
+    - name: Make sure {{ package_name }} package is not installed
+      homebrew:
+        name: "{{ package_name }}"
+        state: absent
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
 
-  - name: Install {{ package_name }} package using homebrew
-    homebrew:
-      name: "{{ package_name }}"
-      state: present
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
-    register: package_result
+    - name: Install {{ package_name }} package using homebrew
+      homebrew:
+        name: "{{ package_name }}"
+        state: present
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
+      register: package_result
 
-  - assert:
-      that:
-        - package_result is changed
-        - "package_result.msg == 'Package installed: gnu-tar'"
-        - "package_result.changed_pkgs == ['gnu-tar']"
-        - "package_result.unchanged_pkgs == []"
+    - assert:
+        that:
+          - package_result is changed
+          - "package_result.msg == 'Package installed: gnu-tar'"
+          - "package_result.changed_pkgs == ['gnu-tar']"
+          - "package_result.unchanged_pkgs == []"
 
-  - name: Again install {{ package_name }} package using homebrew
-    homebrew:
-      name: "{{ package_name }}"
-      state: present
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
-    register: package_result
+    - name: Again install {{ package_name }} package using homebrew
+      homebrew:
+        name: "{{ package_name }}"
+        state: present
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
+      register: package_result
 
-  - assert:
-      that:
-        - package_result is not changed
-        - "package_result.msg == 'Package already installed: gnu-tar'"
-        - "package_result.changed_pkgs == []"
-        - "package_result.unchanged_pkgs == ['gnu-tar']"
+    - assert:
+        that:
+          - package_result is not changed
+          - "package_result.msg == 'Package already installed: gnu-tar'"
+          - "package_result.changed_pkgs == []"
+          - "package_result.unchanged_pkgs == ['gnu-tar']"
 
-  - name: Unlink {{ package_name }} package using homebrew
-    homebrew:
-      name: "{{ package_name }}"
-      state: unlinked
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
-    register: package_result
+    - name: Unlink {{ package_name }} package using homebrew
+      homebrew:
+        name: "{{ package_name }}"
+        state: unlinked
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
+      register: package_result
 
-  - assert:
-      that:
-        - package_result is changed
-        - "package_result.msg == 'Package unlinked: gnu-tar'"
-        - "package_result.changed_pkgs == ['gnu-tar']"
-        - "package_result.unchanged_pkgs == []"
+    - assert:
+        that:
+          - package_result is changed
+          - "package_result.msg == 'Package unlinked: gnu-tar'"
+          - "package_result.changed_pkgs == ['gnu-tar']"
+          - "package_result.unchanged_pkgs == []"
 
-  - name: Link {{ package_name }} package using homebrew
-    homebrew:
-      name: "{{ package_name }}"
-      state: linked
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
-    register: package_result
+    - name: Link {{ package_name }} package using homebrew
+      homebrew:
+        name: "{{ package_name }}"
+        state: linked
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
+      register: package_result
 
-  - assert:
-      that:
-        - package_result is changed
-        - "package_result.msg == 'Package linked: gnu-tar'"
-        - "package_result.changed_pkgs == ['gnu-tar']"
-        - "package_result.unchanged_pkgs == []"
+    - assert:
+        that:
+          - package_result is changed
+          - "package_result.msg == 'Package linked: gnu-tar'"
+          - "package_result.changed_pkgs == ['gnu-tar']"
+          - "package_result.unchanged_pkgs == []"
 
-  - name: Uninstall {{ package_name }} package using homebrew
-    homebrew:
-      name: "{{ package_name }}"
-      state: absent
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
-    register: package_result
+    - name: Uninstall {{ package_name }} package using homebrew
+      homebrew:
+        name: "{{ package_name }}"
+        state: absent
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
+      register: package_result
 
-  - assert:
-      that:
-        - package_result is changed
-        - "package_result.msg == 'Package uninstalled: gnu-tar'"
-        - "package_result.changed_pkgs == ['gnu-tar']"
-        - "package_result.unchanged_pkgs == []"
+    - assert:
+        that:
+          - package_result is changed
+          - "package_result.msg == 'Package uninstalled: gnu-tar'"
+          - "package_result.changed_pkgs == ['gnu-tar']"
+          - "package_result.unchanged_pkgs == []"
 
-  - name: Again uninstall {{ package_name }} package using homebrew
-    homebrew:
-      name: "{{ package_name }}"
-      state: absent
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
-    register: package_result
+    - name: Again uninstall {{ package_name }} package using homebrew
+      homebrew:
+        name: "{{ package_name }}"
+        state: absent
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
+      register: package_result
 
-  - assert:
-      that:
-        - package_result is not changed
-        - "package_result.msg == 'Package already uninstalled: gnu-tar'"
-        - "package_result.changed_pkgs == []"
-        - "package_result.unchanged_pkgs == ['gnu-tar']"
+    - assert:
+        that:
+          - package_result is not changed
+          - "package_result.msg == 'Package already uninstalled: gnu-tar'"
+          - "package_result.changed_pkgs == []"
+          - "package_result.unchanged_pkgs == ['gnu-tar']"
 
-  - name: Upgrade {{ package_name }} package using homebrew
-    homebrew:
-      name: "{{ package_name }}"
-      state: latest
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
-    register: package_result
+    - name: Upgrade {{ package_name }} package using homebrew
+      homebrew:
+        name: "{{ package_name }}"
+        state: latest
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
+      register: package_result
 
-  - assert:
-      that:
-        - package_result is changed
-        - "package_result.msg == 'Package upgraded: gnu-tar'"
-        - "package_result.changed_pkgs == ['gnu-tar']"
-        - "package_result.unchanged_pkgs == []"
+    - assert:
+        that:
+          - package_result is changed
+          - "package_result.msg == 'Package upgraded: gnu-tar'"
+          - "package_result.changed_pkgs == ['gnu-tar']"
+          - "package_result.unchanged_pkgs == []"
 
-  - name: Again upgrade {{ package_name }} package using homebrew
-    homebrew:
-      name: "{{ package_name }}"
-      state: latest
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
-    register: package_result
+    - name: Again upgrade {{ package_name }} package using homebrew
+      homebrew:
+        name: "{{ package_name }}"
+        state: latest
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
+      register: package_result
 
-  - assert:
-      that:
-        - package_result is not changed
-        - "package_result.msg == 'Package already upgraded: gnu-tar'"
-        - "package_result.changed_pkgs == []"
-        - "package_result.unchanged_pkgs == ['gnu-tar']"
+    - assert:
+        that:
+          - package_result is not changed
+          - "package_result.msg == 'Package already upgraded: gnu-tar'"
+          - "package_result.changed_pkgs == []"
+          - "package_result.unchanged_pkgs == ['gnu-tar']"
 
 - vars:
     package_names:
@@ -169,313 +169,313 @@
       - gnu-time
 
   block:
-  - name: Make sure {{ package_names }} packages are not installed
-    homebrew:
-      name: "{{ package_names }}"
-      state: absent
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
+    - name: Make sure {{ package_names }} packages are not installed
+      homebrew:
+        name: "{{ package_names }}"
+        state: absent
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
 
-  - name: Install only {{ package_names[0] }} package using homebrew
-    homebrew:
-      name: "{{ package_names[0] }}"
-      state: present
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
+    - name: Install only {{ package_names[0] }} package using homebrew
+      homebrew:
+        name: "{{ package_names[0] }}"
+        state: present
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
 
-  - name: Install {{ package_names }} packages using homebrew (one is already installed)
-    homebrew:
-      name: "{{ package_names }}"
-      state: present
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
-    register: package_result
+    - name: Install {{ package_names }} packages using homebrew (one is already installed)
+      homebrew:
+        name: "{{ package_names }}"
+        state: present
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
+      register: package_result
 
-  - assert:
-      that:
-        - package_result is changed
-        - "package_result.msg == 'Changed: 1, Unchanged: 1'"
-        - "package_result.changed_pkgs == ['gnu-time']"
-        - "package_result.unchanged_pkgs == ['gnu-tar']"
+    - assert:
+        that:
+          - package_result is changed
+          - "package_result.msg == 'Changed: 1, Unchanged: 1'"
+          - "package_result.changed_pkgs == ['gnu-time']"
+          - "package_result.unchanged_pkgs == ['gnu-tar']"
 
-  - name: Again install {{ package_names }} packages using homebrew
-    homebrew:
-      name: "{{ package_names }}"
-      state: present
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
-    register: package_result
+    - name: Again install {{ package_names }} packages using homebrew
+      homebrew:
+        name: "{{ package_names }}"
+        state: present
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
+      register: package_result
 
-  - assert:
-      that:
-        - package_result is not changed
-        - "package_result.msg == 'Changed: 0, Unchanged: 2'"
-        - "package_result.changed_pkgs == []"
-        - "package_result.unchanged_pkgs | sort == ['gnu-tar', 'gnu-time']"
+    - assert:
+        that:
+          - package_result is not changed
+          - "package_result.msg == 'Changed: 0, Unchanged: 2'"
+          - "package_result.changed_pkgs == []"
+          - "package_result.unchanged_pkgs | sort == ['gnu-tar', 'gnu-time']"
 
-  - name: Unlink {{ package_names }} packages using homebrew
-    homebrew:
-      name: "{{ package_names }}"
-      state: unlinked
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
-    register: package_result
+    - name: Unlink {{ package_names }} packages using homebrew
+      homebrew:
+        name: "{{ package_names }}"
+        state: unlinked
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
+      register: package_result
 
-  - assert:
-      that:
-        - package_result is changed
-        - "package_result.msg == 'Changed: 2, Unchanged: 0'"
-        - "package_result.changed_pkgs | sort == ['gnu-tar', 'gnu-time']"
-        - "package_result.unchanged_pkgs == []"
+    - assert:
+        that:
+          - package_result is changed
+          - "package_result.msg == 'Changed: 2, Unchanged: 0'"
+          - "package_result.changed_pkgs | sort == ['gnu-tar', 'gnu-time']"
+          - "package_result.unchanged_pkgs == []"
 
-  - name: Link {{ package_names }} packages using homebrew
-    homebrew:
-      name: "{{ package_names }}"
-      state: linked
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
-    register: package_result
+    - name: Link {{ package_names }} packages using homebrew
+      homebrew:
+        name: "{{ package_names }}"
+        state: linked
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
+      register: package_result
 
-  - assert:
-      that:
-        - package_result is changed
-        - "package_result.msg == 'Changed: 2, Unchanged: 0'"
-        - "package_result.changed_pkgs | sort == ['gnu-tar', 'gnu-time']"
-        - "package_result.unchanged_pkgs == []"
+    - assert:
+        that:
+          - package_result is changed
+          - "package_result.msg == 'Changed: 2, Unchanged: 0'"
+          - "package_result.changed_pkgs | sort == ['gnu-tar', 'gnu-time']"
+          - "package_result.unchanged_pkgs == []"
 
-  - name: Uninstall {{ package_names }} packages using homebrew
-    homebrew:
-      name: "{{ package_names }}"
-      state: absent
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
-    register: package_result
+    - name: Uninstall {{ package_names }} packages using homebrew
+      homebrew:
+        name: "{{ package_names }}"
+        state: absent
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
+      register: package_result
 
-  - assert:
-      that:
-        - package_result is changed
-        - "package_result.msg == 'Changed: 2, Unchanged: 0'"
-        - "package_result.changed_pkgs | sort == ['gnu-tar', 'gnu-time']"
-        - "package_result.unchanged_pkgs == []"
+    - assert:
+        that:
+          - package_result is changed
+          - "package_result.msg == 'Changed: 2, Unchanged: 0'"
+          - "package_result.changed_pkgs | sort == ['gnu-tar', 'gnu-time']"
+          - "package_result.unchanged_pkgs == []"
 
-  - name: Again uninstall {{ package_names }} packages using homebrew
-    homebrew:
-      name: "{{ package_names }}"
-      state: absent
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
-    register: package_result
+    - name: Again uninstall {{ package_names }} packages using homebrew
+      homebrew:
+        name: "{{ package_names }}"
+        state: absent
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
+      register: package_result
 
-  - assert:
-      that:
-        - package_result is not changed
-        - "package_result.msg == 'Changed: 0, Unchanged: 2'"
-        - "package_result.changed_pkgs == []"
-        - "package_result.unchanged_pkgs | sort == ['gnu-tar', 'gnu-time']"
+    - assert:
+        that:
+          - package_result is not changed
+          - "package_result.msg == 'Changed: 0, Unchanged: 2'"
+          - "package_result.changed_pkgs == []"
+          - "package_result.unchanged_pkgs | sort == ['gnu-tar', 'gnu-time']"
 
-  - name: Upgrade {{ package_names }} packages using homebrew
-    homebrew:
-      name: "{{ package_names }}"
-      state: latest
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
-    register: package_result
+    - name: Upgrade {{ package_names }} packages using homebrew
+      homebrew:
+        name: "{{ package_names }}"
+        state: latest
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
+      register: package_result
 
-  - assert:
-      that:
-        - package_result is changed
-        - "package_result.msg == 'Changed: 2, Unchanged: 0'"
-        - "package_result.changed_pkgs | sort == ['gnu-tar', 'gnu-time']"
-        - "package_result.unchanged_pkgs == []"
+    - assert:
+        that:
+          - package_result is changed
+          - "package_result.msg == 'Changed: 2, Unchanged: 0'"
+          - "package_result.changed_pkgs | sort == ['gnu-tar', 'gnu-time']"
+          - "package_result.unchanged_pkgs == []"
 
-  - name: Again upgrade {{ package_names }} packages using homebrew
-    homebrew:
-      name: "{{ package_names }}"
-      state: latest
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
-    register: package_result
+    - name: Again upgrade {{ package_names }} packages using homebrew
+      homebrew:
+        name: "{{ package_names }}"
+        state: latest
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
+      register: package_result
 
-  - assert:
-      that:
-        - package_result is not changed
-        - "package_result.msg == 'Changed: 0, Unchanged: 2'"
-        - "package_result.changed_pkgs == []"
-        - "package_result.unchanged_pkgs | sort == ['gnu-tar', 'gnu-time']"
+    - assert:
+        that:
+          - package_result is not changed
+          - "package_result.msg == 'Changed: 0, Unchanged: 2'"
+          - "package_result.changed_pkgs == []"
+          - "package_result.unchanged_pkgs | sort == ['gnu-tar', 'gnu-time']"
 
 # Test alias handling with sqlite (that is aliased to sqlite3)
 - block:
-  - name: Make sure sqlite package is not installed
-    homebrew:
-      name: "sqlite"
-      state: absent
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
+    - name: Make sure sqlite package is not installed
+      homebrew:
+        name: "sqlite"
+        state: absent
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
 
-  - name: Install sqlite package using alias (sqlite3)
-    homebrew:
-      name: "sqlite3"
-      state: present
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
-    register: install_result
+    - name: Install sqlite package using alias (sqlite3)
+      homebrew:
+        name: "sqlite3"
+        state: present
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
+      register: install_result
 
-  - assert:
-      that:
-        - install_result is changed
-        - "install_result.msg == 'Package installed: sqlite3'"
-        - "install_result.changed_pkgs == ['sqlite3']"
-        - "install_result.unchanged_pkgs == []"
+    - assert:
+        that:
+          - install_result is changed
+          - "install_result.msg == 'Package installed: sqlite3'"
+          - "install_result.changed_pkgs == ['sqlite3']"
+          - "install_result.unchanged_pkgs == []"
 
-  - name: Again install sqlite package using alias (sqlite3)
-    homebrew:
-      name: "sqlite3"
-      state: present
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
-    register: reinstall_result
+    - name: Again install sqlite package using alias (sqlite3)
+      homebrew:
+        name: "sqlite3"
+        state: present
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
+      register: reinstall_result
 
-  - assert:
-      that:
-        - reinstall_result is not changed
-        - "reinstall_result.msg == 'Package already installed: sqlite3'"
-        - "reinstall_result.changed_pkgs == []"
-        - "reinstall_result.unchanged_pkgs == ['sqlite3']"
+    - assert:
+        that:
+          - reinstall_result is not changed
+          - "reinstall_result.msg == 'Package already installed: sqlite3'"
+          - "reinstall_result.changed_pkgs == []"
+          - "reinstall_result.unchanged_pkgs == ['sqlite3']"
 
 # Test install from homebrew tap
 - block:
-  - name: Tap hashicorp repository
-    community.general.homebrew_tap:
-      name: hashicorp/tap
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
+    - name: Tap hashicorp repository
+      community.general.homebrew_tap:
+        name: hashicorp/tap
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
 
-  - name: Install terraform from tap
-    community.general.homebrew:
-      name: hashicorp/tap/terraform
-      state: latest
-    register: terraform_install_result
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
+    - name: Install terraform from tap
+      community.general.homebrew:
+        name: hashicorp/tap/terraform
+        state: latest
+      register: terraform_install_result
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
 
-  - assert:
-      that:
-        - terraform_install_result is changed
-        - "terraform_install_result.msg == 'Package upgraded: hashicorp/tap/terraform'"
-        - "terraform_install_result.changed_pkgs == ['hashicorp/tap/terraform']"
-        - "terraform_install_result.unchanged_pkgs == []"
+    - assert:
+        that:
+          - terraform_install_result is changed
+          - "terraform_install_result.msg == 'Package upgraded: hashicorp/tap/terraform'"
+          - "terraform_install_result.changed_pkgs == ['hashicorp/tap/terraform']"
+          - "terraform_install_result.unchanged_pkgs == []"
 
-  - name: Remove terraform
-    homebrew:
-      name: hashicorp/tap/terraform
-      state: absent
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
+    - name: Remove terraform
+      homebrew:
+        name: hashicorp/tap/terraform
+        state: absent
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
 
 # Test irregular formulae name case
 - block:
-  - name: Install terraform from full tap name with irregular case
-    community.general.homebrew:
-      name: HasHicorp/TAp/tErRaForm
-      state: latest
-    register: terraform_install_result
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
+    - name: Install terraform from full tap name with irregular case
+      community.general.homebrew:
+        name: HasHicorp/TAp/tErRaForm
+        state: latest
+      register: terraform_install_result
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
 
-  - assert:
-      that:
-        - terraform_install_result is changed
-        - "terraform_install_result.msg == 'Package upgraded: hashicorp/tap/terraform'"
-        - "terraform_install_result.changed_pkgs == ['hashicorp/tap/terraform']"
-        - "terraform_install_result.unchanged_pkgs == []"
+    - assert:
+        that:
+          - terraform_install_result is changed
+          - "terraform_install_result.msg == 'Package upgraded: hashicorp/tap/terraform'"
+          - "terraform_install_result.changed_pkgs == ['hashicorp/tap/terraform']"
+          - "terraform_install_result.unchanged_pkgs == []"
 
 # Test tap with no public fallback
 - block:
-  - name: Tap ascii-image-converter homebrew repository
-    community.general.homebrew_tap:
-      name: TheZoraiz/ascii-image-converter
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
+    - name: Tap ascii-image-converter homebrew repository
+      community.general.homebrew_tap:
+        name: TheZoraiz/ascii-image-converter
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
 
-  - name: Install ascii from full tap name
-    community.general.homebrew:
-      name: TheZoraiz/ascii-image-converter/ascii-image-converter
-      state: latest
-    register: ascii_install_result
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
+    - name: Install ascii from full tap name
+      community.general.homebrew:
+        name: TheZoraiz/ascii-image-converter/ascii-image-converter
+        state: latest
+      register: ascii_install_result
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
 
-  - assert:
-      that:
-        - ascii_install_result is changed
-        - "ascii_install_result.msg == 'Package upgraded: thezoraiz/ascii-image-converter/ascii-image-converter'"
-        - "ascii_install_result.changed_pkgs == ['thezoraiz/ascii-image-converter/ascii-image-converter']"
-        - "ascii_install_result.unchanged_pkgs == []"
+    - assert:
+        that:
+          - ascii_install_result is changed
+          - "ascii_install_result.msg == 'Package upgraded: thezoraiz/ascii-image-converter/ascii-image-converter'"
+          - "ascii_install_result.changed_pkgs == ['thezoraiz/ascii-image-converter/ascii-image-converter']"
+          - "ascii_install_result.unchanged_pkgs == []"
 
-  - name: Again install ascii from full tap name
-    community.general.homebrew:
-      name: TheZoraiz/ascii-image-converter/ascii-image-converter
-      state: latest
-    register: ascii_reinstall_result
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
+    - name: Again install ascii from full tap name
+      community.general.homebrew:
+        name: TheZoraiz/ascii-image-converter/ascii-image-converter
+        state: latest
+      register: ascii_reinstall_result
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
 
-  - assert:
-      that:
-        - ascii_reinstall_result is not changed
-        - "ascii_reinstall_result.msg == 'Package already upgraded: thezoraiz/ascii-image-converter/ascii-image-converter'"
-        - "ascii_reinstall_result.changed_pkgs == []"
-        - "ascii_reinstall_result.unchanged_pkgs == ['thezoraiz/ascii-image-converter/ascii-image-converter']"
+    - assert:
+        that:
+          - ascii_reinstall_result is not changed
+          - "ascii_reinstall_result.msg == 'Package already upgraded: thezoraiz/ascii-image-converter/ascii-image-converter'"
+          - "ascii_reinstall_result.changed_pkgs == []"
+          - "ascii_reinstall_result.unchanged_pkgs == ['thezoraiz/ascii-image-converter/ascii-image-converter']"
 
-  - name: Remove ascii from full tap name
-    homebrew:
-      name: TheZoraiz/ascii-image-converter/ascii-image-converter
-      state: absent
-    register: ascii_uninstall_result
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
+    - name: Remove ascii from full tap name
+      homebrew:
+        name: TheZoraiz/ascii-image-converter/ascii-image-converter
+        state: absent
+      register: ascii_uninstall_result
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
 
-  - assert:
-      that:
-        - ascii_uninstall_result is changed
-        - "ascii_uninstall_result.msg == 'Package uninstalled: thezoraiz/ascii-image-converter/ascii-image-converter'"
-        - "ascii_uninstall_result.changed_pkgs == ['thezoraiz/ascii-image-converter/ascii-image-converter']"
-        - "ascii_uninstall_result.unchanged_pkgs == []"
+    - assert:
+        that:
+          - ascii_uninstall_result is changed
+          - "ascii_uninstall_result.msg == 'Package uninstalled: thezoraiz/ascii-image-converter/ascii-image-converter'"
+          - "ascii_uninstall_result.changed_pkgs == ['thezoraiz/ascii-image-converter/ascii-image-converter']"
+          - "ascii_uninstall_result.unchanged_pkgs == []"
 
-  - name: Again remove ascii from full tap name
-    homebrew:
-      name: TheZoraiz/ascii-image-converter/ascii-image-converter
-      state: absent
-    register: ascii_again_uninstall_result
+    - name: Again remove ascii from full tap name
+      homebrew:
+        name: TheZoraiz/ascii-image-converter/ascii-image-converter
+        state: absent
+      register: ascii_again_uninstall_result
 
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
 
-  - assert:
-      that:
-        - ascii_again_uninstall_result is not changed
-        - "ascii_again_uninstall_result.msg == 'Package already uninstalled: thezoraiz/ascii-image-converter/ascii-image-converter'"
-        - "ascii_again_uninstall_result.changed_pkgs == []"
-        - "ascii_again_uninstall_result.unchanged_pkgs == ['thezoraiz/ascii-image-converter/ascii-image-converter']"
+    - assert:
+        that:
+          - ascii_again_uninstall_result is not changed
+          - "ascii_again_uninstall_result.msg == 'Package already uninstalled: thezoraiz/ascii-image-converter/ascii-image-converter'"
+          - "ascii_again_uninstall_result.changed_pkgs == []"
+          - "ascii_again_uninstall_result.unchanged_pkgs == ['thezoraiz/ascii-image-converter/ascii-image-converter']"
 
-  - name: Install ascii from regular name
-    community.general.homebrew:
-      name: ascii-image-converter
-      state: latest
-    register: ascii_install_result
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
+    - name: Install ascii from regular name
+      community.general.homebrew:
+        name: ascii-image-converter
+        state: latest
+      register: ascii_install_result
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
 
-  - assert:
-      that:
-        - ascii_install_result is changed
-        - "ascii_install_result.msg == 'Package upgraded: ascii-image-converter'"
-        - "ascii_install_result.changed_pkgs == ['ascii-image-converter']"
-        - "ascii_install_result.unchanged_pkgs == []"
+    - assert:
+        that:
+          - ascii_install_result is changed
+          - "ascii_install_result.msg == 'Package upgraded: ascii-image-converter'"
+          - "ascii_install_result.changed_pkgs == ['ascii-image-converter']"
+          - "ascii_install_result.unchanged_pkgs == []"
 
-  - name: Remove ascii from regular name
-    homebrew:
-      name: ascii-image-converter
-      state: absent
-    become: true
-    become_user: "{{ brew_stat.stat.pw_name }}"
+    - name: Remove ascii from regular name
+      homebrew:
+        name: ascii-image-converter
+        state: absent
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
diff --git a/tests/integration/targets/homebrew_cask/tasks/main.yml b/tests/integration/targets/homebrew_cask/tasks/main.yml
index 85f2572664..d68edb6d35 100644
--- a/tests/integration/targets/homebrew_cask/tasks/main.yml
+++ b/tests/integration/targets/homebrew_cask/tasks/main.yml
@@ -9,65 +9,65 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Find brew binary
-    command: which brew
-    register: brew_which
-    when: ansible_distribution in ['MacOSX']
+- name: Find brew binary
+  command: which brew
+  register: brew_which
+  when: ansible_distribution in ['MacOSX']
 
-  - name: Get owner of brew binary
-    stat:
-      path: "{{ brew_which.stdout }}"
-    register: brew_stat
-    when: ansible_distribution in ['MacOSX']
+- name: Get owner of brew binary
+  stat:
+    path: "{{ brew_which.stdout }}"
+  register: brew_stat
+  when: ansible_distribution in ['MacOSX']
 
-  - block:
-      - name: Install cask
-        homebrew_cask:
-          name: "{{ cask }}"
-          state: present
-        become: true
-        become_user: "{{ brew_stat.stat.pw_name }}"
-        register: cask_install_result
+- block:
+    - name: Install cask
+      homebrew_cask:
+        name: "{{ cask }}"
+        state: present
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
+      register: cask_install_result
 
-      - assert:
-          that:
-            - cask_install_result is changed
-            - "'Cask installed' in cask_install_result.msg"
+    - assert:
+        that:
+          - cask_install_result is changed
+          - "'Cask installed' in cask_install_result.msg"
 
-      - name: Install cask (idempotence)
-        homebrew_cask:
-          name: "{{ cask }}"
-          state: present
-        become: true
-        become_user: "{{ brew_stat.stat.pw_name }}"
-        register: cask_install_result
+    - name: Install cask (idempotence)
+      homebrew_cask:
+        name: "{{ cask }}"
+        state: present
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
+      register: cask_install_result
 
-      - assert:
-          that:
-            - cask_install_result is not changed
-            - "'Cask installed' not in cask_install_result.msg"
-            - "'Cask already installed' in cask_install_result.msg"
+    - assert:
+        that:
+          - cask_install_result is not changed
+          - "'Cask installed' not in cask_install_result.msg"
+          - "'Cask already installed' in cask_install_result.msg"
 
-      - name: Install cask with force install option
-        homebrew_cask:
-          name: "{{ cask }}"
-          state: present
-          install_options: force
-        become: true
-        become_user: "{{ brew_stat.stat.pw_name }}"
-        register: cask_install_result
+    - name: Install cask with force install option
+      homebrew_cask:
+        name: "{{ cask }}"
+        state: present
+        install_options: force
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
+      register: cask_install_result
 
-      - assert:
-          that:
-            - cask_install_result is changed
-            - "'Cask installed' in cask_install_result.msg"
+    - assert:
+        that:
+          - cask_install_result is changed
+          - "'Cask installed' in cask_install_result.msg"
 
-    always:
-      - name: Delete cask
-        homebrew_cask:
-          name: "{{ cask }}"
-          state: absent
-          install_options: force
-        become: true
-        become_user: "{{ brew_stat.stat.pw_name }}"
-        ignore_errors: true
+  always:
+    - name: Delete cask
+      homebrew_cask:
+        name: "{{ cask }}"
+        state: absent
+        install_options: force
+      become: true
+      become_user: "{{ brew_stat.stat.pw_name }}"
+      ignore_errors: true
diff --git a/tests/integration/targets/homebrew_services/tasks/main.yml b/tests/integration/targets/homebrew_services/tasks/main.yml
index 1d524715ca..30e70fa114 100644
--- a/tests/integration/targets/homebrew_services/tasks/main.yml
+++ b/tests/integration/targets/homebrew_services/tasks/main.yml
@@ -20,67 +20,67 @@
   become: true
   become_user: "{{ brew_stat.stat.pw_name }}"
   block:
-  - name: MACOS | Install black
-    community.general.homebrew:
-      name: black
-      state: present
-    register: install_result
-    notify:
-      - uninstall black
+    - name: MACOS | Install black
+      community.general.homebrew:
+        name: black
+        state: present
+      register: install_result
+      notify:
+        - uninstall black
 
-  - name: Check the black service is installed
-    assert:
-      that:
-        - install_result is success
+    - name: Check the black service is installed
+      assert:
+        that:
+          - install_result is success
 
-  - name: Start the black service
-    community.general.homebrew_services:
-      name: black
-      state: present
-    register: start_result
-    environment:
-      HOMEBREW_NO_ENV_HINTS: "1"
+    - name: Start the black service
+      community.general.homebrew_services:
+        name: black
+        state: present
+      register: start_result
+      environment:
+        HOMEBREW_NO_ENV_HINTS: "1"
 
-  - name: Check the black service is running
-    assert:
-      that:
-        - start_result is success
+    - name: Check the black service is running
+      assert:
+        that:
+          - start_result is success
 
-  - name: Start the black service when already started
-    community.general.homebrew_services:
-      name: black
-      state: present
-    register: start_result
-    environment:
-      HOMEBREW_NO_ENV_HINTS: "1"
+    - name: Start the black service when already started
+      community.general.homebrew_services:
+        name: black
+        state: present
+      register: start_result
+      environment:
+        HOMEBREW_NO_ENV_HINTS: "1"
 
-  - name: Check for idempotency
-    assert:
-      that:
-        - start_result.changed == 0
+    - name: Check for idempotency
+      assert:
+        that:
+          - start_result.changed == 0
 
-  - name: Restart the black service
-    community.general.homebrew_services:
-      name: black
-      state: restarted
-    register: restart_result
-    environment:
-      HOMEBREW_NO_ENV_HINTS: "1"
+    - name: Restart the black service
+      community.general.homebrew_services:
+        name: black
+        state: restarted
+      register: restart_result
+      environment:
+        HOMEBREW_NO_ENV_HINTS: "1"
 
-  - name: Check the black service is restarted
-    assert:
-      that:
-        - restart_result is success
+    - name: Check the black service is restarted
+      assert:
+        that:
+          - restart_result is success
 
-  - name: Stop the black service
-    community.general.homebrew_services:
-      name: black
-      state: present
-    register: stop_result
-    environment:
-      HOMEBREW_NO_ENV_HINTS: "1"
+    - name: Stop the black service
+      community.general.homebrew_services:
+        name: black
+        state: present
+      register: stop_result
+      environment:
+        HOMEBREW_NO_ENV_HINTS: "1"
 
-  - name: Check the black service is stopped
-    assert:
-      that:
-        - stop_result is success
+    - name: Check the black service is stopped
+      assert:
+        that:
+          - stop_result is success
diff --git a/tests/integration/targets/hwc_ecs_instance/tasks/main.yml b/tests/integration/targets/hwc_ecs_instance/tasks/main.yml
index dd70861522..cab20d76d4 100644
--- a/tests/integration/targets/hwc_ecs_instance/tasks/main.yml
+++ b/tests/integration/targets/hwc_ecs_instance/tasks/main.yml
@@ -62,7 +62,7 @@
     root_volume:
       volume_type: "SAS"
     state: absent
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: create a instance (check mode)
   hwc_ecs_instance:
     data_volumes:
@@ -90,7 +90,7 @@
   assert:
     that:
       - result is changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: create a instance
   hwc_ecs_instance:
     data_volumes:
@@ -117,7 +117,7 @@
   assert:
     that:
       result is changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: create a instance (idemponent)
   hwc_ecs_instance:
     data_volumes:
@@ -173,7 +173,7 @@
     that:
       - result is not failed
       - result is not changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: delete a instance (check mode)
   hwc_ecs_instance:
     data_volumes:
@@ -201,7 +201,7 @@
   assert:
     that:
       - result is changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: delete a instance
   hwc_ecs_instance:
     data_volumes:
@@ -228,7 +228,7 @@
   assert:
     that:
       result is changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: delete a instance (idemponent)
   hwc_ecs_instance:
     data_volumes:
@@ -283,7 +283,7 @@
     that:
       - result is not failed
       - result is not changed
-#---------------------------------------------------------
+# ---------------------------------------------------------
 # Post-test teardown
 - name: delete a disk
   hwc_evs_disk:
diff --git a/tests/integration/targets/hwc_evs_disk/tasks/main.yml b/tests/integration/targets/hwc_evs_disk/tasks/main.yml
index 63b7d03f95..49b1fef0d1 100644
--- a/tests/integration/targets/hwc_evs_disk/tasks/main.yml
+++ b/tests/integration/targets/hwc_evs_disk/tasks/main.yml
@@ -15,7 +15,7 @@
     volume_type: "SATA"
     size: 10
     state: absent
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: create a disk
   hwc_evs_disk:
     availability_zone: "cn-north-1a"
@@ -56,7 +56,7 @@
     that:
       - result is not failed
       - result is not changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: delete a disk (check mode)
   hwc_evs_disk:
     availability_zone: "cn-north-1a"
@@ -70,7 +70,7 @@
   assert:
     that:
       result is changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: delete a disk
   hwc_evs_disk:
     availability_zone: "cn-north-1a"
diff --git a/tests/integration/targets/hwc_network_vpc/tasks/main.yml b/tests/integration/targets/hwc_network_vpc/tasks/main.yml
index 3695fd2100..c53f285bc3 100644
--- a/tests/integration/targets/hwc_network_vpc/tasks/main.yml
+++ b/tests/integration/targets/hwc_network_vpc/tasks/main.yml
@@ -24,27 +24,27 @@
 # Pre-test setup
 - name: delete a vpc
   hwc_network_vpc:
-      identity_endpoint: "{{ identity_endpoint }}"
-      user: "{{ user }}"
-      password: "{{ password }}"
-      domain: "{{ domain }}"
-      project: "{{ project }}"
-      region: "{{ region }}"
-      name: "vpc_1"
-      cidr: "192.168.100.0/24"
-      state: absent
-#----------------------------------------------------------
+    identity_endpoint: "{{ identity_endpoint }}"
+    user: "{{ user }}"
+    password: "{{ password }}"
+    domain: "{{ domain }}"
+    project: "{{ project }}"
+    region: "{{ region }}"
+    name: "vpc_1"
+    cidr: "192.168.100.0/24"
+    state: absent
+# ----------------------------------------------------------
 - name: create a vpc
   hwc_network_vpc:
-      identity_endpoint: "{{ identity_endpoint }}"
-      user: "{{ user }}"
-      password: "{{ password }}"
-      domain: "{{ domain }}"
-      project: "{{ project }}"
-      region: "{{ region }}"
-      name: "vpc_1"
-      cidr: "192.168.100.0/24"
-      state: present
+    identity_endpoint: "{{ identity_endpoint }}"
+    user: "{{ user }}"
+    password: "{{ password }}"
+    domain: "{{ domain }}"
+    project: "{{ project }}"
+    region: "{{ region }}"
+    name: "vpc_1"
+    cidr: "192.168.100.0/24"
+    state: present
   register: result
 - name: assert changed is true
   assert:
@@ -53,33 +53,33 @@
 # ----------------------------------------------------------------------------
 - name: create a vpc that already exists
   hwc_network_vpc:
-      identity_endpoint: "{{ identity_endpoint }}"
-      user: "{{ user }}"
-      password: "{{ password }}"
-      domain: "{{ domain }}"
-      project: "{{ project }}"
-      region: "{{ region }}"
-      name: "vpc_1"
-      cidr: "192.168.100.0/24"
-      state: present
+    identity_endpoint: "{{ identity_endpoint }}"
+    user: "{{ user }}"
+    password: "{{ password }}"
+    domain: "{{ domain }}"
+    project: "{{ project }}"
+    region: "{{ region }}"
+    name: "vpc_1"
+    cidr: "192.168.100.0/24"
+    state: present
   register: result
 - name: assert changed is false
   assert:
     that:
       - result is not failed
       - result is not changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: delete a vpc
   hwc_network_vpc:
-      identity_endpoint: "{{ identity_endpoint }}"
-      user: "{{ user }}"
-      password: "{{ password }}"
-      domain: "{{ domain }}"
-      project: "{{ project }}"
-      region: "{{ region }}"
-      name: "vpc_1"
-      cidr: "192.168.100.0/24"
-      state: absent
+    identity_endpoint: "{{ identity_endpoint }}"
+    user: "{{ user }}"
+    password: "{{ password }}"
+    domain: "{{ domain }}"
+    project: "{{ project }}"
+    region: "{{ region }}"
+    name: "vpc_1"
+    cidr: "192.168.100.0/24"
+    state: absent
   register: result
 - name: assert changed is true
   assert:
@@ -88,15 +88,15 @@
 # ----------------------------------------------------------------------------
 - name: delete a vpc that does not exist
   hwc_network_vpc:
-      identity_endpoint: "{{ identity_endpoint }}"
-      user: "{{ user }}"
-      password: "{{ password }}"
-      domain: "{{ domain }}"
-      project: "{{ project }}"
-      region: "{{ region }}"
-      name: "vpc_1"
-      cidr: "192.168.100.0/24"
-      state: absent
+    identity_endpoint: "{{ identity_endpoint }}"
+    user: "{{ user }}"
+    password: "{{ password }}"
+    domain: "{{ domain }}"
+    project: "{{ project }}"
+    region: "{{ region }}"
+    name: "vpc_1"
+    cidr: "192.168.100.0/24"
+    state: absent
   register: result
 - name: assert changed is false
   assert:
diff --git a/tests/integration/targets/hwc_smn_topic/tasks/main.yml b/tests/integration/targets/hwc_smn_topic/tasks/main.yml
index 323904773f..c264f6b736 100644
--- a/tests/integration/targets/hwc_smn_topic/tasks/main.yml
+++ b/tests/integration/targets/hwc_smn_topic/tasks/main.yml
@@ -10,25 +10,25 @@
 
 - name: delete a smn topic
   hwc_smn_topic:
-      identity_endpoint: "{{ identity_endpoint }}"
-      user: "{{ user }}"
-      password: "{{ password }}"
-      domain: "{{ domain }}"
-      project: "{{ project }}"
-      region: "{{ region }}"
-      name: "ansible_smn_topic_test"
-      state: absent
-#----------------------------------------------------------
+    identity_endpoint: "{{ identity_endpoint }}"
+    user: "{{ user }}"
+    password: "{{ password }}"
+    domain: "{{ domain }}"
+    project: "{{ project }}"
+    region: "{{ region }}"
+    name: "ansible_smn_topic_test"
+    state: absent
+# ----------------------------------------------------------
 - name: create a smn topic
   hwc_smn_topic:
-      identity_endpoint: "{{ identity_endpoint }}"
-      user: "{{ user }}"
-      password: "{{ password }}"
-      domain: "{{ domain }}"
-      project: "{{ project }}"
-      region: "{{ region }}"
-      name: "ansible_smn_topic_test"
-      state: present
+    identity_endpoint: "{{ identity_endpoint }}"
+    user: "{{ user }}"
+    password: "{{ password }}"
+    domain: "{{ domain }}"
+    project: "{{ project }}"
+    region: "{{ region }}"
+    name: "ansible_smn_topic_test"
+    state: present
   register: result
 - name: assert changed is true
   assert:
@@ -37,31 +37,31 @@
 # ----------------------------------------------------------------------------
 - name: create a smn topic that already exists
   hwc_smn_topic:
-      identity_endpoint: "{{ identity_endpoint }}"
-      user: "{{ user }}"
-      password: "{{ password }}"
-      domain: "{{ domain }}"
-      project: "{{ project }}"
-      region: "{{ region }}"
-      name: "ansible_smn_topic_test"
-      state: present
+    identity_endpoint: "{{ identity_endpoint }}"
+    user: "{{ user }}"
+    password: "{{ password }}"
+    domain: "{{ domain }}"
+    project: "{{ project }}"
+    region: "{{ region }}"
+    name: "ansible_smn_topic_test"
+    state: present
   register: result
 - name: assert changed is false
   assert:
     that:
       - result is not failed
       - result is not changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: delete a smn topic
   hwc_smn_topic:
-      identity_endpoint: "{{ identity_endpoint }}"
-      user: "{{ user }}"
-      password: "{{ password }}"
-      domain: "{{ domain }}"
-      project: "{{ project }}"
-      region: "{{ region }}"
-      name: "ansible_smn_topic_test"
-      state: absent
+    identity_endpoint: "{{ identity_endpoint }}"
+    user: "{{ user }}"
+    password: "{{ password }}"
+    domain: "{{ domain }}"
+    project: "{{ project }}"
+    region: "{{ region }}"
+    name: "ansible_smn_topic_test"
+    state: absent
   register: result
 - name: assert changed is true
   assert:
@@ -70,14 +70,14 @@
 # ----------------------------------------------------------------------------
 - name: delete a smn topic that does not exist
   hwc_smn_topic:
-      identity_endpoint: "{{ identity_endpoint }}"
-      user: "{{ user }}"
-      password: "{{ password }}"
-      domain: "{{ domain }}"
-      project: "{{ project }}"
-      region: "{{ region }}"
-      name: "ansible_smn_topic_test"
-      state: absent
+    identity_endpoint: "{{ identity_endpoint }}"
+    user: "{{ user }}"
+    password: "{{ password }}"
+    domain: "{{ domain }}"
+    project: "{{ project }}"
+    region: "{{ region }}"
+    name: "ansible_smn_topic_test"
+    state: absent
   register: result
 - name: assert changed is false
   assert:
diff --git a/tests/integration/targets/hwc_vpc_eip/tasks/main.yml b/tests/integration/targets/hwc_vpc_eip/tasks/main.yml
index f830f951f8..b5cb8893fb 100644
--- a/tests/integration/targets/hwc_vpc_eip/tasks/main.yml
+++ b/tests/integration/targets/hwc_vpc_eip/tasks/main.yml
@@ -39,7 +39,7 @@
       size: 1
     port_id: "{{ port.id }}"
     state: absent
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: create a eip (check mode)
   hwc_vpc_eip:
     type: "5_bgp"
@@ -55,7 +55,7 @@
   assert:
     that:
       - result is changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: create a eip
   hwc_vpc_eip:
     type: "5_bgp"
@@ -70,7 +70,7 @@
   assert:
     that:
       result is changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: create a eip (idemponent)
   hwc_vpc_eip:
     type: "5_bgp"
@@ -102,7 +102,7 @@
     that:
       - result is not failed
       - result is not changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: delete a eip (check mode)
   hwc_vpc_eip:
     type: "5_bgp"
@@ -118,7 +118,7 @@
   assert:
     that:
       - result is changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: delete a eip
   hwc_vpc_eip:
     type: "5_bgp"
@@ -133,7 +133,7 @@
   assert:
     that:
       - result is changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: delete a eip (idemponent)
   hwc_vpc_eip:
     type: "5_bgp"
@@ -165,7 +165,7 @@
     that:
       - result is not failed
       - result is not changed
-#---------------------------------------------------------
+# ---------------------------------------------------------
 # Post-test teardown
 - name: delete a port
   hwc_vpc_port:
diff --git a/tests/integration/targets/hwc_vpc_peering_connect/tasks/main.yml b/tests/integration/targets/hwc_vpc_peering_connect/tasks/main.yml
index b8e02a5394..24d9565835 100644
--- a/tests/integration/targets/hwc_vpc_peering_connect/tasks/main.yml
+++ b/tests/integration/targets/hwc_vpc_peering_connect/tasks/main.yml
@@ -28,7 +28,7 @@
     peering_vpc:
       vpc_id: "{{ vpc2.id }}"
     state: absent
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: create a peering connect (check mode)
   hwc_vpc_peering_connect:
     local_vpc_id: "{{ vpc1.id }}"
@@ -43,7 +43,7 @@
     that:
       - not result.id
       - result.changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: create a peering connect
   hwc_vpc_peering_connect:
     local_vpc_id: "{{ vpc1.id }}"
@@ -56,7 +56,7 @@
   assert:
     that:
       result is changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: create a peering connect (idemponent)
   hwc_vpc_peering_connect:
     local_vpc_id: "{{ vpc1.id }}"
@@ -84,7 +84,7 @@
     that:
       - result is not failed
       - result is not changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: delete a peering connect (check mode)
   hwc_vpc_peering_connect:
     local_vpc_id: "{{ vpc1.id }}"
@@ -98,7 +98,7 @@
   assert:
     that:
       result is changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: delete a peering connect
   hwc_vpc_peering_connect:
     local_vpc_id: "{{ vpc1.id }}"
@@ -111,7 +111,7 @@
   assert:
     that:
       result is changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: delete a peering connect (idemponent)
   hwc_vpc_peering_connect:
     local_vpc_id: "{{ vpc1.id }}"
@@ -139,7 +139,7 @@
     that:
       - result is not failed
       - result is not changed
-#---------------------------------------------------------
+# ---------------------------------------------------------
 # Post-test teardown
 - name: delete a vpc
   hwc_network_vpc:
diff --git a/tests/integration/targets/hwc_vpc_port/tasks/main.yml b/tests/integration/targets/hwc_vpc_port/tasks/main.yml
index 93b17398f5..8ece8d0638 100644
--- a/tests/integration/targets/hwc_vpc_port/tasks/main.yml
+++ b/tests/integration/targets/hwc_vpc_port/tasks/main.yml
@@ -29,7 +29,7 @@
     subnet_id: "{{ subnet.id }}"
     ip_address: "192.168.100.33"
     state: absent
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: create a port (check mode)
   hwc_vpc_port:
     subnet_id: "{{ subnet.id }}"
@@ -41,7 +41,7 @@
   assert:
     that:
       - result is changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: create a port
   hwc_vpc_port:
     subnet_id: "{{ subnet.id }}"
@@ -52,7 +52,7 @@
   assert:
     that:
       - result is changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: create a port (idemponent)
   hwc_vpc_port:
     subnet_id: "{{ subnet.id }}"
@@ -75,7 +75,7 @@
     that:
       - result is not failed
       - result is not changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: delete a port (check mode)
   hwc_vpc_port:
     subnet_id: "{{ subnet.id }}"
@@ -87,7 +87,7 @@
   assert:
     that:
       - result is changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: delete a port
   hwc_vpc_port:
     subnet_id: "{{ subnet.id }}"
@@ -98,7 +98,7 @@
   assert:
     that:
       - result is changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: delete a port (idemponent)
   hwc_vpc_port:
     subnet_id: "{{ subnet.id }}"
@@ -122,7 +122,7 @@
     that:
       - result is not failed
       - result is not changed
-#---------------------------------------------------------
+# ---------------------------------------------------------
 # Post-test teardown
 - name: delete a subnet
   hwc_vpc_subnet:
diff --git a/tests/integration/targets/hwc_vpc_private_ip/tasks/main.yml b/tests/integration/targets/hwc_vpc_private_ip/tasks/main.yml
index 6accdb8550..d7f8422554 100644
--- a/tests/integration/targets/hwc_vpc_private_ip/tasks/main.yml
+++ b/tests/integration/targets/hwc_vpc_private_ip/tasks/main.yml
@@ -29,7 +29,7 @@
     subnet_id: "{{ subnet.id }}"
     ip_address: "192.168.100.33"
     state: absent
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: create a private ip (check mode)
   hwc_vpc_private_ip:
     subnet_id: "{{ subnet.id }}"
@@ -41,7 +41,7 @@
   assert:
     that:
       - result is changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: create a private ip
   hwc_vpc_private_ip:
     subnet_id: "{{ subnet.id }}"
@@ -52,7 +52,7 @@
   assert:
     that:
       - result is changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: create a private ip (idemponent)
   hwc_vpc_private_ip:
     subnet_id: "{{ subnet.id }}"
@@ -76,7 +76,7 @@
     that:
       - result is not failed
       - result is not changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: delete a private ip (check mode)
   hwc_vpc_private_ip:
     subnet_id: "{{ subnet.id }}"
@@ -88,7 +88,7 @@
   assert:
     that:
       - result is changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: delete a private ip
   hwc_vpc_private_ip:
     subnet_id: "{{ subnet.id }}"
@@ -99,7 +99,7 @@
   assert:
     that:
       - result is changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: delete a private ip (idemponent)
   hwc_vpc_private_ip:
     subnet_id: "{{ subnet.id }}"
@@ -123,7 +123,7 @@
     that:
       - result is not failed
       - result is not changed
-#---------------------------------------------------------
+# ---------------------------------------------------------
 # Post-test teardown
 - name: delete a subnet
   hwc_vpc_subnet:
diff --git a/tests/integration/targets/hwc_vpc_route/tasks/main.yml b/tests/integration/targets/hwc_vpc_route/tasks/main.yml
index 8e2e2ca825..d55f7f4d2a 100644
--- a/tests/integration/targets/hwc_vpc_route/tasks/main.yml
+++ b/tests/integration/targets/hwc_vpc_route/tasks/main.yml
@@ -37,7 +37,7 @@
     destination: "192.168.0.0/16"
     next_hop: "{{ connect.id }}"
     state: absent
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: create a route (check mode)
   hwc_vpc_route:
     vpc_id: "{{ vpc1.id }}"
@@ -49,7 +49,7 @@
     that:
       - not result.id
       - result.changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: create a route
   hwc_vpc_route:
     vpc_id: "{{ vpc1.id }}"
@@ -87,7 +87,7 @@
     that:
       - result is not failed
       - result is not changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: delete a route (check mode)
   hwc_vpc_route:
     vpc_id: "{{ vpc1.id }}"
@@ -95,7 +95,7 @@
     next_hop: "{{ connect.id }}"
     state: absent
   check_mode: true
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: delete a route
   hwc_vpc_route:
     vpc_id: "{{ vpc1.id }}"
@@ -107,7 +107,7 @@
   assert:
     that:
       result is changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: delete a (idemponent)
   hwc_vpc_route:
     vpc_id: "{{ vpc1.id }}"
@@ -133,7 +133,7 @@
     that:
       - result is not failed
       - result is not changed
-#---------------------------------------------------------
+# ---------------------------------------------------------
 # Post-test teardown
 - name: delete a peering connect
   hwc_vpc_peering_connect:
diff --git a/tests/integration/targets/hwc_vpc_security_group/tasks/main.yml b/tests/integration/targets/hwc_vpc_security_group/tasks/main.yml
index b6ee25e25b..e44d2a92a5 100644
--- a/tests/integration/targets/hwc_vpc_security_group/tasks/main.yml
+++ b/tests/integration/targets/hwc_vpc_security_group/tasks/main.yml
@@ -13,7 +13,7 @@
   hwc_vpc_security_group:
     name: "ansible_network_security_group_test"
     state: absent
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: create a security group (check mode)
   hwc_vpc_security_group:
     name: "ansible_network_security_group_test"
@@ -25,7 +25,7 @@
     that:
       - not result.id
       - result.changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: create a security group
   hwc_vpc_security_group:
     name: "ansible_network_security_group_test"
@@ -35,7 +35,7 @@
   assert:
     that:
       result is changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: create a security group (idemponent)
   hwc_vpc_security_group:
     name: "ansible_network_security_group_test"
@@ -57,7 +57,7 @@
     that:
       - result is not failed
       - result is not changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: delete a security group (check mode)
   hwc_vpc_security_group:
     name: "ansible_network_security_group_test"
@@ -68,7 +68,7 @@
   assert:
     that:
       result is changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: delete a security group
   hwc_vpc_security_group:
     name: "ansible_network_security_group_test"
diff --git a/tests/integration/targets/hwc_vpc_security_group_rule/tasks/main.yml b/tests/integration/targets/hwc_vpc_security_group_rule/tasks/main.yml
index 4ce4bafdc4..815bfdb8d9 100644
--- a/tests/integration/targets/hwc_vpc_security_group_rule/tasks/main.yml
+++ b/tests/integration/targets/hwc_vpc_security_group_rule/tasks/main.yml
@@ -24,7 +24,7 @@
     port_range_min: 22
     remote_ip_prefix: "0.0.0.0/0"
     state: absent
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: create a security group rule (check mode)
   hwc_vpc_security_group_rule:
     direction: "ingress"
@@ -42,7 +42,7 @@
     that:
       - not result.id
       - result.changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: create a security group rule
   hwc_vpc_security_group_rule:
     direction: "ingress"
@@ -58,7 +58,7 @@
   assert:
     that:
       - result is changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: create a security group rule (idemponent)
   hwc_vpc_security_group_rule:
     direction: "ingress"
@@ -91,7 +91,7 @@
     that:
       - result is not failed
       - result is not changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: delete a security group rule (check mode)
   hwc_vpc_security_group_rule:
     direction: "ingress"
@@ -108,7 +108,7 @@
   assert:
     that:
       - result is changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: delete a security group rule
   hwc_vpc_security_group_rule:
     direction: "ingress"
@@ -124,7 +124,7 @@
   assert:
     that:
       - result is changed
-#----------------------------------------------------------
+# ----------------------------------------------------------
 - name: delete a security group rule (idemponent)
   hwc_vpc_security_group_rule:
     direction: "ingress"
@@ -157,7 +157,7 @@
     that:
       - result is not failed
       - result is not changed
-#---------------------------------------------------------
+# ---------------------------------------------------------
 # Post-test teardown
 - name: delete a security group
   hwc_vpc_security_group:
diff --git a/tests/integration/targets/hwc_vpc_subnet/tasks/main.yml b/tests/integration/targets/hwc_vpc_subnet/tasks/main.yml
index 522ffb6011..b53a9f8979 100644
--- a/tests/integration/targets/hwc_vpc_subnet/tasks/main.yml
+++ b/tests/integration/targets/hwc_vpc_subnet/tasks/main.yml
@@ -23,7 +23,7 @@
     name: "ansible_network_subnet_test"
     dhcp_enable: true
     state: absent
-#----------------------------------------------------------
+# ---------------------------------------------------------
 - name: create a subnet (check mode)
   hwc_vpc_subnet:
     vpc_id: "{{ vpc.id }}"
@@ -39,7 +39,7 @@
     that:
       - not result.id
       - result.changed
-#----------------------------------------------------------
+# ---------------------------------------------------------
 - name: create a subnet
   hwc_vpc_subnet:
     vpc_id: "{{ vpc.id }}"
@@ -53,7 +53,7 @@
   assert:
     that:
       result is changed
-#----------------------------------------------------------
+# ---------------------------------------------------------
 - name: create a subnet (idemponent)
   hwc_vpc_subnet:
     vpc_id: "{{ vpc.id }}"
@@ -83,7 +83,7 @@
     that:
       - result is not failed
       - result is not changed
-#----------------------------------------------------------
+# ---------------------------------------------------------
 - name: delete a subnet (check mode)
   hwc_vpc_subnet:
     vpc_id: "{{ vpc.id }}"
@@ -98,7 +98,7 @@
   assert:
     that:
       - result is changed
-#----------------------------------------------------------
+# ---------------------------------------------------------
 - name: delete a subnet
   hwc_vpc_subnet:
     vpc_id: "{{ vpc.id }}"
@@ -112,7 +112,7 @@
   assert:
     that:
       - result is changed
-#----------------------------------------------------------
+# ---------------------------------------------------------
 - name: delete a subnet (idemponent)
   hwc_vpc_subnet:
     vpc_id: "{{ vpc.id }}"
@@ -142,7 +142,7 @@
     that:
       - result is not failed
       - result is not changed
-#---------------------------------------------------------
+# --------------------------------------------------------
 # Post-test teardown
 - name: delete a vpc
   hwc_network_vpc:
diff --git a/tests/integration/targets/ini_file/tasks/tests/04-symlink.yml b/tests/integration/targets/ini_file/tasks/tests/04-symlink.yml
index 7e83a010d0..85b5174732 100644
--- a/tests/integration/targets/ini_file/tasks/tests/04-symlink.yml
+++ b/tests/integration/targets/ini_file/tasks/tests/04-symlink.yml
@@ -4,21 +4,21 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 - block: &prepare
-  - name: Create the final file
-    ansible.builtin.copy:
-      content: |
-        [main]
-        foo=BAR
-      dest: "{{ remote_tmp_dir }}/my_original_file.ini"
-  - name: Clean up symlink.ini
-    ansible.builtin.file:
-      path: "{{ remote_tmp_dir }}/symlink.ini"
-      state: absent
-  - name: Create a symbolic link
-    ansible.builtin.file:
-      src: my_original_file.ini
-      dest: "{{ remote_tmp_dir }}/symlink.ini"
-      state: link
+    - name: Create the final file
+      ansible.builtin.copy:
+        content: |
+          [main]
+          foo=BAR
+        dest: "{{ remote_tmp_dir }}/my_original_file.ini"
+    - name: Clean up symlink.ini
+      ansible.builtin.file:
+        path: "{{ remote_tmp_dir }}/symlink.ini"
+        state: absent
+    - name: Create a symbolic link
+      ansible.builtin.file:
+        src: my_original_file.ini
+        dest: "{{ remote_tmp_dir }}/symlink.ini"
+        state: link
 
 - name: Set the proxy key on the symlink which will be converted as a file
   community.general.ini_file:
diff --git a/tests/integration/targets/ini_file/tasks/tests/06-modify_inactive_option.yml b/tests/integration/targets/ini_file/tasks/tests/06-modify_inactive_option.yml
index 07da13fe9f..7debc9f1c1 100644
--- a/tests/integration/targets/ini_file/tasks/tests/06-modify_inactive_option.yml
+++ b/tests/integration/targets/ini_file/tasks/tests/06-modify_inactive_option.yml
@@ -68,7 +68,7 @@
 
 - name: test-modify_inactive_option 2 - read content from output file
   slurp:
-      src: "{{ output_file }}"
+    src: "{{ output_file }}"
   register: output_content
 
 - name: test-modify_inactive_option 2 - set expected content and get current ini file content
@@ -144,7 +144,7 @@
 
 - name: test-modify_inactive_option 4 - read content from output file
   slurp:
-      src: "{{ output_file }}"
+    src: "{{ output_file }}"
   register: output_content
 
 - name: test-modify_inactive_option 4 - set expected content and get current ini file content
diff --git a/tests/integration/targets/interfaces_file/tasks/main.yml b/tests/integration/targets/interfaces_file/tasks/main.yml
index 18af12f5a2..c93f818e2f 100644
--- a/tests/integration/targets/interfaces_file/tasks/main.yml
+++ b/tests/integration/targets/interfaces_file/tasks/main.yml
@@ -24,7 +24,7 @@
 
 - assert:
     that:
-    - ifile_1 is changed
+      - ifile_1 is changed
 
 - name: Change IP address to 1.2.3.5 again
   community.general.interfaces_file:
@@ -36,7 +36,7 @@
 
 - assert:
     that:
-    - ifile_2 is not changed
+      - ifile_2 is not changed
 
 - name: 3841 - copy interfaces file
   copy:
diff --git a/tests/integration/targets/iptables_state/tasks/tests/00-basic.yml b/tests/integration/targets/iptables_state/tasks/tests/00-basic.yml
index 7b366edcec..95f2ea7ad4 100644
--- a/tests/integration/targets/iptables_state/tasks/tests/00-basic.yml
+++ b/tests/integration/targets/iptables_state/tasks/tests/00-basic.yml
@@ -32,7 +32,6 @@
     quiet: true
 
 
-
 - name: "trigger error about missing param 'state'"
   iptables_state:
     path: foobar
@@ -47,7 +46,6 @@
     quiet: true
 
 
-
 - name: "trigger error about missing param 'path'"
   iptables_state:
     state: saved
@@ -62,7 +60,6 @@
     quiet: true
 
 
-
 - name: "trigger error about invalid value for param 'state'"
   iptables_state:
     path: foobar
@@ -99,7 +96,6 @@
     quiet: true
 
 
-
 - name: "save state (must report a change)"
   iptables_state:
     path: "{{ iptables_saved }}"
@@ -114,7 +110,6 @@
     quiet: true
 
 
-
 - name: "save state (idempotency, must NOT report a change)"
   iptables_state:
     path: "{{ iptables_saved }}"
@@ -129,7 +124,6 @@
     quiet: true
 
 
-
 - name: "save state (check_mode, must NOT report a change)"
   iptables_state:
     path: "{{ iptables_saved }}"
@@ -145,7 +139,6 @@
     quiet: true
 
 
-
 # We begin with 'state=restored' by restoring the current state on itself.
 # This at least ensures the file produced with state=saved is suitable for
 # state=restored.
@@ -176,7 +169,6 @@
       register: xtables_lock
 
 
-
 - name: "state=restored changed=false"
   block:
     - name: "restore state (must NOT report a change, warning about rollback & async)"
@@ -202,14 +194,12 @@
       register: xtables_lock
 
 
-
 - name: "change iptables state (iptables)"
   iptables:
     chain: OUTPUT
     jump: ACCEPT
 
 
-
 - name: "state=restored changed=true"
   block:
     - name: "restore state (check_mode, must report a change)"
@@ -236,7 +226,6 @@
       register: xtables_lock
 
 
-
 - name: "state=restored changed=true"
   block:
     - name: "restore state (must report a change, async, no warning)"
@@ -265,7 +254,6 @@
       register: xtables_lock
 
 
-
 - name: "state=restored changed=false"
   block:
     - name: "restore state (must NOT report a change, async, no warning)"
@@ -293,7 +281,6 @@
       register: xtables_lock
 
 
-
 - name: "state=restored changed=false"
   block:
     - name: "restore state (check_mode=yes, must NOT report a change, no warning)"
diff --git a/tests/integration/targets/iptables_state/tasks/tests/01-tables.yml b/tests/integration/targets/iptables_state/tasks/tests/01-tables.yml
index 8a9869c437..d4c3a550e8 100644
--- a/tests/integration/targets/iptables_state/tasks/tests/01-tables.yml
+++ b/tests/integration/targets/iptables_state/tasks/tests/01-tables.yml
@@ -28,7 +28,6 @@
     quiet: true
 
 
-
 - name: "get state (table nat)"
   iptables_state:
     table: nat
@@ -48,7 +47,6 @@
     quiet: true
 
 
-
 - name: "save state (table filter)"
   iptables_state:
     path: "{{ iptables_saved }}"
@@ -68,7 +66,6 @@
     quiet: true
 
 
-
 - name: "save state (table nat)"
   iptables_state:
     path: "{{ iptables_saved }}"
@@ -89,7 +86,6 @@
     quiet: true
 
 
-
 - name: "save state (any table)"
   iptables_state:
     path: "{{ iptables_saved }}"
@@ -109,7 +105,6 @@
     quiet: true
 
 
-
 - name: "restore state (table nat, must NOT report a change, no warning)"
   iptables_state:
     path: "{{ iptables_saved }}"
@@ -132,7 +127,6 @@
     quiet: true
 
 
-
 - name: "change NAT table (iptables)"
   iptables:
     table: nat
@@ -141,7 +135,6 @@
     state: present
 
 
-
 - name: "restore state (table nat, must report a change, no warning)"
   iptables_state:
     path: "{{ iptables_saved }}"
@@ -166,7 +159,6 @@
     quiet: true
 
 
-
 - name: "get raw and mangle tables states"
   iptables_state:
     path: "{{ iptables_saved }}"
@@ -179,7 +171,6 @@
   check_mode: true
 
 
-
 - name: "save state (any table)"
   iptables_state:
     path: "{{ iptables_saved }}"
@@ -200,7 +191,6 @@
     quiet: true
 
 
-
 - name: "save filter table into a test file"
   iptables_state:
     path: "{{ iptables_tests }}"
@@ -213,7 +203,6 @@
     line: "# *mangle"
 
 
-
 - name: "restore state (table filter, must NOT report a change, no warning)"
   iptables_state:
     path: "{{ iptables_tests }}"
@@ -242,7 +231,6 @@
     quiet: true
 
 
-
 - name: "restore state (any table, must NOT report a change, no warning)"
   iptables_state:
     path: "{{ iptables_tests }}"
@@ -270,7 +258,6 @@
     quiet: true
 
 
-
 - name: "restore state (table mangle, must fail, no warning)"
   iptables_state:
     path: "{{ iptables_tests }}"
diff --git a/tests/integration/targets/iptables_state/tasks/tests/10-rollback.yml b/tests/integration/targets/iptables_state/tasks/tests/10-rollback.yml
index 9a79d6390e..3f91de3c1d 100644
--- a/tests/integration/targets/iptables_state/tasks/tests/10-rollback.yml
+++ b/tests/integration/targets/iptables_state/tasks/tests/10-rollback.yml
@@ -12,7 +12,6 @@
       COMMIT
 
 
-
 - name: "restore state from the test file (check_mode, must report a change)"
   iptables_state:
     path: "{{ iptables_tests }}"
@@ -26,7 +25,6 @@
       - iptables_state is changed
 
 
-
 - name: "fail to restore state from the test file"
   block:
     - name: "restore state from the test file (bad policies, expected error -> rollback)"
@@ -59,7 +57,6 @@
       - iptables_state is failed
 
 
-
 - name: "fail to restore state from the test file (again)"
   block:
     - name: "try again, with a higher timeout (bad policies, same expected error)"
@@ -94,7 +91,6 @@
       - iptables_state is failed
 
 
-
 - name: "restore state from backup (must NOT report a change)"
   iptables_state:
     path: "{{ iptables_saved }}"
@@ -109,7 +105,6 @@
       - iptables_state is not changed
 
 
-
 - name: "restore state from backup (mangle, must NOT report a change)"
   iptables_state:
     path: "{{ iptables_saved }}"
@@ -125,7 +120,6 @@
       - iptables_state is not changed
 
 
-
 - name: "create a blocking ruleset with a REJECT rule"
   copy:
     dest: "{{ iptables_tests }}"
@@ -135,7 +129,6 @@
       COMMIT
 
 
-
 - name: "fail to restore state from the test file (again)"
   block:
     - name: "restore state from the test file (bad rules, expected error -> rollback)"
@@ -168,7 +161,6 @@
       - iptables_state is failed
 
 
-
 - name: "fail to restore state from the test file (again)"
   block:
     - name: "try again, with a higher timeout (bad rules, same expected error)"
diff --git a/tests/integration/targets/ipwcli_dns/tasks/main.yml b/tests/integration/targets/ipwcli_dns/tasks/main.yml
index 9cbb4edc2e..cb28d9f0f8 100644
--- a/tests/integration/targets/ipwcli_dns/tasks/main.yml
+++ b/tests/integration/targets/ipwcli_dns/tasks/main.yml
@@ -28,9 +28,9 @@
 - name: assert the new A record is added
   assert:
     that:
-    - result is not failed
-    - result is changed
-    - result.record == 'arecord example.{{ tld }} 127.0.0.1 -set ttl=100;container={{ container }}'
+      - result is not failed
+      - result is changed
+      - result.record == 'arecord example.{{ tld }} 127.0.0.1 -set ttl=100;container={{ container }}'
 
 - name: delete the A record
   ipwcli_dns:
@@ -47,9 +47,9 @@
 - name: assert the new A record is deleted
   assert:
     that:
-    - result is not failed
-    - result is changed
-    - result.record == 'arecord example.{{ tld }} 127.0.0.1 -set ttl=100;container={{ container }}'
+      - result is not failed
+      - result is changed
+      - result.record == 'arecord example.{{ tld }} 127.0.0.1 -set ttl=100;container={{ container }}'
 
 - name: delete not existing SRV record
   ipwcli_dns:
@@ -66,10 +66,10 @@
 - name: assert the new a record
   assert:
     that:
-    - result is not failed
-    - result is not changed
-    - result.record ==
-      'srvrecord _sip._tcp.test.example.{{ tld }} -set ttl=3600;container={{ container }};priority=10;weight=10;port=5060;target=example.{{ tld }}'
+      - result is not failed
+      - result is not changed
+      - result.record ==
+        'srvrecord _sip._tcp.test.example.{{ tld }} -set ttl=3600;container={{ container }};priority=10;weight=10;port=5060;target=example.{{ tld }}'
 
 - name: add a SRV record with weight > 65535 against RFC 2782
   ipwcli_dns:
@@ -88,9 +88,9 @@
 - name: assert the failure of the new SRV record
   assert:
     that:
-    - result is failed
-    - result is not changed
-    - "'Out of UINT16 range' in result.stderr"
+      - result is failed
+      - result is not changed
+      - "'Out of UINT16 range' in result.stderr"
 
 - name: add NAPTR record (check_mode)
   ipwcli_dns:
@@ -111,5 +111,5 @@
 - name: assert the NAPTR check_mode
   assert:
     that:
-    - result is not failed
-    - result is changed
+      - result is not failed
+      - result is changed
diff --git a/tests/integration/targets/iso_create/tasks/main.yml b/tests/integration/targets/iso_create/tasks/main.yml
index d53217bd38..00100b7d5b 100644
--- a/tests/integration/targets/iso_create/tasks/main.yml
+++ b/tests/integration/targets/iso_create/tasks/main.yml
@@ -44,8 +44,8 @@
 - debug: var=iso_file
 - assert:
     that:
-    - iso_result is changed
-    - iso_file.stat.exists == False
+      - iso_result is changed
+      - iso_file.stat.exists == False
 
 - name: Create iso file with a specified file
   iso_create:
@@ -63,8 +63,8 @@
 
 - assert:
     that:
-    - iso_result is changed
-    - iso_file.stat.exists == True
+      - iso_result is changed
+      - iso_file.stat.exists == True
 
 - name: Create iso file with a specified file and folder
   iso_create:
@@ -83,8 +83,8 @@
 
 - assert:
     that:
-    - iso_result is changed
-    - iso_file.stat.exists == True
+      - iso_result is changed
+      - iso_file.stat.exists == True
 
 - name: Create iso file with volume identification string
   iso_create:
@@ -102,8 +102,8 @@
 
 - assert:
     that:
-    - iso_result is changed
-    - iso_file.stat.exists == True
+      - iso_result is changed
+      - iso_file.stat.exists == True
 
 - name: Create iso file with Rock Ridge extension
   iso_create:
@@ -121,8 +121,8 @@
 
 - assert:
     that:
-    - iso_result is changed
-    - iso_file.stat.exists == True
+      - iso_result is changed
+      - iso_file.stat.exists == True
 
 - name: Create iso file with Joliet extension
   iso_create:
@@ -140,8 +140,8 @@
 
 - assert:
     that:
-    - iso_result is changed
-    - iso_file.stat.exists == True
+      - iso_result is changed
+      - iso_file.stat.exists == True
 
 - name: Create iso file with UDF enabled
   iso_create:
@@ -159,5 +159,5 @@
 
 - assert:
     that:
-    - iso_result is changed
-    - iso_file.stat.exists == True
+      - iso_result is changed
+      - iso_file.stat.exists == True
diff --git a/tests/integration/targets/iso_customize/tasks/iso_customize.yml b/tests/integration/targets/iso_customize/tasks/iso_customize.yml
index 11f274440b..30c6f31c16 100644
--- a/tests/integration/targets/iso_customize/tasks/iso_customize.yml
+++ b/tests/integration/targets/iso_customize/tasks/iso_customize.yml
@@ -34,7 +34,7 @@
 
 - assert:
     that:
-    - check_file.stat.exists == False
+      - check_file.stat.exists == False
 
 - name: Check the file /preseed/ubuntu.seed is added
   stat:
@@ -43,7 +43,7 @@
 
 - assert:
     that:
-    - check_file.stat.exists == True
+      - check_file.stat.exists == True
 
 - block:
     - name: Get the content of file test02.cfg
diff --git a/tests/integration/targets/iso_customize/tasks/iso_customize_add_files.yml b/tests/integration/targets/iso_customize/tasks/iso_customize_add_files.yml
index 210767707b..116b9b70ec 100644
--- a/tests/integration/targets/iso_customize/tasks/iso_customize_add_files.yml
+++ b/tests/integration/targets/iso_customize/tasks/iso_customize_add_files.yml
@@ -25,7 +25,7 @@
 
 - assert:
     that:
-    - check_file.stat.exists == True
+      - check_file.stat.exists == True
 
 - name: Umount ISO
   mount:
diff --git a/tests/integration/targets/iso_customize/tasks/iso_customize_delete_files.yml b/tests/integration/targets/iso_customize/tasks/iso_customize_delete_files.yml
index bceeeb53a9..d8660062a2 100644
--- a/tests/integration/targets/iso_customize/tasks/iso_customize_delete_files.yml
+++ b/tests/integration/targets/iso_customize/tasks/iso_customize_delete_files.yml
@@ -25,7 +25,7 @@
 
 - assert:
     that:
-    - check_file.stat.exists == False
+      - check_file.stat.exists == False
 
 - name: Umount ISO
   mount:
diff --git a/tests/integration/targets/iso_extract/tasks/prepare.yml b/tests/integration/targets/iso_extract/tasks/prepare.yml
index 57e10c0dbb..1eb4cfc3a3 100644
--- a/tests/integration/targets/iso_extract/tasks/prepare.yml
+++ b/tests/integration/targets/iso_extract/tasks/prepare.yml
@@ -17,5 +17,5 @@
 
 - name: copy the iso to the test dir
   copy:
-      src: test.iso
-      dest: '{{ output_test_dir }}'
+    src: test.iso
+    dest: '{{ output_test_dir }}'
diff --git a/tests/integration/targets/iso_extract/tasks/tests.yml b/tests/integration/targets/iso_extract/tasks/tests.yml
index 6919a7c2e3..8e37cda024 100644
--- a/tests/integration/targets/iso_extract/tasks/tests.yml
+++ b/tests/integration/targets/iso_extract/tasks/tests.yml
@@ -10,31 +10,31 @@
     image: '{{ output_test_dir }}/test.iso'
     dest: '{{ output_test_dir }}'
     files:
-    - 1.txt
-    - 2.txt
+      - 1.txt
+      - 2.txt
   register: iso_extract_test0
 
 - assert:
     that:
-    - iso_extract_test0 is changed
+      - iso_extract_test0 is changed
 
 - name: Extract the iso again
   iso_extract:
     image: '{{ output_test_dir }}/test.iso'
     dest: '{{ output_test_dir }}'
     files:
-    - 1.txt
-    - 2.txt
+      - 1.txt
+      - 2.txt
   register: iso_extract_test0_again
 
 - name: Test iso_extract_test0_again (normal mode)
   assert:
     that:
-    - iso_extract_test0_again is not changed
+      - iso_extract_test0_again is not changed
   when: not in_check_mode
 
 - name: Test iso_extract_test0_again (check-mode)
   assert:
     that:
-    - iso_extract_test0_again is changed
+      - iso_extract_test0_again is changed
   when: in_check_mode
diff --git a/tests/integration/targets/java_cert/tasks/main.yml b/tests/integration/targets/java_cert/tasks/main.yml
index f572f22ee2..d67b65474f 100644
--- a/tests/integration/targets/java_cert/tasks/main.yml
+++ b/tests/integration/targets/java_cert/tasks/main.yml
@@ -30,7 +30,7 @@
     - name: verify success
       ansible.builtin.assert:
         that:
-        - result_success is successful
+          - result_success is successful
 
     - name: import pkcs12 without alias params
       community.general.java_cert:
@@ -45,7 +45,7 @@
     - name: verify success
       ansible.builtin.assert:
         that:
-        - result_success_excl_aliases is successful
+          - result_success_excl_aliases is successful
 
     - name: import pkcs12 with wrong password
       community.general.java_cert:
@@ -63,7 +63,7 @@
     - name: verify fail with wrong import password
       ansible.builtin.assert:
         that:
-        - result_wrong_pass is failed
+          - result_wrong_pass is failed
 
     - name: test fail on mutually exclusive params
       community.general.java_cert:
@@ -80,7 +80,7 @@
     - name: verify failed exclusive params
       ansible.builtin.assert:
         that:
-        - result_excl_params is failed
+          - result_excl_params is failed
 
     - name: test fail on missing required params
       community.general.java_cert:
@@ -93,7 +93,7 @@
     - name: verify failed missing required params
       ansible.builtin.assert:
         that:
-        - result_missing_required_param is failed
+          - result_missing_required_param is failed
 
     - name: delete object based on cert_alias parameter
       community.general.java_cert:
@@ -107,7 +107,7 @@
     - name: verify object successfully deleted
       ansible.builtin.assert:
         that:
-        - result_alias_deleted is successful
+          - result_alias_deleted is successful
 
     - name: include extended test suite
       import_tasks: state_change.yml
diff --git a/tests/integration/targets/java_cert/tasks/state_change.yml b/tests/integration/targets/java_cert/tasks/state_change.yml
index f2898ddc2e..fe4d87f0b8 100644
--- a/tests/integration/targets/java_cert/tasks/state_change.yml
+++ b/tests/integration/targets/java_cert/tasks/state_change.yml
@@ -147,7 +147,7 @@
     that:
       - result_x509_changed is failed
 
-- name:  import initial test certificate from file path
+- name: Import initial test certificate from file path
   community.general.java_cert:
     cert_alias: test_cert
     cert_path: "{{ test_cert_path }}"
diff --git a/tests/integration/targets/jboss/meta/main.yml b/tests/integration/targets/jboss/meta/main.yml
index c2bf37df74..c1624c65fa 100644
--- a/tests/integration/targets/jboss/meta/main.yml
+++ b/tests/integration/targets/jboss/meta/main.yml
@@ -4,4 +4,4 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 dependencies:
-- setup_wildfly_server
+  - setup_wildfly_server
diff --git a/tests/integration/targets/jboss/tasks/jboss.yml b/tests/integration/targets/jboss/tasks/jboss.yml
index e05eff591d..c27854f1be 100644
--- a/tests/integration/targets/jboss/tasks/jboss.yml
+++ b/tests/integration/targets/jboss/tasks/jboss.yml
@@ -52,187 +52,187 @@
       register: result
 
   block:
-  - name: Create test files
-    <<: *task_parameters
-    get_url:
-      url: 'https://ansible-ci-files.s3.amazonaws.com/test/integration/targets/jboss/{{ war_file_1 }}'
-      dest: '{{ wf_homedir }}'
+    - name: Create test files
+      <<: *task_parameters
+      get_url:
+        url: 'https://ansible-ci-files.s3.amazonaws.com/test/integration/targets/jboss/{{ war_file_1 }}'
+        dest: '{{ wf_homedir }}'
 
-  ##################
-  # Start the tests:
+    ##################
+    # Start the tests:
 
-  # Test if state=present and not deployed, check_mode:
-  - name: jboss - deploy war in check_mode, the default deploy_path
-    <<: *task_parameters
-    jboss:
-      deployment: '{{ war_file_1 }}'
-      src: '{{ war_file_1_path }}'
-    check_mode: true
+    # Test if state=present and not deployed, check_mode:
+    - name: jboss - deploy war in check_mode, the default deploy_path
+      <<: *task_parameters
+      jboss:
+        deployment: '{{ war_file_1 }}'
+        src: '{{ war_file_1_path }}'
+      check_mode: true
 
-  - assert:
-      that:
-      - result is changed
+    - assert:
+        that:
+          - result is changed
 
-  # Check
-  - name: check that nothing changed after the previous step
-    <<: *task_parameters
-    file:
-      path: '{{ deploy_dir }}/{{ war_file_1 }}.deployed'
-    ignore_errors: true
+    # Check
+    - name: check that nothing changed after the previous step
+      <<: *task_parameters
+      file:
+        path: '{{ deploy_dir }}/{{ war_file_1 }}.deployed'
+      ignore_errors: true
 
-  - assert:
-      that:
-      - "'is absent' in result.msg"
+    - assert:
+        that:
+          - "'is absent' in result.msg"
 
-  # Test if state=present and not deployed, actual mode:
-  - name: jboss - deploy war
-    <<: *task_parameters
-    jboss:
-      deployment: helloworld-1.war
-      deploy_path: '{{ deploy_dir }}'
-      src: '{{ war_file_1_path }}'
+    # Test if state=present and not deployed, actual mode:
+    - name: jboss - deploy war
+      <<: *task_parameters
+      jboss:
+        deployment: helloworld-1.war
+        deploy_path: '{{ deploy_dir }}'
+        src: '{{ war_file_1_path }}'
 
-  - assert:
-      that:
-      - result is changed
+    - assert:
+        that:
+          - result is changed
 
-  # Check
-  - name: check that the file is deployed after the previous step
-    <<: *task_parameters
-    file:
-      path: '{{ deploy_dir }}/{{ war_file_1 }}.deployed'
+    # Check
+    - name: check that the file is deployed after the previous step
+      <<: *task_parameters
+      file:
+        path: '{{ deploy_dir }}/{{ war_file_1 }}.deployed'
 
-  - assert:
-      that:
-      - result.state == 'file'
+    - assert:
+        that:
+          - result.state == 'file'
 
-  # Test if state=present and deployed in check mode, try again:
-  - name: jboss - try again to deploy war in check_mode, war is deployed now
-    <<: *task_parameters
-    jboss:
-      deployment: '{{ war_file_1 }}'
-      src: '{{ war_file_1_path }}'
-      deploy_path: '{{ deploy_dir }}'
-    check_mode: true
+    # Test if state=present and deployed in check mode, try again:
+    - name: jboss - try again to deploy war in check_mode, war is deployed now
+      <<: *task_parameters
+      jboss:
+        deployment: '{{ war_file_1 }}'
+        src: '{{ war_file_1_path }}'
+        deploy_path: '{{ deploy_dir }}'
+      check_mode: true
 
-  - assert:
-      that:
-      - result is not changed
+    - assert:
+        that:
+          - result is not changed
 
-  # Test if state=present and deployed, try again:
-  - name: jboss - try again to deploy war in actual mode, war is deployed now
-    <<: *task_parameters
-    jboss:
-      deployment: '{{ war_file_1 }}'
-      src: '{{ war_file_1_path }}'
-      deploy_path: '{{ deploy_dir }}'
+    # Test if state=present and deployed, try again:
+    - name: jboss - try again to deploy war in actual mode, war is deployed now
+      <<: *task_parameters
+      jboss:
+        deployment: '{{ war_file_1 }}'
+        src: '{{ war_file_1_path }}'
+        deploy_path: '{{ deploy_dir }}'
 
-  - assert:
-      that:
-      - result is not changed
+    - assert:
+        that:
+          - result is not changed
 
-  # Check
-  - name: check that nothing changed after the previous step
-    <<: *task_parameters
-    file:
-      path: '{{ deploy_dir }}/{{ war_file_1 }}.deployed'
+    # Check
+    - name: check that nothing changed after the previous step
+      <<: *task_parameters
+      file:
+        path: '{{ deploy_dir }}/{{ war_file_1 }}.deployed'
 
-  - assert:
-      that:
-      - result.state == 'file'
+    - assert:
+        that:
+          - result.state == 'file'
 
-  # Test if state=absent and deployed:
-  - name: jboss - undeploy war in check_mode, war is deployed
-    <<: *task_parameters
-    jboss:
-      deployment: '{{ war_file_1 }}'
-      deploy_path: '{{ deploy_dir }}'
-      state: absent
-    check_mode: true
+    # Test if state=absent and deployed:
+    - name: jboss - undeploy war in check_mode, war is deployed
+      <<: *task_parameters
+      jboss:
+        deployment: '{{ war_file_1 }}'
+        deploy_path: '{{ deploy_dir }}'
+        state: absent
+      check_mode: true
 
-  - assert:
-      that:
-      - result is changed
+    - assert:
+        that:
+          - result is changed
 
-  - name: check that nothing actually changed after the previous step
-    <<: *task_parameters
-    file:
-      path: '{{ deploy_dir }}/{{ war_file_1 }}.deployed'
+    - name: check that nothing actually changed after the previous step
+      <<: *task_parameters
+      file:
+        path: '{{ deploy_dir }}/{{ war_file_1 }}.deployed'
 
-  - assert:
-      that:
-      - result.state == 'file'
+    - assert:
+        that:
+          - result.state == 'file'
 
-  # Test if state=absent and deployed:
-  - name: jboss - undeploy war in actual mode, war is deployed
-    <<: *task_parameters
-    jboss:
-      deployment: '{{ war_file_1 }}'
-      deploy_path: '{{ deploy_dir }}'
-      state: absent
+    # Test if state=absent and deployed:
+    - name: jboss - undeploy war in actual mode, war is deployed
+      <<: *task_parameters
+      jboss:
+        deployment: '{{ war_file_1 }}'
+        deploy_path: '{{ deploy_dir }}'
+        state: absent
 
-  - assert:
-      that:
-      - result is changed
+    - assert:
+        that:
+          - result is changed
 
-  - name: check that file is undeployed after the previous step
-    <<: *task_parameters
-    file:
-      path: '{{ deploy_dir }}/{{ war_file_1 }}.undeployed'
+    - name: check that file is undeployed after the previous step
+      <<: *task_parameters
+      file:
+        path: '{{ deploy_dir }}/{{ war_file_1 }}.undeployed'
 
-  - assert:
-      that:
-      - result.state == 'file'
+    - assert:
+        that:
+          - result.state == 'file'
 
-  # Test if state=absent and undeployed:
-  - name: jboss - undeploy war in check_mode, war is undeployed
-    <<: *task_parameters
-    jboss:
-      deployment: '{{ war_file_1 }}'
-      deploy_path: '{{ deploy_dir }}'
-      state: absent
-    check_mode: true
+    # Test if state=absent and undeployed:
+    - name: jboss - undeploy war in check_mode, war is undeployed
+      <<: *task_parameters
+      jboss:
+        deployment: '{{ war_file_1 }}'
+        deploy_path: '{{ deploy_dir }}'
+        state: absent
+      check_mode: true
 
-  - assert:
-      that:
-      - result is not changed
+    - assert:
+        that:
+          - result is not changed
 
-  # Test if state=absent and undeployed:
-  - name: jboss - undeploy war in actual_mode, war is undeployed
-    <<: *task_parameters
-    jboss:
-      deployment: '{{ war_file_1 }}'
-      deploy_path: '{{ deploy_dir }}'
-      state: absent
+    # Test if state=absent and undeployed:
+    - name: jboss - undeploy war in actual_mode, war is undeployed
+      <<: *task_parameters
+      jboss:
+        deployment: '{{ war_file_1 }}'
+        deploy_path: '{{ deploy_dir }}'
+        state: absent
 
-  - assert:
-      that:
-      - result is not changed
+    - assert:
+        that:
+          - result is not changed
 
-  # Test fake src:
-  - name: jboss - test fake src
-    <<: *task_parameters
-    jboss:
-      deployment: '{{ war_file_1 }}'
-      deploy_path: '{{ deploy_dir }}'
-      src: '{{ fake_src_path }}'
-      state: present
-    ignore_errors: true
+    # Test fake src:
+    - name: jboss - test fake src
+      <<: *task_parameters
+      jboss:
+        deployment: '{{ war_file_1 }}'
+        deploy_path: '{{ deploy_dir }}'
+        src: '{{ fake_src_path }}'
+        state: present
+      ignore_errors: true
 
-  - assert:
-      that:
-      - result is failed
-      - "'Source file {{ fake_src_path }} does not exist.' in result.msg"
+    - assert:
+        that:
+          - result is failed
+          - "'Source file {{ fake_src_path }} does not exist.' in result.msg"
 
-  # Test errors where state=present and src is not passed:
-  - name: jboss - must fail when state=present and src is not passed
-    <<: *task_parameters
-    jboss:
-      deployment: '{{ war_file_1 }}'
-      state: present
-    ignore_errors: true
+    # Test errors where state=present and src is not passed:
+    - name: jboss - must fail when state=present and src is not passed
+      <<: *task_parameters
+      jboss:
+        deployment: '{{ war_file_1 }}'
+        state: present
+      ignore_errors: true
 
-  - assert:
-      that:
-      - result is failed
-      - "'state is present but all of the following are missing: src' in result.msg"
+    - assert:
+        that:
+          - result is failed
+          - "'state is present but all of the following are missing: src' in result.msg"
diff --git a/tests/integration/targets/kdeconfig/tasks/main.yml b/tests/integration/targets/kdeconfig/tasks/main.yml
index 790bb378dc..f2656c5c98 100644
--- a/tests/integration/targets/kdeconfig/tasks/main.yml
+++ b/tests/integration/targets/kdeconfig/tasks/main.yml
@@ -17,7 +17,7 @@
   copy:
     dest: "{{ kwriteconf_fake }}"
     src: kwriteconf_fake
-    mode: 0755
+    mode: "0755"
 
 - name: Simple test
   kdeconfig:
@@ -182,7 +182,7 @@
     values:
       - group: test
         key: test1
-        bool_value: on
+        bool_value: true
     kwriteconfig_path: "{{ kwriteconf_fake }}"
   register: result_bool_idem
   ignore_errors: true
@@ -207,7 +207,7 @@
         value: test2
       - groups: [testx, testy]
         key: testz
-        bool_value: on
+        bool_value: true
     kwriteconfig_path: "{{ kwriteconf_fake }}"
   register: result_checkmode
   ignore_errors: true
@@ -236,7 +236,7 @@
         value: test2
       - groups: [testx, testy]
         key: testz
-        bool_value: on
+        bool_value: true
     kwriteconfig_path: "{{ kwriteconf_fake }}"
   register: result_checkmode_apply
   ignore_errors: true
@@ -260,7 +260,7 @@
         value: test2
       - groups: [testx, testy]
         key: testz
-        bool_value: on
+        bool_value: true
     kwriteconfig_path: "{{ kwriteconf_fake }}"
   register: result_checkmode2
   ignore_errors: true
diff --git a/tests/integration/targets/keycloak_authentication/tasks/main.yml b/tests/integration/targets/keycloak_authentication/tasks/main.yml
index fe41b72b8d..cfb193848c 100644
--- a/tests/integration/targets/keycloak_authentication/tasks/main.yml
+++ b/tests/integration/targets/keycloak_authentication/tasks/main.yml
@@ -29,7 +29,7 @@
   uri:
     url: "{{ url }}/admin/"
     status_code: 200
-    validate_certs: no
+    validate_certs: false
   register: result
   until: result.status == 200
   retries: 10
@@ -82,30 +82,30 @@
     description: "browser based authentication with otp"
     providerId: "basic-flow"
     authenticationExecutions:
-    - displayName: Cookie
-      providerId: auth-cookie
-      requirement: ALTERNATIVE
-    - displayName: Kerberos
-      providerId: auth-spnego
-      requirement: DISABLED
-    - displayName: Identity Provider Redirector
-      providerId: identity-provider-redirector
-      requirement: ALTERNATIVE
-    - displayName: My browser otp forms
-      requirement: ALTERNATIVE
-    - displayName: Username Password Form
-      flowAlias: My browser otp forms
-      providerId: auth-username-password-form
-      requirement: REQUIRED
-    - displayName: My browser otp Browser - Conditional OTP
-      flowAlias: My browser otp forms
-      requirement: REQUIRED
-      providerId: "auth-conditional-otp-form"
-      authenticationConfig:
-        alias: my-conditional-otp-config
-        config:
-          defaultOtpOutcome: "force"
-          noOtpRequiredForHeaderPattern: "{{ keycloak_no_otp_required_pattern_orinale }}"
+      - displayName: Cookie
+        providerId: auth-cookie
+        requirement: ALTERNATIVE
+      - displayName: Kerberos
+        providerId: auth-spnego
+        requirement: DISABLED
+      - displayName: Identity Provider Redirector
+        providerId: identity-provider-redirector
+        requirement: ALTERNATIVE
+      - displayName: My browser otp forms
+        requirement: ALTERNATIVE
+      - displayName: Username Password Form
+        flowAlias: My browser otp forms
+        providerId: auth-username-password-form
+        requirement: REQUIRED
+      - displayName: My browser otp Browser - Conditional OTP
+        flowAlias: My browser otp forms
+        requirement: REQUIRED
+        providerId: "auth-conditional-otp-form"
+        authenticationConfig:
+          alias: my-conditional-otp-config
+          config:
+            defaultOtpOutcome: "force"
+            noOtpRequiredForHeaderPattern: "{{ keycloak_no_otp_required_pattern_orinale }}"
     state: present
 
 - name: Modified auth flow with new config
@@ -119,30 +119,30 @@
     description: "browser based authentication with otp"
     providerId: "basic-flow"
     authenticationExecutions:
-    - displayName: Cookie
-      providerId: auth-cookie
-      requirement: ALTERNATIVE
-    - displayName: Kerberos
-      providerId: auth-spnego
-      requirement: DISABLED
-    - displayName: Identity Provider Redirector
-      providerId: identity-provider-redirector
-      requirement: ALTERNATIVE
-    - displayName: My browser otp forms
-      requirement: ALTERNATIVE
-    - displayName: Username Password Form
-      flowAlias: My browser otp forms
-      providerId: auth-username-password-form
-      requirement: REQUIRED
-    - displayName: My browser otp Browser - Conditional OTP
-      flowAlias: My browser otp forms
-      requirement: REQUIRED
-      providerId: "auth-conditional-otp-form"
-      authenticationConfig:
-        alias: my-conditional-otp-config
-        config:
-          defaultOtpOutcome: "force"
-          noOtpRequiredForHeaderPattern: "{{ keycloak_no_otp_required_pattern_modifed }}"
+      - displayName: Cookie
+        providerId: auth-cookie
+        requirement: ALTERNATIVE
+      - displayName: Kerberos
+        providerId: auth-spnego
+        requirement: DISABLED
+      - displayName: Identity Provider Redirector
+        providerId: identity-provider-redirector
+        requirement: ALTERNATIVE
+      - displayName: My browser otp forms
+        requirement: ALTERNATIVE
+      - displayName: Username Password Form
+        flowAlias: My browser otp forms
+        providerId: auth-username-password-form
+        requirement: REQUIRED
+      - displayName: My browser otp Browser - Conditional OTP
+        flowAlias: My browser otp forms
+        requirement: REQUIRED
+        providerId: "auth-conditional-otp-form"
+        authenticationConfig:
+          alias: my-conditional-otp-config
+          config:
+            defaultOtpOutcome: "force"
+            noOtpRequiredForHeaderPattern: "{{ keycloak_no_otp_required_pattern_modifed }}"
     state: present
   register: result
 
@@ -166,7 +166,7 @@
 - name: Assert `my-conditional-otp-config` exists only once
   ansible.builtin.assert:
     that:
-    - exported_realm.json | community.general.json_query('authenticatorConfig[?alias==`my-conditional-otp-config`]') | length == 1
+      - exported_realm.json | community.general.json_query('authenticatorConfig[?alias==`my-conditional-otp-config`]') | length == 1
 
 - name: Delete auth flow
   community.general.keycloak_authentication:
@@ -182,4 +182,4 @@
 - name: Remove container
   community.docker.docker_container:
     name: mykeycloak
-    state: absent
\ No newline at end of file
+    state: absent
diff --git a/tests/integration/targets/keycloak_authz_permission/tasks/main.yml b/tests/integration/targets/keycloak_authz_permission/tasks/main.yml
index 16cb6806f2..889e59c506 100644
--- a/tests/integration/targets/keycloak_authz_permission/tasks/main.yml
+++ b/tests/integration/targets/keycloak_authz_permission/tasks/main.yml
@@ -93,8 +93,8 @@
     name: "ScopePermission"
     description: "Scope permission"
     resources:
-    - "Default Resource"
-    - "Other Resource"
+      - "Default Resource"
+      - "Other Resource"
     permission_type: scope
     scopes:
       - "file:delete"
diff --git a/tests/integration/targets/keycloak_client/tasks/main.yml b/tests/integration/targets/keycloak_client/tasks/main.yml
index e1a7d2ebfb..e22544ddd4 100644
--- a/tests/integration/targets/keycloak_client/tasks/main.yml
+++ b/tests/integration/targets/keycloak_client/tasks/main.yml
@@ -6,7 +6,7 @@
   uri:
     url: "{{ url }}/admin/"
     status_code: 200
-    validate_certs: no
+    validate_certs: false
   register: result
   until: result.status == 200
   retries: 10
@@ -72,7 +72,7 @@
     redirect_uris: '{{redirect_uris1}}'
     attributes: '{{client_attributes1}}'
     protocol_mappers: '{{protocol_mappers1}}'
-    authorization_services_enabled: False
+    authorization_services_enabled: false
   check_mode: true
   register: check_client_when_present_and_same
 
@@ -94,8 +94,8 @@
     redirect_uris: '{{redirect_uris1}}'
     attributes: '{{client_attributes1}}'
     protocol_mappers: '{{protocol_mappers1}}'
-    authorization_services_enabled: False
-    service_accounts_enabled: True
+    authorization_services_enabled: false
+    service_accounts_enabled: true
   check_mode: true
   register: check_client_when_present_and_changed
 
diff --git a/tests/integration/targets/keycloak_client_rolescope/tasks/main.yml b/tests/integration/targets/keycloak_client_rolescope/tasks/main.yml
index 44a00b2deb..d4c60d3f2e 100644
--- a/tests/integration/targets/keycloak_client_rolescope/tasks/main.yml
+++ b/tests/integration/targets/keycloak_client_rolescope/tasks/main.yml
@@ -6,7 +6,7 @@
   uri:
     url: "{{ url }}/admin/"
     status_code: 200
-    validate_certs: no
+    validate_certs: false
   register: result
   until: result.status == 200
   retries: 10
@@ -40,8 +40,8 @@
     name: "{{ item }}"
     realm: "{{ realm }}"
   with_items:
-  - "{{ realm_role_admin }}"
-  - "{{ realm_role_user }}"
+    - "{{ realm_role_admin }}"
+    - "{{ realm_role_user }}"
 
 - name: Client private
   community.general.keycloak_client:
@@ -53,10 +53,10 @@
     client_id: "{{ client_name_private }}"
     state: present
     redirect_uris:
-    - "https://my-backend-api.c.org/"
-    fullScopeAllowed: True
+      - "https://my-backend-api.c.org/"
+    fullScopeAllowed: true
     attributes: '{{client_attributes1}}'
-    public_client: False
+    public_client: false
 
 - name: Create a Keycloak client role
   community.general.keycloak_role:
@@ -68,8 +68,8 @@
     realm: "{{ realm }}"
     client_id: "{{ client_name_private }}"
   with_items:
-  - "{{ client_role_admin }}"
-  - "{{ client_role_user }}"
+    - "{{ client_role_admin }}"
+    - "{{ client_role_user }}"
 
 - name: Client public
   community.general.keycloak_client:
@@ -80,10 +80,10 @@
     realm: "{{ realm }}"
     client_id: "{{ client_name_public }}"
     redirect_uris:
-    - "https://my-onepage-app-frontend.c.org/"
+      - "https://my-onepage-app-frontend.c.org/"
     attributes: '{{client_attributes1}}'
-    full_scope_allowed: False
-    public_client: True
+    full_scope_allowed: false
+    public_client: true
 
 
 - name: Map roles to public client
@@ -96,15 +96,15 @@
     client_id: "{{ client_name_public }}"
     client_scope_id: "{{ client_name_private }}"
     role_names:
-    - "{{ client_role_admin }}"
-    - "{{ client_role_user }}"
+      - "{{ client_role_admin }}"
+      - "{{ client_role_user }}"
   register: result
 
 - name: Assert mapping created
   assert:
     that:
-    - result is changed
-    - result.end_state | length == 2
+      - result is changed
+      - result.end_state | length == 2
 
 - name: remap role user to public client
   community.general.keycloak_client_rolescope:
@@ -116,14 +116,14 @@
     client_id: "{{ client_name_public }}"
     client_scope_id: "{{ client_name_private }}"
     role_names:
-    - "{{ client_role_user }}"
+      - "{{ client_role_user }}"
   register: result
 
 - name: Assert mapping created
   assert:
     that:
-    - result is not changed
-    - result.end_state | length == 2
+      - result is not changed
+      - result.end_state | length == 2
 
 - name: Remove Map role admin to public client
   community.general.keycloak_client_rolescope:
@@ -135,16 +135,16 @@
     client_id: "{{ client_name_public }}"
     client_scope_id: "{{ client_name_private }}"
     role_names:
-    - "{{ client_role_admin }}"
+      - "{{ client_role_admin }}"
     state: absent
   register: result
 
 - name: Assert mapping deleted
   assert:
     that:
-    - result is changed
-    - result.end_state | length == 1
-    - result.end_state[0].name == client_role_user
+      - result is changed
+      - result.end_state | length == 1
+      - result.end_state[0].name == client_role_user
 
 - name: Map missing roles to public client
   community.general.keycloak_client_rolescope:
@@ -156,15 +156,15 @@
     client_id: "{{ client_name_public }}"
     client_scope_id: "{{ client_name_private }}"
     role_names:
-    - "{{ client_role_admin }}"
-    - "{{ client_role_not_exists }}"
+      - "{{ client_role_admin }}"
+      - "{{ client_role_not_exists }}"
   ignore_errors: true
   register: result
 
 - name: Assert failed mapping missing role
   assert:
     that:
-    - result is failed
+      - result is failed
 
 - name: Map roles duplicate
   community.general.keycloak_client_rolescope:
@@ -176,15 +176,15 @@
     client_id: "{{ client_name_public }}"
     client_scope_id: "{{ client_name_private }}"
     role_names:
-    - "{{ client_role_admin }}"
-    - "{{ client_role_admin }}"
+      - "{{ client_role_admin }}"
+      - "{{ client_role_admin }}"
   register: result
 
 - name: Assert result
   assert:
     that:
-    - result is changed
-    - result.end_state | length == 2
+      - result is changed
+      - result.end_state | length == 2
 
 - name: Map roles to private client
   community.general.keycloak_client_rolescope:
@@ -195,14 +195,14 @@
     realm: "{{ realm }}"
     client_id: "{{ client_name_private }}"
     role_names:
-    - "{{ realm_role_admin }}"
+      - "{{ realm_role_admin }}"
   ignore_errors: true
   register: result
 
 - name: Assert failed mapping role to full scope client
   assert:
     that:
-    - result is failed
+      - result is failed
 
 - name: Map realm role to public client
   community.general.keycloak_client_rolescope:
@@ -213,14 +213,14 @@
     realm: "{{ realm }}"
     client_id: "{{ client_name_public }}"
     role_names:
-    - "{{ realm_role_admin }}"
+      - "{{ realm_role_admin }}"
   register: result
 
 - name: Assert result
   assert:
     that:
-    - result is changed
-    - result.end_state | length == 1
+      - result is changed
+      - result.end_state | length == 1
 
 - name: Map two realm roles to public client
   community.general.keycloak_client_rolescope:
@@ -231,15 +231,15 @@
     realm: "{{ realm }}"
     client_id: "{{ client_name_public }}"
     role_names:
-    - "{{ realm_role_admin }}"
-    - "{{ realm_role_user }}"
+      - "{{ realm_role_admin }}"
+      - "{{ realm_role_user }}"
   register: result
 
 - name: Assert result
   assert:
     that:
-    - result is changed
-    - result.end_state | length == 2
+      - result is changed
+      - result.end_state | length == 2
 
 - name: Unmap all realm roles to public client
   community.general.keycloak_client_rolescope:
@@ -250,16 +250,16 @@
     realm: "{{ realm }}"
     client_id: "{{ client_name_public }}"
     role_names:
-    - "{{ realm_role_admin }}"
-    - "{{ realm_role_user }}"
+      - "{{ realm_role_admin }}"
+      - "{{ realm_role_user }}"
     state: absent
   register: result
 
 - name: Assert result
   assert:
     that:
-    - result is changed
-    - result.end_state | length == 0
+      - result is changed
+      - result.end_state | length == 0
 
 - name: Map missing realm role to public client
   community.general.keycloak_client_rolescope:
@@ -270,14 +270,14 @@
     realm: "{{ realm }}"
     client_id: "{{ client_name_public }}"
     role_names:
-    - "{{ realm_role_not_exists }}"
+      - "{{ realm_role_not_exists }}"
   ignore_errors: true
   register: result
 
 - name: Assert failed mapping missing realm role
   assert:
     that:
-    - result is failed
+      - result is failed
 
 - name: Check-mode try to Map realm roles to public client
   community.general.keycloak_client_rolescope:
@@ -288,16 +288,16 @@
     realm: "{{ realm }}"
     client_id: "{{ client_name_public }}"
     role_names:
-    - "{{ realm_role_admin }}"
-    - "{{ realm_role_user }}"
+      - "{{ realm_role_admin }}"
+      - "{{ realm_role_user }}"
   check_mode: true
   register: result
 
 - name: Assert result
   assert:
     that:
-    - result is changed
-    - result.end_state | length == 2
+      - result is changed
+      - result.end_state | length == 2
 
 - name: Check-mode step two, check if change where applied
   community.general.keycloak_client_rolescope:
@@ -313,5 +313,5 @@
 - name: Assert result
   assert:
     that:
-    - result is not changed
-    - result.end_state | length == 0
\ No newline at end of file
+      - result is not changed
+      - result.end_state | length == 0
diff --git a/tests/integration/targets/keycloak_component_info/tasks/main.yml b/tests/integration/targets/keycloak_component_info/tasks/main.yml
index 888d9f470a..e84a1f751c 100644
--- a/tests/integration/targets/keycloak_component_info/tasks/main.yml
+++ b/tests/integration/targets/keycloak_component_info/tasks/main.yml
@@ -6,7 +6,7 @@
   uri:
     url: "{{ url }}/admin/"
     status_code: 200
-    validate_certs: no
+    validate_certs: false
   register: result
   until: result.status == 200
   retries: 10
@@ -45,8 +45,8 @@
 - name: Assert ldap is missing
   assert:
     that:
-    - result is not changed
-    - result.components | length == 0
+      - result is not changed
+      - result.components | length == 0
 
 - name: Create new user federation
   community.general.keycloak_user_federation:
@@ -103,9 +103,9 @@
 - name: Assert ldap exists
   assert:
     that:
-    - result is not changed
-    - result.components | length == 1
-    - result.components[0].name == federation
+      - result is not changed
+      - result.components | length == 1
+      - result.components[0].name == federation
 
 - name: Save ldap id
   set_fact:
@@ -124,8 +124,8 @@
 - name: Assert components exists
   assert:
     that:
-    - result is not changed
-    - result.components | length > 0
+      - result is not changed
+      - result.components | length > 0
 
 - name: Retrive ldap subcomponents filter by name
   community.general.keycloak_component_info:
@@ -141,9 +141,9 @@
 - name: Assert sub component with name "email" exists
   assert:
     that:
-    - result is not changed
-    - result.components | length == 1
-    - result.components[0].name == "email"
+      - result is not changed
+      - result.components | length == 1
+      - result.components[0].name == "email"
 
 - name: Retrive ldap subcomponents filter by type
   community.general.keycloak_component_info:
@@ -159,9 +159,9 @@
 - name: Assert ldap sub components filter by type
   assert:
     that:
-    - result is not changed
-    - result.components | length > 0
-    - result.components[0].providerType == "org.keycloak.storage.ldap.mappers.LDAPStorageMapper"
+      - result is not changed
+      - result.components | length > 0
+      - result.components[0].providerType == "org.keycloak.storage.ldap.mappers.LDAPStorageMapper"
 
 - name: Retrive key info when absent
   community.general.keycloak_component_info:
@@ -177,8 +177,8 @@
 - name: Assert key is missing
   assert:
     that:
-    - result is not changed
-    - result.components | length == 0
+      - result is not changed
+      - result.components | length == 0
 
 - name: Create custom realm key
   community.general.keycloak_realm_key:
@@ -211,8 +211,8 @@
 - name: Assert key exists
   assert:
     that:
-    - result is not changed
-    - result.components | length == 1
+      - result is not changed
+      - result.components | length == 1
 
 - name: Retrive all realm components
   community.general.keycloak_component_info:
@@ -226,8 +226,8 @@
 - name: Assert key exists
   assert:
     that:
-    - result is not changed
-    - result.components | length > 0
+      - result is not changed
+      - result.components | length > 0
 
 - name: Retrive all ldap in realm
   community.general.keycloak_component_info:
@@ -242,10 +242,10 @@
 - name: Assert key exists
   assert:
     that:
-    - result is not changed
-    - result.components | length == 1
-    - result.components[0].providerType == "org.keycloak.storage.UserStorageProvider"
-    - result.components[0].name == "myldap"
+      - result is not changed
+      - result.components | length == 1
+      - result.components[0].providerType == "org.keycloak.storage.UserStorageProvider"
+      - result.components[0].name == "myldap"
 
 - name: Retrive component by name only
   community.general.keycloak_component_info:
@@ -260,7 +260,7 @@
 - name: Assert key exists
   assert:
     that:
-    - result is not changed
-    - result.components | length == 1
-    - result.components[0].providerType == "org.keycloak.keys.KeyProvider"
-    - result.components[0].name == realm_key_name
+      - result is not changed
+      - result.components | length == 1
+      - result.components[0].providerType == "org.keycloak.keys.KeyProvider"
+      - result.components[0].name == realm_key_name
diff --git a/tests/integration/targets/keycloak_group/tasks/main.yml b/tests/integration/targets/keycloak_group/tasks/main.yml
index f807b0640d..df567d7db7 100644
--- a/tests/integration/targets/keycloak_group/tasks/main.yml
+++ b/tests/integration/targets/keycloak_group/tasks/main.yml
@@ -145,11 +145,11 @@
     realm: "{{ realm }}"
     name: my-new_group
     attributes:
-        attrib1: value1
-        attrib2: value2
-        attrib3:
-            - item1
-            - item2
+      attrib1: value1
+      attrib2: value2
+      attrib3:
+        - item1
+        - item2
   register: result
 
 - name: Assert that group was correctly created
diff --git a/tests/integration/targets/keycloak_user_rolemapping/tasks/main.yml b/tests/integration/targets/keycloak_user_rolemapping/tasks/main.yml
index 464fab5786..ff56371e58 100644
--- a/tests/integration/targets/keycloak_user_rolemapping/tasks/main.yml
+++ b/tests/integration/targets/keycloak_user_rolemapping/tasks/main.yml
@@ -37,7 +37,8 @@
 
 - name: Map a realm role to client service account
   vars:
-    - roles: [ {'name': '{{ role }}'} ]
+    - roles:
+        - name: '{{ role }}'
   community.general.keycloak_user_rolemapping:
     auth_keycloak_url: "{{ url }}"
     auth_realm: "{{ admin_realm }}"
@@ -57,7 +58,8 @@
 
 - name: Unmap a realm role from client service account
   vars:
-    - roles: [ {'name': '{{ role }}'} ]
+    - roles:
+        - name: '{{ role }}'
   community.general.keycloak_user_rolemapping:
     auth_keycloak_url: "{{ url }}"
     auth_realm: "{{ admin_realm }}"
@@ -101,7 +103,8 @@
 
 - name: Map a client role to client service account
   vars:
-    - roles: [ {'name': '{{ role }}'} ]
+    - roles:
+        - name: '{{ role }}'
   community.general.keycloak_user_rolemapping:
     auth_keycloak_url: "{{ url }}"
     auth_realm: "{{ admin_realm }}"
@@ -122,7 +125,8 @@
 
 - name: Unmap a client role from client service account
   vars:
-    - roles: [ {'name': '{{ role }}'} ]
+    - roles:
+        - name: '{{ role }}'
   community.general.keycloak_user_rolemapping:
     auth_keycloak_url: "{{ url }}"
     auth_realm: "{{ admin_realm }}"
diff --git a/tests/integration/targets/keycloak_userprofile/vars/main.yml b/tests/integration/targets/keycloak_userprofile/vars/main.yml
index 1f8ae6c823..b423a677c0 100644
--- a/tests/integration/targets/keycloak_userprofile/vars/main.yml
+++ b/tests/integration/targets/keycloak_userprofile/vars/main.yml
@@ -9,69 +9,69 @@ admin_user: admin
 admin_password: password
 realm: realm_userprofile_test
 attributes_default:
- - name: username
-   displayName: ${username}
-   validations:
-     length:
-       min: 3
-       max: 255
-     usernameProhibitedCharacters: {}
-     up_username_not_idn_homograph: {}
-   annotations: {}
-   permissions:
-     view:
-       - admin
-       - user
-     edit: []
-   multivalued: false
- - name: email
-   displayName: ${email}
-   validations:
-     email: {}
-     length:
-       max: 255
-   annotations: {}
-   required:
-     roles:
-       - user
-   permissions:
-     view:
-       - admin
-       - user
-     edit: []
-   multivalued: false
- - name: firstName
-   displayName: ${firstName}
-   validations:
-     length:
-       max: 255
-     personNameProhibitedCharacters: {}
-   annotations: {}
-   required:
-     roles:
-       - user
-   permissions:
-     view:
-       - admin
-       - user
-     edit: []
-   multivalued: false
- - name: lastName
-   displayName: ${lastName}
-   validations:
-     length:
-       max: 255
-     person_name_prohibited_characters: {}
-   annotations: {}
-   required:
-     roles:
-       - user
-   permissions:
-     view:
-       - admin
-       - user
-     edit: []
-   multivalued: false
+  - name: username
+    displayName: ${username}
+    validations:
+      length:
+        min: 3
+        max: 255
+      usernameProhibitedCharacters: {}
+      up_username_not_idn_homograph: {}
+    annotations: {}
+    permissions:
+      view:
+        - admin
+        - user
+      edit: []
+    multivalued: false
+  - name: email
+    displayName: ${email}
+    validations:
+      email: {}
+      length:
+        max: 255
+    annotations: {}
+    required:
+      roles:
+        - user
+    permissions:
+      view:
+        - admin
+        - user
+      edit: []
+    multivalued: false
+  - name: firstName
+    displayName: ${firstName}
+    validations:
+      length:
+        max: 255
+      personNameProhibitedCharacters: {}
+    annotations: {}
+    required:
+      roles:
+        - user
+    permissions:
+      view:
+        - admin
+        - user
+      edit: []
+    multivalued: false
+  - name: lastName
+    displayName: ${lastName}
+    validations:
+      length:
+        max: 255
+      person_name_prohibited_characters: {}
+    annotations: {}
+    required:
+      roles:
+        - user
+    permissions:
+      view:
+        - admin
+        - user
+      edit: []
+    multivalued: false
 attributes_additional:
   - name: additionalAttribute
     displayName: additionalAttribute
diff --git a/tests/integration/targets/keyring/tasks/main.yml b/tests/integration/targets/keyring/tasks/main.yml
index 3833018e80..2aa05fc0a6 100644
--- a/tests/integration/targets/keyring/tasks/main.yml
+++ b/tests/integration/targets/keyring/tasks/main.yml
@@ -5,7 +5,7 @@
 
 - name: Ensure required packages for headless keyring access are installed (RPM)
   ansible.builtin.package:
-      name: gnome-keyring
+    name: gnome-keyring
   become: true
   when: "'localhost' not in inventory_hostname"
 
diff --git a/tests/integration/targets/ldap_inc/tasks/tests/basic.yml b/tests/integration/targets/ldap_inc/tasks/tests/basic.yml
index 4165ece743..5eb1a535ff 100644
--- a/tests/integration/targets/ldap_inc/tasks/tests/basic.yml
+++ b/tests/integration/targets/ldap_inc/tasks/tests/basic.yml
@@ -21,10 +21,10 @@
 - name: assert that test increment by default
   assert:
     that:
-       - output is not failed
-       - output.incremented
-       - output.value == "1001"
-       - output.rfc4525
+      - output is not failed
+      - output.incremented
+      - output.value == "1001"
+      - output.rfc4525
 
 - name: Test defined increment
   ldap_inc:
@@ -39,10 +39,10 @@
 - name: assert that test increment by default
   assert:
     that:
-       - output is not failed
-       - output.incremented
-       - output.value == "1003"
-       - output.rfc4525
+      - output is not failed
+      - output.incremented
+      - output.value == "1003"
+      - output.rfc4525
 
 - name: Test defined increment by 0
   ldap_inc:
@@ -57,9 +57,9 @@
 - name: assert that test defined increment by 0
   assert:
     that:
-       - output is not failed
-       - output.incremented == false
-       - output.value == "1003"
+      - output is not failed
+      - output.incremented == false
+      - output.value == "1003"
 
 - name: Test defined negative increment
   ldap_inc:
@@ -74,10 +74,10 @@
 - name: assert that test defined negative increment
   assert:
     that:
-       - output is not failed
-       - output.incremented
-       - output.value == "1002"
-       - output.rfc4525
+      - output is not failed
+      - output.incremented
+      - output.value == "1002"
+      - output.rfc4525
 
 - name: Test forcing classic method instead of automatic detection
   ldap_inc:
@@ -93,7 +93,7 @@
 - name: assert that test defined negative increment
   assert:
     that:
-       - output is not failed
-       - output.incremented
-       - output.value == "1001"
-       - output.rfc4525 == False
+      - output is not failed
+      - output.incremented
+      - output.value == "1001"
+      - output.rfc4525 == False
diff --git a/tests/integration/targets/ldap_search/tasks/tests/auth.yml b/tests/integration/targets/ldap_search/tasks/tests/auth.yml
index a8c7a13ee9..912178c364 100644
--- a/tests/integration/targets/ldap_search/tasks/tests/auth.yml
+++ b/tests/integration/targets/ldap_search/tasks/tests/auth.yml
@@ -22,9 +22,9 @@
 - name: assert that test LDAP user can read its password
   assert:
     that:
-       - output is not failed
-       - output.results | length == 1
-       - output.results.0.userPassword is defined
+      - output is not failed
+      - output.results | length == 1
+      - output.results.0.userPassword is defined
 
 - name: Test simple search for cert authenticated user
   ldap_search:
@@ -42,6 +42,6 @@
 - name: assert that test LDAP user can read its password
   assert:
     that:
-       - output is not failed
-       - output.results | length == 1
-       - output.results.0.userPassword is defined
+      - output is not failed
+      - output.results | length == 1
+      - output.results.0.userPassword is defined
diff --git a/tests/integration/targets/ldap_search/tasks/tests/basic.yml b/tests/integration/targets/ldap_search/tasks/tests/basic.yml
index 11e5d6562c..5b98c61648 100644
--- a/tests/integration/targets/ldap_search/tasks/tests/basic.yml
+++ b/tests/integration/targets/ldap_search/tasks/tests/basic.yml
@@ -20,9 +20,9 @@
 - name: assert that test LDAP user can be found
   assert:
     that:
-       - output is not failed
-       - output.results | length == 1
-       - output.results.0.displayName == "LDAP Test"
+      - output is not failed
+      - output.results | length == 1
+      - output.results.0.displayName == "LDAP Test"
 
 - name: Test simple search for a user with no results
   ldap_search:
@@ -35,5 +35,5 @@
 - name: assert that the output is empty
   assert:
     that:
-       - output is not failed
-       - output.results | length == 0
+      - output is not failed
+      - output.results | length == 0
diff --git a/tests/integration/targets/ldap_search/tasks/tests/pages.yml b/tests/integration/targets/ldap_search/tasks/tests/pages.yml
index 32575854ba..e0742c5598 100644
--- a/tests/integration/targets/ldap_search/tasks/tests/pages.yml
+++ b/tests/integration/targets/ldap_search/tasks/tests/pages.yml
@@ -20,5 +20,5 @@
 - name: assert that the right number of results are returned
   assert:
     that:
-       - output is not failed
-       - output.results | length == 2
+      - output is not failed
+      - output.results | length == 2
diff --git a/tests/integration/targets/ldap_search/tasks/tests/schema.yml b/tests/integration/targets/ldap_search/tasks/tests/schema.yml
index 892eac3cb3..63dd3fdf68 100644
--- a/tests/integration/targets/ldap_search/tasks/tests/schema.yml
+++ b/tests/integration/targets/ldap_search/tasks/tests/schema.yml
@@ -20,6 +20,6 @@
 - name: Assert that the schema output is correct
   assert:
     that:
-       - output is not failed
-       - output.results | length >= 1
-       - "{{ 'displayName' in output.results.0.attrs }}"
+      - output is not failed
+      - output.results | length >= 1
+      - "{{ 'displayName' in output.results.0.attrs }}"
diff --git a/tests/integration/targets/lookup_cartesian/tasks/main.yml b/tests/integration/targets/lookup_cartesian/tasks/main.yml
index 5575f22ba6..3351537ffc 100644
--- a/tests/integration/targets/lookup_cartesian/tasks/main.yml
+++ b/tests/integration/targets/lookup_cartesian/tasks/main.yml
@@ -12,21 +12,21 @@
   debug: var=item
   register: product
   with_community.general.cartesian:
-  - - A
-    - B
-    - C
-  - - '1'
-    - '2'
-    - '3'
+    - - A
+      - B
+      - C
+    - - '1'
+      - '2'
+      - '3'
 - name: Verify cartesian lookup
   assert:
     that:
-    - product.results[0]['item'] == ["A", "1"]
-    - product.results[1]['item'] == ["A", "2"]
-    - product.results[2]['item'] == ["A", "3"]
-    - product.results[3]['item'] == ["B", "1"]
-    - product.results[4]['item'] == ["B", "2"]
-    - product.results[5]['item'] == ["B", "3"]
-    - product.results[6]['item'] == ["C", "1"]
-    - product.results[7]['item'] == ["C", "2"]
-    - product.results[8]['item'] == ["C", "3"]
+      - product.results[0]['item'] == ["A", "1"]
+      - product.results[1]['item'] == ["A", "2"]
+      - product.results[2]['item'] == ["A", "3"]
+      - product.results[3]['item'] == ["B", "1"]
+      - product.results[4]['item'] == ["B", "2"]
+      - product.results[5]['item'] == ["B", "3"]
+      - product.results[6]['item'] == ["C", "1"]
+      - product.results[7]['item'] == ["C", "2"]
+      - product.results[8]['item'] == ["C", "3"]
diff --git a/tests/integration/targets/lookup_etcd3/defaults/main.yml b/tests/integration/targets/lookup_etcd3/defaults/main.yml
index de726382ba..68751f3d64 100644
--- a/tests/integration/targets/lookup_etcd3/defaults/main.yml
+++ b/tests/integration/targets/lookup_etcd3/defaults/main.yml
@@ -3,5 +3,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  etcd3_prefix: '/keyprefix/'
-  etcd3_singlekey: '/singlekeypath'
+etcd3_prefix: '/keyprefix/'
+etcd3_singlekey: '/singlekeypath'
diff --git a/tests/integration/targets/lookup_etcd3/tasks/main.yml b/tests/integration/targets/lookup_etcd3/tasks/main.yml
index 47f1916c02..2e150452b2 100644
--- a/tests/integration/targets/lookup_etcd3/tasks/main.yml
+++ b/tests/integration/targets/lookup_etcd3/tasks/main.yml
@@ -15,9 +15,9 @@
     value: "bar{{ item }}"
     state: present
   loop:
-  - 1
-  - 2
-  - 3
+    - 1
+    - 2
+    - 3
 
 - name: put a single key/values in etcd
   etcd3:
diff --git a/tests/integration/targets/lookup_etcd3/tasks/tests.yml b/tests/integration/targets/lookup_etcd3/tasks/tests.yml
index 929c6f142a..132d2ce9ac 100644
--- a/tests/integration/targets/lookup_etcd3/tasks/tests.yml
+++ b/tests/integration/targets/lookup_etcd3/tasks/tests.yml
@@ -5,23 +5,23 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 - block:
-  - name: 'Fetch secrets using "etcd3" lookup'
-    set_fact:
-      etcdoutkey1: "{{ lookup('community.general.etcd3', etcd3_prefix, prefix=True) }}"
-      etcdoutkey2: "{{ lookup('community.general.etcd3', etcd3_singlekey) }}"
-      key_inexistent: "{{ lookup('community.general.etcd3', 'inexistent_key') }}"
+    - name: 'Fetch secrets using "etcd3" lookup'
+      set_fact:
+        etcdoutkey1: "{{ lookup('community.general.etcd3', etcd3_prefix, prefix=True) }}"
+        etcdoutkey2: "{{ lookup('community.general.etcd3', etcd3_singlekey) }}"
+        key_inexistent: "{{ lookup('community.general.etcd3', 'inexistent_key') }}"
 
-  - name: 'Check etcd values'
-    assert:
-      msg: 'unexpected etcd3 values'
-      that:
-      - etcdoutkey1 is sequence
-      - etcdoutkey1 | length() == 3
-      - etcdoutkey1[0].value == 'bar1'
-      - etcdoutkey1[1].value == 'bar2'
-      - etcdoutkey1[2].value == 'bar3'
-      - etcdoutkey2 is sequence
-      - etcdoutkey2 | length() == 2
-      - etcdoutkey2.value == 'foobar'
-      - key_inexistent is sequence
-      - key_inexistent | length() == 0
+    - name: 'Check etcd values'
+      assert:
+        msg: 'unexpected etcd3 values'
+        that:
+          - etcdoutkey1 is sequence
+          - etcdoutkey1 | length() == 3
+          - etcdoutkey1[0].value == 'bar1'
+          - etcdoutkey1[1].value == 'bar2'
+          - etcdoutkey1[2].value == 'bar3'
+          - etcdoutkey2 is sequence
+          - etcdoutkey2 | length() == 2
+          - etcdoutkey2.value == 'foobar'
+          - key_inexistent is sequence
+          - key_inexistent | length() == 0
diff --git a/tests/integration/targets/lookup_flattened/tasks/main.yml b/tests/integration/targets/lookup_flattened/tasks/main.yml
index 37af1327bf..b4d57eb176 100644
--- a/tests/integration/targets/lookup_flattened/tasks/main.yml
+++ b/tests/integration/targets/lookup_flattened/tasks/main.yml
@@ -11,14 +11,14 @@
 - name: test with_flattened
   set_fact: '{{ item }}=flattened'
   with_community.general.flattened:
-  - - a__
-  - - b__
-    - - c__
-      - d__
+    - - a__
+    - - b__
+      - - c__
+        - d__
 - name: verify with_flattened results
   assert:
     that:
-    - a__ == 'flattened'
-    - b__ == 'flattened'
-    - c__ == 'flattened'
-    - d__ == 'flattened'
+      - a__ == 'flattened'
+      - b__ == 'flattened'
+      - c__ == 'flattened'
+      - d__ == 'flattened'
diff --git a/tests/integration/targets/lookup_lmdb_kv/test.yml b/tests/integration/targets/lookup_lmdb_kv/test.yml
index 8a88bca456..4d2ea0d973 100644
--- a/tests/integration/targets/lookup_lmdb_kv/test.yml
+++ b/tests/integration/targets/lookup_lmdb_kv/test.yml
@@ -5,27 +5,27 @@
 
 - hosts: localhost
   tasks:
-  - debug:
-      msg: '{{ query("community.general.lmdb_kv", "nl", "be", "lu", db="jp.mdb") }}'
-  - debug:
-      var: item.1
-    loop: '{{ query("community.general.lmdb_kv", db="jp.mdb") }}'
-  - assert:
-      that:
-      - query('community.general.lmdb_kv', 'nl', 'be', 'lu', db='jp.mdb') == ['Netherlands', 'Belgium', 'Luxembourg']
-      - query('community.general.lmdb_kv', db='jp.mdb')|length == 5
-  - assert:
-      that:
-      - item.0 == 'nl'
-      - item.1 == 'Netherlands'
-    vars:
-      lmdb_kv_db: jp.mdb
-    with_community.general.lmdb_kv:
-    - n*
-  - assert:
-      that:
-      - item == 'Belgium'
-    vars:
-      lmdb_kv_db: jp.mdb
-    with_community.general.lmdb_kv:
-    - be
+    - debug:
+        msg: '{{ query("community.general.lmdb_kv", "nl", "be", "lu", db="jp.mdb") }}'
+    - debug:
+        var: item.1
+      loop: '{{ query("community.general.lmdb_kv", db="jp.mdb") }}'
+    - assert:
+        that:
+          - query('community.general.lmdb_kv', 'nl', 'be', 'lu', db='jp.mdb') == ['Netherlands', 'Belgium', 'Luxembourg']
+          - query('community.general.lmdb_kv', db='jp.mdb')|length == 5
+    - assert:
+        that:
+          - item.0 == 'nl'
+          - item.1 == 'Netherlands'
+      vars:
+        lmdb_kv_db: jp.mdb
+      with_community.general.lmdb_kv:
+        - n*
+    - assert:
+        that:
+          - item == 'Belgium'
+      vars:
+        lmdb_kv_db: jp.mdb
+      with_community.general.lmdb_kv:
+        - be
diff --git a/tests/integration/targets/lookup_passwordstore/tasks/package.yml b/tests/integration/targets/lookup_passwordstore/tasks/package.yml
index e5ccd5677d..43f44401e8 100644
--- a/tests/integration/targets/lookup_passwordstore/tasks/package.yml
+++ b/tests/integration/targets/lookup_passwordstore/tasks/package.yml
@@ -23,17 +23,17 @@
 
 - block:
   # OpenSUSE Leap>=15.0 don't include password-store in main repo
-  - name: SUSE | Add security:privacy repo
-    template:
-      src: security-privacy.repo.j2
-      dest: /etc/zypp/repos.d/security:privacy.repo
+    - name: SUSE | Add security:privacy repo
+      template:
+        src: security-privacy.repo.j2
+        dest: /etc/zypp/repos.d/security:privacy.repo
 
-  - name: SUSE | Install package
-    package:
-      name: password-store
-      state: present
-      update_cache: true
-      disable_gpg_check: true
+    - name: SUSE | Install package
+      package:
+        name: password-store
+        state: present
+        update_cache: true
+        disable_gpg_check: true
   when: ansible_facts.pkg_mgr in ['zypper', 'community.general.zypper']
 
 # See https://github.com/gopasspw/gopass/issues/1849#issuecomment-802789285
@@ -41,20 +41,20 @@
   when: ansible_facts.os_family == 'Debian'
   become: true
   block:
-  - name: Fetch gopass repo keyring
-    ansible.builtin.get_url:
-      url: https://packages.gopass.pw/repos/gopass/gopass-archive-keyring.gpg
-      dest: /usr/share/keyrings/gopass-archive-keyring.gpg
-  - name: Add gopass repo
-    ansible.builtin.apt_repository:
-      repo: "deb [arch=amd64,arm64,armhf \
-        signed-by=/usr/share/keyrings/gopass-archive-keyring.gpg] \
-        https://packages.gopass.pw/repos/gopass stable main"
-      state: present
-  - name: Update apt-cache and install gopass package
-    ansible.builtin.apt:
-      name: gopass
-      update_cache: true
+    - name: Fetch gopass repo keyring
+      ansible.builtin.get_url:
+        url: https://packages.gopass.pw/repos/gopass/gopass-archive-keyring.gpg
+        dest: /usr/share/keyrings/gopass-archive-keyring.gpg
+    - name: Add gopass repo
+      ansible.builtin.apt_repository:
+        repo: "deb [arch=amd64,arm64,armhf \
+          signed-by=/usr/share/keyrings/gopass-archive-keyring.gpg] \
+          https://packages.gopass.pw/repos/gopass stable main"
+        state: present
+    - name: Update apt-cache and install gopass package
+      ansible.builtin.apt:
+        name: gopass
+        update_cache: true
 
 - name: Install on macOS
   when: ansible_facts.distribution == 'MacOSX'
diff --git a/tests/integration/targets/lookup_passwordstore/tasks/password_tests.yml b/tests/integration/targets/lookup_passwordstore/tasks/password_tests.yml
index a94529e460..e3a8b4e4b7 100644
--- a/tests/integration/targets/lookup_passwordstore/tasks/password_tests.yml
+++ b/tests/integration/targets/lookup_passwordstore/tasks/password_tests.yml
@@ -3,128 +3,128 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Create a password ({{ backend }})
-    set_fact:
-      newpass: "{{ lookup('community.general.passwordstore', 'test-pass', length=8, create=true, backend=backend) }}"
+- name: Create a password ({{ backend }})
+  set_fact:
+    newpass: "{{ lookup('community.general.passwordstore', 'test-pass', length=8, create=true, backend=backend) }}"
 
-  - name: Fetch password from an existing file ({{ backend }})
-    set_fact:
-      readpass: "{{ lookup('community.general.passwordstore', 'test-pass', backend=backend) }}"
+- name: Fetch password from an existing file ({{ backend }})
+  set_fact:
+    readpass: "{{ lookup('community.general.passwordstore', 'test-pass', backend=backend) }}"
 
-  - name: Verify password ({{ backend }})
-    assert:
-      that:
-        - readpass == newpass
+- name: Verify password ({{ backend }})
+  assert:
+    that:
+      - readpass == newpass
 
-  - name: Create a password with equal sign ({{ backend }})
-    set_fact:
-      newpass: "{{ lookup('community.general.passwordstore', 'test-pass-equal userpass=SimpleSample= create=true', backend=backend) }}"
+- name: Create a password with equal sign ({{ backend }})
+  set_fact:
+    newpass: "{{ lookup('community.general.passwordstore', 'test-pass-equal userpass=SimpleSample= create=true', backend=backend) }}"
 
-  - name: Fetch a password with equal sign ({{ backend }})
-    set_fact:
-      readpass: "{{ lookup('community.general.passwordstore', 'test-pass-equal', backend=backend) }}"
+- name: Fetch a password with equal sign ({{ backend }})
+  set_fact:
+    readpass: "{{ lookup('community.general.passwordstore', 'test-pass-equal', backend=backend) }}"
 
-  - name: Verify password ({{ backend }})
-    assert:
-      that:
-        - readpass == newpass
+- name: Verify password ({{ backend }})
+  assert:
+    that:
+      - readpass == newpass
 
-  - name: Create a password using missing=create ({{ backend }})
-    set_fact:
-      newpass: "{{ lookup('community.general.passwordstore', 'test-missing-create', missing='create', length=8, backend=backend) }}"
+- name: Create a password using missing=create ({{ backend }})
+  set_fact:
+    newpass: "{{ lookup('community.general.passwordstore', 'test-missing-create', missing='create', length=8, backend=backend) }}"
 
-  - name: Fetch password from an existing file ({{ backend }})
-    set_fact:
-      readpass: "{{ lookup('community.general.passwordstore', 'test-missing-create', backend=backend) }}"
+- name: Fetch password from an existing file ({{ backend }})
+  set_fact:
+    readpass: "{{ lookup('community.general.passwordstore', 'test-missing-create', backend=backend) }}"
 
-  - name: Verify password ({{ backend }})
-    assert:
-      that:
-        - readpass == newpass
+- name: Verify password ({{ backend }})
+  assert:
+    that:
+      - readpass == newpass
 
-  - name: Fetch password from existing file using missing=empty ({{ backend }})
-    set_fact:
-      readpass: "{{ lookup('community.general.passwordstore', 'test-missing-create', missing='empty', backend=backend) }}"
+- name: Fetch password from existing file using missing=empty ({{ backend }})
+  set_fact:
+    readpass: "{{ lookup('community.general.passwordstore', 'test-missing-create', missing='empty', backend=backend) }}"
 
-  - name: Verify password ({{ backend }})
-    assert:
-      that:
-        - readpass == newpass
+- name: Verify password ({{ backend }})
+  assert:
+    that:
+      - readpass == newpass
 
-  - name: Fetch password from non-existing file using missing=empty ({{ backend }})
-    set_fact:
-      readpass: "{{ query('community.general.passwordstore', 'test-missing-pass', missing='empty', backend=backend) }}"
+- name: Fetch password from non-existing file using missing=empty ({{ backend }})
+  set_fact:
+    readpass: "{{ query('community.general.passwordstore', 'test-missing-pass', missing='empty', backend=backend) }}"
 
-  - name: Verify password ({{ backend }})
-    assert:
-      that:
-        - readpass == [ none ]
+- name: Verify password ({{ backend }})
+  assert:
+    that:
+      - readpass == [ none ]
 
-  - name: Create the YAML password ({{ backend }})
-    command: "{{ backend }} insert -m -f test-yaml-pass"
-    args:
-      stdin: |
-        testpassword
-        key: |
-          multi
-          line
+- name: Create the YAML password ({{ backend }})
+  command: "{{ backend }} insert -m -f test-yaml-pass"
+  args:
+    stdin: |
+      testpassword
+      key: |
+        multi
+        line
 
-  - name: Fetch a password with YAML subkey ({{ backend }})
-    set_fact:
-      readyamlpass: "{{ lookup('community.general.passwordstore', 'test-yaml-pass', subkey='key', backend=backend) }}"
+- name: Fetch a password with YAML subkey ({{ backend }})
+  set_fact:
+    readyamlpass: "{{ lookup('community.general.passwordstore', 'test-yaml-pass', subkey='key', backend=backend) }}"
 
-  - name: Read a yaml subkey ({{ backend }})
-    assert:
-      that:
-        - readyamlpass == 'multi\nline\n'
+- name: Read a yaml subkey ({{ backend }})
+  assert:
+    that:
+      - readyamlpass == 'multi\nline\n'
 
-  - name: Create a non-YAML multiline file ({{ backend }})
-    command: "{{ backend }} insert -m -f test-multiline-pass"
-    args:
-      stdin: |
-        testpassword
-        random additional line
+- name: Create a non-YAML multiline file ({{ backend }})
+  command: "{{ backend }} insert -m -f test-multiline-pass"
+  args:
+    stdin: |
+      testpassword
+      random additional line
 
-  - name: Fetch password from multiline file ({{ backend }})
-    set_fact:
-      readyamlpass: "{{ lookup('community.general.passwordstore', 'test-multiline-pass', backend=backend) }}"
+- name: Fetch password from multiline file ({{ backend }})
+  set_fact:
+    readyamlpass: "{{ lookup('community.general.passwordstore', 'test-multiline-pass', backend=backend) }}"
 
-  - name: Multiline pass only returns first line ({{ backend }})
-    assert:
-      that:
-        - readyamlpass == 'testpassword'
+- name: Multiline pass only returns first line ({{ backend }})
+  assert:
+    that:
+      - readyamlpass == 'testpassword'
 
-  - name: Fetch all from multiline file ({{ backend }})
-    set_fact:
-      readyamlpass: "{{ lookup('community.general.passwordstore', 'test-multiline-pass', returnall='yes', backend=backend) }}"
+- name: Fetch all from multiline file ({{ backend }})
+  set_fact:
+    readyamlpass: "{{ lookup('community.general.passwordstore', 'test-multiline-pass', returnall='yes', backend=backend) }}"
 
-  - name: Multiline pass returnall returns everything in the file ({{ backend }})
-    assert:
-      that:
-        - readyamlpass == 'testpassword\nrandom additional line\n'
+- name: Multiline pass returnall returns everything in the file ({{ backend }})
+  assert:
+    that:
+      - readyamlpass == 'testpassword\nrandom additional line\n'
 
-  - name: Create a password in a folder ({{ backend }})
-    set_fact:
-      newpass: "{{ lookup('community.general.passwordstore', 'folder/test-pass', length=8, create=true, backend=backend) }}"
+- name: Create a password in a folder ({{ backend }})
+  set_fact:
+    newpass: "{{ lookup('community.general.passwordstore', 'folder/test-pass', length=8, create=true, backend=backend) }}"
 
-  - name: Fetch password from folder ({{ backend }})
-    set_fact:
-      readpass: "{{ lookup('community.general.passwordstore', 'folder/test-pass', backend=backend) }}"
+- name: Fetch password from folder ({{ backend }})
+  set_fact:
+    readpass: "{{ lookup('community.general.passwordstore', 'folder/test-pass', backend=backend) }}"
 
-  - name: Verify password from folder ({{ backend }})
-    assert:
-      that:
-        - readpass == newpass
+- name: Verify password from folder ({{ backend }})
+  assert:
+    that:
+      - readpass == newpass
 
-  - name: Try to read folder as passname ({{ backend }})
-    set_fact:
-      newpass: "{{ lookup('community.general.passwordstore', 'folder', backend=backend) }}"
-    ignore_errors: true
-    register: eval_error
+- name: Try to read folder as passname ({{ backend }})
+  set_fact:
+    newpass: "{{ lookup('community.general.passwordstore', 'folder', backend=backend) }}"
+  ignore_errors: true
+  register: eval_error
 
-  - name: Make sure reading folder as passname failed ({{ backend }})
-    assert:
-      that:
-        - eval_error is failed
-        - '"passname folder not found" in eval_error.msg'
-    when: backend != "gopass"  # Remove this line once gopass backend can handle this
+- name: Make sure reading folder as passname failed ({{ backend }})
+  assert:
+    that:
+      - eval_error is failed
+      - '"passname folder not found" in eval_error.msg'
+  when: backend != "gopass"  # Remove this line once gopass backend can handle this
diff --git a/tests/integration/targets/lookup_passwordstore/tasks/tests.yml b/tests/integration/targets/lookup_passwordstore/tasks/tests.yml
index 65a578c962..3928087072 100644
--- a/tests/integration/targets/lookup_passwordstore/tasks/tests.yml
+++ b/tests/integration/targets/lookup_passwordstore/tasks/tests.yml
@@ -30,7 +30,7 @@
 
 - name: Store path of pass executable
   set_fact:
-     passpath: "{{ result.stdout }}"
+    passpath: "{{ result.stdout }}"
 
 - name: Move original pass into place if there was a leftover
   command:
@@ -49,7 +49,7 @@
 
 - name: Store path of gopass executable
   set_fact:
-     gopasspath: "{{ result.stdout }}"
+    gopasspath: "{{ result.stdout }}"
 
 - name: Move original gopass into place if there was a leftover
   command:
@@ -64,9 +64,9 @@
   command: "{{ item }} --version"
   register: versions
   loop:
-  - "{{ gpg2_bin }}"
-  - pass
-  - gopass
+    - "{{ gpg2_bin }}"
+    - pass
+    - gopass
 
 - name: Output versions of tools
   debug:
@@ -131,52 +131,52 @@
 
 - name: Test pass compatibility shim detection
   block:
-  - name: Move original pass out of the way
-    command:
-      argv:
-        - mv
-        - "{{ passpath }}"
-        - "{{ passpath }}.testorig"
-    args:
-      creates: "{{ passpath }}.testorig"
+    - name: Move original pass out of the way
+      command:
+        argv:
+          - mv
+          - "{{ passpath }}"
+          - "{{ passpath }}.testorig"
+      args:
+        creates: "{{ passpath }}.testorig"
 
-  - name: Create dummy pass script
-    ansible.builtin.copy:
-      content: |
-        #!/bin/sh
-        echo "shim_ok"
-      dest: "{{ passpath }}"
-      mode: '0755'
+    - name: Create dummy pass script
+      ansible.builtin.copy:
+        content: |
+          #!/bin/sh
+          echo "shim_ok"
+        dest: "{{ passpath }}"
+        mode: '0755'
 
-  - name: Try reading from non-existent passwordstore location with different pass utility
-    set_fact:
-      newpass: "{{ lookup('community.general.passwordstore', 'test-pass') }}"
-    environment:
-      PATH: "/tmp"
+    - name: Try reading from non-existent passwordstore location with different pass utility
+      set_fact:
+        newpass: "{{ lookup('community.general.passwordstore', 'test-pass') }}"
+      environment:
+        PATH: "/tmp"
 
-  - name: Verify password received from shim
-    assert:
-      that:
-        - newpass == "shim_ok"
+    - name: Verify password received from shim
+      assert:
+        that:
+          - newpass == "shim_ok"
 
-  - name: Try to read folder as passname with a different pass utility
-    set_fact:
-      newpass: "{{ lookup('community.general.passwordstore', 'folder') }}"
+    - name: Try to read folder as passname with a different pass utility
+      set_fact:
+        newpass: "{{ lookup('community.general.passwordstore', 'folder') }}"
 
-  - name: Verify password received from shim
-    assert:
-      that:
-        - newpass == "shim_ok"
+    - name: Verify password received from shim
+      assert:
+        that:
+          - newpass == "shim_ok"
 
   always:
-  - name: Move original pass back into place
-    command:
-      argv:
-        - mv
-        - "{{ passpath }}.testorig"
-        - "{{ passpath }}"
-    args:
-      removes: "{{ passpath }}.testorig"
+    - name: Move original pass back into place
+      command:
+        argv:
+          - mv
+          - "{{ passpath }}.testorig"
+          - "{{ passpath }}"
+      args:
+        removes: "{{ passpath }}.testorig"
 
 # This are in addition to the real gopass tests above
 # and verify plugin logic
@@ -184,56 +184,56 @@
   vars:
     passwordstore_backend: "gopass"
   block:
-  - name: Check if gopass executable exists
-    stat:
-      path: "{{ gopasspath }}"
-    register: gopass_check
+    - name: Check if gopass executable exists
+      stat:
+        path: "{{ gopasspath }}"
+      register: gopass_check
 
-  - name: Move original gopass out of the way
-    command:
-      argv:
-        - mv
-        - "{{ gopasspath }}"
-        - "{{ gopasspath }}.testorig"
-    args:
-      creates: "{{ gopasspath }}.testorig"
-    when: gopass_check.stat.exists == true
+    - name: Move original gopass out of the way
+      command:
+        argv:
+          - mv
+          - "{{ gopasspath }}"
+          - "{{ gopasspath }}.testorig"
+      args:
+        creates: "{{ gopasspath }}.testorig"
+      when: gopass_check.stat.exists == true
 
-  - name: Create mocked gopass script
-    ansible.builtin.copy:
-      content: |
-        #!/bin/sh
-        if [ "$GOPASS_NO_REMINDER" != "YES" ]; then
-          exit 1
-        fi
-        if [ "$1" = "--version" ]; then
-          exit 2
-        fi
-        echo "gopass_ok"
-      dest: "{{ gopasspath }}"
-      mode: '0755'
+    - name: Create mocked gopass script
+      ansible.builtin.copy:
+        content: |
+          #!/bin/sh
+          if [ "$GOPASS_NO_REMINDER" != "YES" ]; then
+            exit 1
+          fi
+          if [ "$1" = "--version" ]; then
+            exit 2
+          fi
+          echo "gopass_ok"
+        dest: "{{ gopasspath }}"
+        mode: '0755'
 
-  - name: Try to read folder as passname using gopass mock
-    set_fact:
-      newpass: "{{ lookup('community.general.passwordstore', 'folder') }}"
+    - name: Try to read folder as passname using gopass mock
+      set_fact:
+        newpass: "{{ lookup('community.general.passwordstore', 'folder') }}"
 
-  - name: Verify password received from gopass mock
-    assert:
-      that:
-        - newpass == "gopass_ok"
+    - name: Verify password received from gopass mock
+      assert:
+        that:
+          - newpass == "gopass_ok"
 
   always:
-  - name: Remove mocked gopass
-    ansible.builtin.file:
-      path: "{{ gopasspath }}"
-      state: absent
+    - name: Remove mocked gopass
+      ansible.builtin.file:
+        path: "{{ gopasspath }}"
+        state: absent
 
-  - name: Move original gopass back into place
-    command:
-      argv:
-        - mv
-        - "{{ gopasspath }}.testorig"
-        - "{{ gopasspath }}"
-    args:
-      removes: "{{ gopasspath }}.testorig"
-    when: gopass_check.stat.exists == true
+    - name: Move original gopass back into place
+      command:
+        argv:
+          - mv
+          - "{{ gopasspath }}.testorig"
+          - "{{ gopasspath }}"
+      args:
+        removes: "{{ gopasspath }}.testorig"
+      when: gopass_check.stat.exists == true
diff --git a/tests/integration/targets/lookup_random_pet/test.yml b/tests/integration/targets/lookup_random_pet/test.yml
index c61461867a..a40ab2262c 100644
--- a/tests/integration/targets/lookup_random_pet/test.yml
+++ b/tests/integration/targets/lookup_random_pet/test.yml
@@ -6,25 +6,25 @@
 - hosts: localhost
   gather_facts: false
   tasks:
-  - name: Call plugin
-    set_fact:
-      result1: "{{ query('community.general.random_pet', words=3) }}"
-      result2: "{{ query('community.general.random_pet', length=3) }}"
-      result3: "{{ query('community.general.random_pet', prefix='kubernetes') }}"
-      result4: "{{ query('community.general.random_pet', separator='_') }}"
-      result5: "{{ query('community.general.random_pet', words=2, length=6, prefix='kubernetes', separator='_') }}"
+    - name: Call plugin
+      set_fact:
+        result1: "{{ query('community.general.random_pet', words=3) }}"
+        result2: "{{ query('community.general.random_pet', length=3) }}"
+        result3: "{{ query('community.general.random_pet', prefix='kubernetes') }}"
+        result4: "{{ query('community.general.random_pet', separator='_') }}"
+        result5: "{{ query('community.general.random_pet', words=2, length=6, prefix='kubernetes', separator='_') }}"
 
-  - name: Check results
-    assert:
-      that:
-        - result1 | length == 1
-        - result1[0].split('-') | length == 3
-        - result2 | length == 1
-        - result2[0].split('-')[0] | length <= 3
-        - result3 | length == 1
-        - result3[0].split('-')[0] == 'kubernetes'
-        - result4 | length == 1
-        - result4[0].split('_') | length == 2
-        - result5 | length == 1
-        - result5[0].split('_') | length == 3
-        - result5[0].split('_')[0] == 'kubernetes'
+    - name: Check results
+      assert:
+        that:
+          - result1 | length == 1
+          - result1[0].split('-') | length == 3
+          - result2 | length == 1
+          - result2[0].split('-')[0] | length <= 3
+          - result3 | length == 1
+          - result3[0].split('-')[0] == 'kubernetes'
+          - result4 | length == 1
+          - result4[0].split('_') | length == 2
+          - result5 | length == 1
+          - result5[0].split('_') | length == 3
+          - result5[0].split('_')[0] == 'kubernetes'
diff --git a/tests/integration/targets/lookup_random_string/test.yml b/tests/integration/targets/lookup_random_string/test.yml
index b1f6234102..b74116d04a 100644
--- a/tests/integration/targets/lookup_random_string/test.yml
+++ b/tests/integration/targets/lookup_random_string/test.yml
@@ -6,48 +6,48 @@
 - hosts: localhost
   gather_facts: false
   tasks:
-  - name: Call plugin
-    set_fact:
-      result1: "{{ query('community.general.random_string') }}"
-      result2: "{{ query('community.general.random_string', length=0) }}"
-      result3: "{{ query('community.general.random_string', length=10) }}"
-      result4: "{{ query('community.general.random_string', length=-1) }}"
-      result5: "{{ query('community.general.random_string', override_special='_', min_special=1) }}"
-      result6: "{{ query('community.general.random_string', upper=false, special=false) }}" # lower case only
-      result7: "{{ query('community.general.random_string', lower=false, special=false) }}" # upper case only
-      result8: "{{ query('community.general.random_string', lower=false, upper=false, special=false) }}" # number only
-      result9: "{{ query('community.general.random_string', lower=false, upper=false, special=false, min_numeric=1, length=1) }}" # single digit only
-      result10: "{{ query('community.general.random_string', numbers=false, upper=false, special=false, min_lower=1, length=1) }}" # single lowercase character only
-      result11: "{{ query('community.general.random_string', base64=true, length=8) }}"
-      result12: "{{ query('community.general.random_string', upper=false, numbers=false, special=false) }}" # all lower case
-      result13: "{{ query('community.general.random_string', override_all='0', length=2) }}"
+    - name: Call plugin
+      set_fact:
+        result1: "{{ query('community.general.random_string') }}"
+        result2: "{{ query('community.general.random_string', length=0) }}"
+        result3: "{{ query('community.general.random_string', length=10) }}"
+        result4: "{{ query('community.general.random_string', length=-1) }}"
+        result5: "{{ query('community.general.random_string', override_special='_', min_special=1) }}"
+        result6: "{{ query('community.general.random_string', upper=false, special=false) }}" # lower case only
+        result7: "{{ query('community.general.random_string', lower=false, special=false) }}" # upper case only
+        result8: "{{ query('community.general.random_string', lower=false, upper=false, special=false) }}" # number only
+        result9: "{{ query('community.general.random_string', lower=false, upper=false, special=false, min_numeric=1, length=1) }}" # single digit only
+        result10: "{{ query('community.general.random_string', numbers=false, upper=false, special=false, min_lower=1, length=1) }}" # single lowercase character only
+        result11: "{{ query('community.general.random_string', base64=true, length=8) }}"
+        result12: "{{ query('community.general.random_string', upper=false, numbers=false, special=false) }}" # all lower case
+        result13: "{{ query('community.general.random_string', override_all='0', length=2) }}"
 
-  - name: Raise error when impossible constraints are provided
-    set_fact:
-      impossible: "{{ query('community.general.random_string', upper=false, lower=false, special=false, numbers=false) }}"
-    ignore_errors: true
-    register: impossible_result
+    - name: Raise error when impossible constraints are provided
+      set_fact:
+        impossible: "{{ query('community.general.random_string', upper=false, lower=false, special=false, numbers=false) }}"
+      ignore_errors: true
+      register: impossible_result
 
-  - name: Check results
-    assert:
-      that:
-        - result1[0] | length == 8
-        - result2[0] | length == 0
-        - result3[0] | length == 10
-        - result4[0] | length == 0
-        - result5[0] | length == 8
-        - "'_' in result5[0]"
-        - result6[0] is lower
-        - result7[0] is upper
-        - result8[0] | regex_replace('^(\d+)$', '') == ''
-        - result9[0] | regex_replace('^(\d+)$', '') == ''
-        - result9[0] | length == 1
-        - result10[0] | length == 1
-        - result10[0] is lower
-        # if input string is not multiple of 3, base64 encoded string will be padded with =
-        - result11[0].endswith('=')
-        - result12[0] is lower
-        - result13[0] | length == 2
-        - result13[0] == '00'
-        - impossible_result is failed
-        - "'Available characters cannot' in impossible_result.msg"
+    - name: Check results
+      assert:
+        that:
+          - result1[0] | length == 8
+          - result2[0] | length == 0
+          - result3[0] | length == 10
+          - result4[0] | length == 0
+          - result5[0] | length == 8
+          - "'_' in result5[0]"
+          - result6[0] is lower
+          - result7[0] is upper
+          - result8[0] | regex_replace('^(\d+)$', '') == ''
+          - result9[0] | regex_replace('^(\d+)$', '') == ''
+          - result9[0] | length == 1
+          - result10[0] | length == 1
+          - result10[0] is lower
+          # if input string is not multiple of 3, base64 encoded string will be padded with =
+          - result11[0].endswith('=')
+          - result12[0] is lower
+          - result13[0] | length == 2
+          - result13[0] == '00'
+          - impossible_result is failed
+          - "'Available characters cannot' in impossible_result.msg"
diff --git a/tests/integration/targets/lookup_random_words/test.yml b/tests/integration/targets/lookup_random_words/test.yml
index e1b6fde13b..0c8fd8e110 100644
--- a/tests/integration/targets/lookup_random_words/test.yml
+++ b/tests/integration/targets/lookup_random_words/test.yml
@@ -6,28 +6,28 @@
 - hosts: localhost
   gather_facts: false
   tasks:
-  - name: Call random_words plugin
-    set_fact:
-      result1: "{{ query('community.general.random_words') }}"
-      result2: "{{ query('community.general.random_words', min_length=5, max_length=5) }}"
-      result3: "{{ query('community.general.random_words', delimiter='!') }}"
-      result4: "{{ query('community.general.random_words', numwords=3, delimiter='-', case='capitalize') }}"
-      result5: "{{ query('community.general.random_words', min_length=5, max_length=5, numwords=3, delimiter='') }}"
+    - name: Call random_words plugin
+      set_fact:
+        result1: "{{ query('community.general.random_words') }}"
+        result2: "{{ query('community.general.random_words', min_length=5, max_length=5) }}"
+        result3: "{{ query('community.general.random_words', delimiter='!') }}"
+        result4: "{{ query('community.general.random_words', numwords=3, delimiter='-', case='capitalize') }}"
+        result5: "{{ query('community.general.random_words', min_length=5, max_length=5, numwords=3, delimiter='') }}"
 
-  - name: Check results
-    assert:
-      that:
-        - result1 | length == 1
-        - result1[0] | length >= 35
-        - result2 | length == 1
-        - result2[0] | length == 35
-        - result3 | length == 1
-        - result3[0].count("!") == 5
-        - result4 | length == 1
-        - result4[0] | length >= 17
-        - result4[0] | length <= 29
-        - result4[0] | regex_findall("[A-Z]") | length == 3
-        # If one of the random words is 't-shirt', there are more than 2 dashes...
-        - result4[0].count("-") == 2 or "t-shirt" in result4[0].lower()
-        - result5 | length == 1
-        - result5[0] | length == 15
+    - name: Check results
+      assert:
+        that:
+          - result1 | length == 1
+          - result1[0] | length >= 35
+          - result2 | length == 1
+          - result2[0] | length == 35
+          - result3 | length == 1
+          - result3[0].count("!") == 5
+          - result4 | length == 1
+          - result4[0] | length >= 17
+          - result4[0] | length <= 29
+          - result4[0] | regex_findall("[A-Z]") | length == 3
+          # If one of the random words is 't-shirt', there are more than 2 dashes...
+          - result4[0].count("-") == 2 or "t-shirt" in result4[0].lower()
+          - result5 | length == 1
+          - result5[0] | length == 15
diff --git a/tests/integration/targets/lvg/tasks/test_active_create.yml b/tests/integration/targets/lvg/tasks/test_active_create.yml
index 7ac1ffedd7..2ad530bc53 100644
--- a/tests/integration/targets/lvg/tasks/test_active_create.yml
+++ b/tests/integration/targets/lvg/tasks/test_active_create.yml
@@ -64,8 +64,8 @@
       assert:
         that: "inactive_by_option_vg_autoact_status_result.stdout | length == 0"
   always:
-  - name: Cleanup vg_autoact_test
-    lvg:
-      state: absent
-      vg: vg_autoact_test
-      force: true
+    - name: Cleanup vg_autoact_test
+      lvg:
+        state: absent
+        vg: vg_autoact_test
+        force: true
diff --git a/tests/integration/targets/lvg/tasks/test_pvresize.yml b/tests/integration/targets/lvg/tasks/test_pvresize.yml
index bc8fdacc3c..90bea4e5d7 100644
--- a/tests/integration/targets/lvg/tasks/test_pvresize.yml
+++ b/tests/integration/targets/lvg/tasks/test_pvresize.yml
@@ -14,8 +14,8 @@
 
 - name: Assert the testvg size is 33554432B
   assert:
-   that:
-    - "'33554432B' == cmd_result.stdout"
+    that:
+      - "'33554432B' == cmd_result.stdout"
 
 - name: Increases size in file
   command: "dd if=/dev/zero bs=8MiB count=1 of={{ remote_tmp_dir }}/img1 conv=notrunc oflag=append"
@@ -25,14 +25,14 @@
 
 - name: "Reruns lvg with pvresize:no"
   lvg:
-   vg: testvg
-   pvs: "{{ loop_device1 }}"
-   pvresize: false
+    vg: testvg
+    pvs: "{{ loop_device1 }}"
+    pvresize: false
   register: cmd_result
 
 - assert:
     that:
-    - cmd_result is not changed
+      - cmd_result is not changed
 
 - name: Gets current vg size
   shell: vgs -v testvg -o pv_size --noheading --units b | xargs
@@ -40,21 +40,21 @@
 
 - name: Assert the testvg size is still 33554432B
   assert:
-   that:
-    - "'33554432B' == cmd_result.stdout"
+    that:
+      - "'33554432B' == cmd_result.stdout"
 
 - name: "Reruns lvg with pvresize:yes and check_mode:yes"
   lvg:
-   vg: testvg
-   pvs: "{{ loop_device1 }}"
-   pvresize: true
+    vg: testvg
+    pvs: "{{ loop_device1 }}"
+    pvresize: true
   check_mode: true
   register: cmd_result
 
 - name: Assert that the module returned the state was changed
   assert:
     that:
-    - cmd_result is changed
+      - cmd_result is changed
 
 - name: Gets current vg size
   shell: vgs -v testvg -o pv_size --noheading --units b | xargs
@@ -62,14 +62,14 @@
 
 - name: Assert the testvg size is still 33554432B
   assert:
-   that:
-    - "'33554432B' == cmd_result.stdout"
+    that:
+      - "'33554432B' == cmd_result.stdout"
 
 - name: "Reruns lvg with pvresize:yes"
   lvg:
-   vg: testvg
-   pvs: "{{ loop_device1 }}"
-   pvresize: true
+    vg: testvg
+    pvs: "{{ loop_device1 }}"
+    pvresize: true
 
 - name: Gets current vg size
   shell: vgs -v testvg -o pv_size --noheading --units b | xargs
@@ -77,5 +77,5 @@
 
 - name: Assert the testvg size is now 41943040B
   assert:
-   that:
-    - "'41943040B' == cmd_result.stdout"
+    that:
+      - "'41943040B' == cmd_result.stdout"
diff --git a/tests/integration/targets/mail/tasks/main.yml b/tests/integration/targets/mail/tasks/main.yml
index 333ad72ab1..3831a43643 100644
--- a/tests/integration/targets/mail/tasks/main.yml
+++ b/tests/integration/targets/mail/tasks/main.yml
@@ -15,96 +15,96 @@
     - ansible_python.version.major != 3 or ansible_python.version.minor < 12
   block:
 
-  # NOTE: If the system does not support smtpd-tls (python 2.6 and older) we do basic tests
-  - name: Attempt to install smtpd-tls
-    pip:
-      name: smtpd-tls
-      state: present
-    ignore_errors: true
-    register: smtpd_tls
+    # NOTE: If the system does not support smtpd-tls (python 2.6 and older) we do basic tests
+    - name: Attempt to install smtpd-tls
+      pip:
+        name: smtpd-tls
+        state: present
+      ignore_errors: true
+      register: smtpd_tls
 
-  - name: Install test smtpserver
-    copy:
-      src: '{{ item }}'
-      dest: '{{ remote_tmp_dir }}/{{ item }}'
-    loop:
-    - smtpserver.py
-    - smtpserver.crt
-    - smtpserver.key
+    - name: Install test smtpserver
+      copy:
+        src: '{{ item }}'
+        dest: '{{ remote_tmp_dir }}/{{ item }}'
+      loop:
+        - smtpserver.py
+        - smtpserver.crt
+        - smtpserver.key
 
-  # FIXME: Verify the mail after it was send would be nice
-  #        This would require either dumping the content, or registering async task output
-  - name: Start test smtpserver
-    shell: '{{ ansible_python.executable }} {{ remote_tmp_dir }}/smtpserver.py 10025:10465'
-    async: 45
-    poll: 0
-    register: smtpserver
+    # FIXME: Verify the mail after it was send would be nice
+    #        This would require either dumping the content, or registering async task output
+    - name: Start test smtpserver
+      shell: '{{ ansible_python.executable }} {{ remote_tmp_dir }}/smtpserver.py 10025:10465'
+      async: 45
+      poll: 0
+      register: smtpserver
 
-  - name: Send a basic test-mail
-    mail:
-      port: 10025
-      subject: Test mail 1 (smtp)
-      secure: never
+    - name: Send a basic test-mail
+      mail:
+        port: 10025
+        subject: Test mail 1 (smtp)
+        secure: never
 
-  - name: Send a test-mail with body and specific recipient
-    mail:
-      port: 10025
-      from: ansible@localhost
-      to: root@localhost
-      subject: Test mail 2 (smtp + body)
-      body: Test body 2
-      secure: never
+    - name: Send a test-mail with body and specific recipient
+      mail:
+        port: 10025
+        from: ansible@localhost
+        to: root@localhost
+        subject: Test mail 2 (smtp + body)
+        body: Test body 2
+        secure: never
 
-  - name: Send a test-mail with attachment
-    mail:
-      port: 10025
-      from: ansible@localhost
-      to: root@localhost
-      subject: Test mail 3 (smtp + body + attachment)
-      body: Test body 3
-      attach: /etc/group
-      secure: never
+    - name: Send a test-mail with attachment
+      mail:
+        port: 10025
+        from: ansible@localhost
+        to: root@localhost
+        subject: Test mail 3 (smtp + body + attachment)
+        body: Test body 3
+        attach: /etc/group
+        secure: never
 
-  # NOTE: This might fail if smtpd-tls is missing or python 2.7.8 or older is used
-  - name: Send a test-mail using starttls
-    mail:
-      port: 10025
-      from: ansible@localhost
-      to: root@localhost
-      subject: Test mail 4 (smtp + starttls + body + attachment)
-      body: Test body 4
-      attach: /etc/group
-      secure: starttls
-    ignore_errors: true
-    register: starttls_support
+    # NOTE: This might fail if smtpd-tls is missing or python 2.7.8 or older is used
+    - name: Send a test-mail using starttls
+      mail:
+        port: 10025
+        from: ansible@localhost
+        to: root@localhost
+        subject: Test mail 4 (smtp + starttls + body + attachment)
+        body: Test body 4
+        attach: /etc/group
+        secure: starttls
+      ignore_errors: true
+      register: starttls_support
 
-  # NOTE: This might fail if smtpd-tls is missing or python 2.7.8 or older is used
-  - name: Send a test-mail using TLS
-    mail:
-      port: 10465
-      from: ansible@localhost
-      to: root@localhost
-      subject: Test mail 5 (smtp + tls + body + attachment)
-      body: Test body 5
-      attach: /etc/group
-      secure: always
-    ignore_errors: true
-    register: tls_support
+    # NOTE: This might fail if smtpd-tls is missing or python 2.7.8 or older is used
+    - name: Send a test-mail using TLS
+      mail:
+        port: 10465
+        from: ansible@localhost
+        to: root@localhost
+        subject: Test mail 5 (smtp + tls + body + attachment)
+        body: Test body 5
+        attach: /etc/group
+        secure: always
+      ignore_errors: true
+      register: tls_support
 
-  - fail:
-      msg: Sending mail using starttls failed.
-    when: smtpd_tls is succeeded and starttls_support is failed and tls_support is succeeded
+    - fail:
+        msg: Sending mail using starttls failed.
+      when: smtpd_tls is succeeded and starttls_support is failed and tls_support is succeeded
 
-  - fail:
-      msg: Send mail using TLS failed.
-    when: smtpd_tls is succeeded and tls_support is failed and starttls_support is succeeded
+    - fail:
+        msg: Send mail using TLS failed.
+      when: smtpd_tls is succeeded and tls_support is failed and starttls_support is succeeded
 
-  - name: Send a test-mail with body, specific recipient and specific ehlohost
-    mail:
-      port: 10025
-      ehlohost: some.domain.tld
-      from: ansible@localhost
-      to: root@localhost
-      subject: Test mail 6 (smtp + body + ehlohost)
-      body: Test body 6
-      secure: never
+    - name: Send a test-mail with body, specific recipient and specific ehlohost
+      mail:
+        port: 10025
+        ehlohost: some.domain.tld
+        from: ansible@localhost
+        to: root@localhost
+        subject: Test mail 6 (smtp + body + ehlohost)
+        body: Test body 6
+        secure: never
diff --git a/tests/integration/targets/mas/tasks/main.yml b/tests/integration/targets/mas/tasks/main.yml
index 839620779e..d4b51d3842 100644
--- a/tests/integration/targets/mas/tasks/main.yml
+++ b/tests/integration/targets/mas/tasks/main.yml
@@ -24,7 +24,7 @@
 - name: Ensure the app is uninstalled
   assert:
     that:
-    - install_status.stat.exists == false
+      - install_status.stat.exists == false
 
 - name: Wait until the OS-internal cache was updated
   pause:
@@ -41,8 +41,8 @@
 - name: Ensure that the status would have changed
   assert:
     that:
-    - install_check is changed
-    - install_check.msg == "Installed 1 app(s)"
+      - install_check is changed
+      - install_check.msg == "Installed 1 app(s)"
 
 - name: Determine whether the app is installed
   stat:
@@ -52,7 +52,7 @@
 - name: Ensure the app is not yet installed
   assert:
     that:
-    - install_status.stat.exists == false
+      - install_status.stat.exists == false
 
 - name: Install Rested
   mas:
@@ -63,8 +63,8 @@
 - name: Ensure that the status changed
   assert:
     that:
-    - install is changed
-    - install.msg == "Installed 1 app(s)"
+      - install is changed
+      - install.msg == "Installed 1 app(s)"
 
 - name: Determine whether the app is installed
   stat:
@@ -74,7 +74,7 @@
 - name: Ensure the app is installed
   assert:
     that:
-    - install_status.stat.exists == true
+      - install_status.stat.exists == true
 
 - name: Wait until the OS-internal cache was updated
   pause:
@@ -89,8 +89,8 @@
 - name: Ensure that the status is unchanged (already installed)
   assert:
     that:
-    - install_again is not changed
-    - "'msg' not in install_again"
+      - install_again is not changed
+      - "'msg' not in install_again"
 
 # Uninstallation
 - name: Check if Rested needs to be uninstalled
@@ -104,8 +104,8 @@
 - name: Ensure that the status would have changed
   assert:
     that:
-    - uninstall_check is changed
-    - uninstall_check.msg == "Uninstalled 1 app(s)"
+      - uninstall_check is changed
+      - uninstall_check.msg == "Uninstalled 1 app(s)"
 
 - name: Determine whether the app is installed
   stat:
@@ -115,7 +115,7 @@
 - name: Ensure the app is not yet uninstalled
   assert:
     that:
-    - install_status.stat.exists == true
+      - install_status.stat.exists == true
 
 - name: Uninstall Rested
   mas:
@@ -127,8 +127,8 @@
 - name: Ensure that the status changed
   assert:
     that:
-    - uninstall is changed
-    - uninstall.msg == "Uninstalled 1 app(s)"
+      - uninstall is changed
+      - uninstall.msg == "Uninstalled 1 app(s)"
 
 - name: Determine whether the app is installed
   stat:
@@ -138,7 +138,7 @@
 - name: Ensure the app is uninstalled
   assert:
     that:
-    - uninstall_status.stat.exists == false
+      - uninstall_status.stat.exists == false
 
 - name: Wait until the OS-internal cache was updated
   pause:
@@ -154,5 +154,5 @@
 - name: Ensure that the status is unchanged (already uninstalled)
   assert:
     that:
-    - uninstall_again is not changed
-    - "'msg' not in uninstall_again"
+      - uninstall_again is not changed
+      - "'msg' not in uninstall_again"
diff --git a/tests/integration/targets/monit/tasks/main.yml b/tests/integration/targets/monit/tasks/main.yml
index ea85954125..518e997c32 100644
--- a/tests/integration/targets/monit/tasks/main.yml
+++ b/tests/integration/targets/monit/tasks/main.yml
@@ -9,91 +9,91 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 - block:
-  - name: Install EPEL repository (RHEL only)
-    include_role:
-      name: setup_epel
-    when:
-      - ansible_distribution in ['RedHat', 'CentOS']
-      - ansible_distribution_major_version is version('9', '<')
+    - name: Install EPEL repository (RHEL only)
+      include_role:
+        name: setup_epel
+      when:
+        - ansible_distribution in ['RedHat', 'CentOS']
+        - ansible_distribution_major_version is version('9', '<')
 
-  - name: create required directories
-    become: true
-    file:
-      path: "{{ item }}"
-      state: directory
-    loop:
-      - /var/lib/monit
-      - /var/run/monit
-      - "{{ process_root }}"
+    - name: create required directories
+      become: true
+      file:
+        path: "{{ item }}"
+        state: directory
+      loop:
+        - /var/lib/monit
+        - /var/run/monit
+        - "{{ process_root }}"
 
-  - name: install monit
-    become: true
-    package:
-      name: monit
-      state: present
+    - name: install monit
+      become: true
+      package:
+        name: monit
+        state: present
 
-  - include_vars: '{{ item }}'
-    with_first_found:
-      - files:
-          - "{{ ansible_facts.distribution }}-{{ ansible_facts.distribution_major_version }}.yml"
-          - '{{ ansible_os_family }}.yml'
-          - 'defaults.yml'
+    - include_vars: '{{ item }}'
+      with_first_found:
+        - files:
+            - "{{ ansible_facts.distribution }}-{{ ansible_facts.distribution_major_version }}.yml"
+            - '{{ ansible_os_family }}.yml'
+            - 'defaults.yml'
 
-  - name: monit config
-    become: true
-    template:
-      src: "monitrc.j2"
-      dest: "{{ monitrc }}"
+    - name: monit config
+      become: true
+      template:
+        src: "monitrc.j2"
+        dest: "{{ monitrc }}"
 
-  - name: copy process file
-    become: true
-    copy:
-      src: httpd_echo.py
-      dest: "{{ process_file }}"
+    - name: copy process file
+      become: true
+      copy:
+        src: httpd_echo.py
+        dest: "{{ process_file }}"
 
-  - name: Install virtualenv on CentOS 8
-    package:
-      name: virtualenv
-      state: present
-    when: ansible_distribution == 'CentOS' and ansible_distribution_major_version == '8'
+    - name: Install virtualenv on CentOS 8
+      package:
+        name: virtualenv
+        state: present
+      when: ansible_distribution == 'CentOS' and ansible_distribution_major_version == '8'
 
-  - name: Install virtualenv on Arch Linux
-    pip:
-      name: virtualenv
-      state: present
-    when: ansible_os_family == 'Archlinux'
+    - name: Install virtualenv on Arch Linux
+      pip:
+        name: virtualenv
+        state: present
+      when: ansible_os_family == 'Archlinux'
 
-  - name: install dependencies
-    pip:
-      name: "{{ item }}"
-      virtualenv: "{{ process_venv }}"
-      extra_args: "-c {{ remote_constraints }}"
-    loop:
-      - setuptools==44
-      - python-daemon
+    - name: install dependencies
+      pip:
+        name: "{{ item }}"
+        virtualenv: "{{ process_venv }}"
+        extra_args: "-c {{ remote_constraints }}"
+      loop:
+        - setuptools==44
+        - python-daemon
 
-  - name: restart monit
-    become: true
-    service:
-      name: monit
-      state: restarted
+    - name: restart monit
+      become: true
+      service:
+        name: monit
+        state: restarted
 
-  - include_tasks: test.yml
+    - include_tasks: test.yml
 
   always:
-  - name: stop monit
-    become: true
-    service:
-      name: monit
-      state: stopped
+    - name: stop monit
+      become: true
+      service:
+        name: monit
+        state: stopped
 
-  - name: uninstall monit
-    become: true
-    package:
-      name: monit
-      state: absent
+    - name: uninstall monit
+      become: true
+      package:
+        name: monit
+        state: absent
 
-  - name: remove process files
-    file:
-      path: "{{ process_root }}"
-      state: absent
+    - name: remove process files
+      file:
+        path: "{{ process_root }}"
+        state: absent
diff --git a/tests/integration/targets/mqtt/tasks/ubuntu.yml b/tests/integration/targets/mqtt/tasks/ubuntu.yml
index 0c0a12d041..332a10dfed 100644
--- a/tests/integration/targets/mqtt/tasks/ubuntu.yml
+++ b/tests/integration/targets/mqtt/tasks/ubuntu.yml
@@ -66,9 +66,9 @@
 #    port: 8885
 #  register: result
 
-#- assert:
-#    that:
-#      - result is success
+# - assert:
+#     that:
+#       - result is success
 
 - name: Send a message, client TLS1.1, server (required) TLS1.2 - Expected failure
   mqtt:
diff --git a/tests/integration/targets/nomad/tasks/main.yml b/tests/integration/targets/nomad/tasks/main.yml
index 1a143be059..87b1c0474e 100644
--- a/tests/integration/targets/nomad/tasks/main.yml
+++ b/tests/integration/targets/nomad/tasks/main.yml
@@ -17,95 +17,95 @@
     nomad_cmd: '{{ remote_tmp_dir }}/nomad'
   block:
 
-  - name: Install requests<2.20 (CentOS/RHEL 6)
-    pip:
-      name: requests<2.20
-      extra_args: "-c {{ remote_constraints }}"
-    register: result
-    until: result is success
-    when: ansible_distribution_file_variety|default() == 'RedHat' and ansible_distribution_major_version is version('6', '<=')
+    - name: Install requests<2.20 (CentOS/RHEL 6)
+      pip:
+        name: requests<2.20
+        extra_args: "-c {{ remote_constraints }}"
+      register: result
+      until: result is success
+      when: ansible_distribution_file_variety|default() == 'RedHat' and ansible_distribution_major_version is version('6', '<=')
 
-  - name: Install python-nomad
-    pip:
-      name: python-nomad
-      extra_args: "-c {{ remote_constraints }}"
-    register: result
-    until: result is success
+    - name: Install python-nomad
+      pip:
+        name: python-nomad
+        extra_args: "-c {{ remote_constraints }}"
+      register: result
+      until: result is success
 
-  - name: Install jmespath
-    pip:
-      name: jmespath
-      extra_args: "-c {{ remote_constraints }}"
-    register: result
-    until: result is success
+    - name: Install jmespath
+      pip:
+        name: jmespath
+        extra_args: "-c {{ remote_constraints }}"
+      register: result
+      until: result is success
 
-  - name: Generate privatekey
-    community.crypto.openssl_privatekey:
-      path: '{{ remote_tmp_dir }}/privatekey.pem'
+    - name: Generate privatekey
+      community.crypto.openssl_privatekey:
+        path: '{{ remote_tmp_dir }}/privatekey.pem'
 
-  - name: Generate CSR
-    community.crypto.openssl_csr:
-      path: '{{ remote_tmp_dir }}/csr.csr'
-      privatekey_path: '{{ remote_tmp_dir }}/privatekey.pem'
-      subject:
-        commonName: localhost
+    - name: Generate CSR
+      community.crypto.openssl_csr:
+        path: '{{ remote_tmp_dir }}/csr.csr'
+        privatekey_path: '{{ remote_tmp_dir }}/privatekey.pem'
+        subject:
+          commonName: localhost
 
-  - name: Generate selfsigned certificate
-    register: selfsigned_certificate
-    community.crypto.x509_certificate:
-      path: '{{ remote_tmp_dir }}/cert.pem'
-      csr_path: '{{ remote_tmp_dir }}/csr.csr'
-      privatekey_path: '{{ remote_tmp_dir }}/privatekey.pem'
-      provider: selfsigned
-      selfsigned_digest: sha256
+    - name: Generate selfsigned certificate
+      register: selfsigned_certificate
+      community.crypto.x509_certificate:
+        path: '{{ remote_tmp_dir }}/cert.pem'
+        csr_path: '{{ remote_tmp_dir }}/csr.csr'
+        privatekey_path: '{{ remote_tmp_dir }}/privatekey.pem'
+        provider: selfsigned
+        selfsigned_digest: sha256
 
-  - name: Install unzip
-    package:
-      name: unzip
-    register: result
-    until: result is success
-    when: ansible_distribution != "MacOSX"
+    - name: Install unzip
+      package:
+        name: unzip
+      register: result
+      until: result is success
+      when: ansible_distribution != "MacOSX"
 
-  - assert:
-      that: ansible_architecture in ['i386', 'x86_64', 'amd64']
+    - assert:
+        that: ansible_architecture in ['i386', 'x86_64', 'amd64']
 
-  - set_fact:
-      nomad_arch: '386'
-    when: ansible_architecture == 'i386'
+    - set_fact:
+        nomad_arch: '386'
+      when: ansible_architecture == 'i386'
 
-  - set_fact:
-      nomad_arch: amd64
-    when: ansible_architecture in ['x86_64', 'amd64']
+    - set_fact:
+        nomad_arch: amd64
+      when: ansible_architecture in ['x86_64', 'amd64']
 
-  - name: Download nomad binary
-    unarchive:
-      src: '{{ nomad_uri }}'
-      dest: '{{ remote_tmp_dir }}'
-      remote_src: true
-    register: result
-    until: result is success
+    - name: Download nomad binary
+      unarchive:
+        src: '{{ nomad_uri }}'
+        dest: '{{ remote_tmp_dir }}'
+        remote_src: true
+      register: result
+      until: result is success
 
-  - vars:
-      remote_dir: '{{ echo_remote_tmp_dir.stdout }}'
-    block:
-
-    - command: echo {{ remote_tmp_dir }}
-      register: echo_remote_tmp_dir
-
-    - name: Run tests integration
+    - vars:
+        remote_dir: '{{ echo_remote_tmp_dir.stdout }}'
       block:
-        - name: Start nomad (dev mode enabled)
-          shell: nohup {{ nomad_cmd }} agent -dev </dev/null >/dev/null 2>&1 &
 
-        - name: wait nomad up
-          wait_for:
-            host: localhost
-            port: 4646
-            delay: 10
-            timeout: 60
+        - command: echo {{ remote_tmp_dir }}
+          register: echo_remote_tmp_dir
 
-        - import_tasks: nomad_job.yml
-      always:
+        - name: Run tests integration
+          block:
+            - name: Start nomad (dev mode enabled)
+              shell: nohup {{ nomad_cmd }} agent -dev </dev/null >/dev/null 2>&1 &
 
-        - name: kill nomad
-          shell: pkill nomad
+            - name: wait nomad up
+              wait_for:
+                host: localhost
+                port: 4646
+                delay: 10
+                timeout: 60
+
+            - import_tasks: nomad_job.yml
+          always:
+
+            - name: kill nomad
+              shell: pkill nomad
diff --git a/tests/integration/targets/npm/tasks/main.yml b/tests/integration/targets/npm/tasks/main.yml
index 500e15fdb5..686bd3e434 100644
--- a/tests/integration/targets/npm/tasks/main.yml
+++ b/tests/integration/targets/npm/tasks/main.yml
@@ -16,17 +16,17 @@
     - not (ansible_os_family == 'Alpine')  # TODO
   block:
 
-  # expand remote path
-  - command: 'echo {{ remote_tmp_dir }}'
-    register: echo
-  - set_fact:
-      remote_dir: '{{ echo.stdout }}'
+    # expand remote path
+    - command: 'echo {{ remote_tmp_dir }}'
+      register: echo
+    - set_fact:
+        remote_dir: '{{ echo.stdout }}'
 
-  - include_tasks: run.yml
-    vars:
-      nodejs_version: '{{ item }}'
-      nodejs_path: 'node-v{{ nodejs_version }}-{{ ansible_system|lower }}-x{{ ansible_userspace_bits }}'
-    with_items:
-      - 7.10.1 # provides npm 4.2.0 (last npm < 5 released)
-      - 8.0.0 # provides npm 5.0.0
-      - 8.2.0 # provides npm 5.3.0 (output change with this version)
+    - include_tasks: run.yml
+      vars:
+        nodejs_version: '{{ item }}'
+        nodejs_path: 'node-v{{ nodejs_version }}-{{ ansible_system|lower }}-x{{ ansible_userspace_bits }}'
+      with_items:
+        - 7.10.1 # provides npm 4.2.0 (last npm < 5 released)
+        - 8.0.0 # provides npm 5.0.0
+        - 8.2.0 # provides npm 5.3.0 (output change with this version)
diff --git a/tests/integration/targets/one_host/tasks/main.yml b/tests/integration/targets/one_host/tasks/main.yml
index 3b2c1cedf3..839cda98e4 100644
--- a/tests/integration/targets/one_host/tasks/main.yml
+++ b/tests/integration/targets/one_host/tasks/main.yml
@@ -69,8 +69,8 @@
 - name: "assert test_{{test_number}} failed"
   assert:
     that:
-    - result is failed
-    - result.results[0].msg == 'invalid host state ERROR'
+      - result is failed
+      - result.results[0].msg == 'invalid host state ERROR'
 
 # ---
 
@@ -94,7 +94,7 @@
 - name: "assert test_{{test_number}} worked"
   assert:
     that:
-    - result.changed
+      - result.changed
 
 # HOST ENABLEMENT
 
@@ -120,7 +120,7 @@
 - name: "assert test_{{test_number}} worked"
   assert:
     that:
-    - result.changed
+      - result.changed
 
 # TEMPLATE MANAGEMENT
 
@@ -150,7 +150,7 @@
 - name: "assert test_{{test_number}} worked"
   assert:
     that:
-    - result.changed
+      - result.changed
 
 # ---
 
@@ -180,7 +180,7 @@
 - name: "assert test_{{test_number}} worked"
   assert:
     that:
-    - result is not changed
+      - result is not changed
 
 # HOST DISABLEMENT
 
@@ -205,7 +205,7 @@
 - name: "assert test_{{test_number}} worked"
   assert:
     that:
-    - result.changed
+      - result.changed
 
 # HOST OFFLINE
 
@@ -230,7 +230,7 @@
 - name: "assert test_{{test_number}} worked"
   assert:
     that:
-    - result.changed
+      - result.changed
 
 # TEARDOWN
 
diff --git a/tests/integration/targets/one_image/tasks/main.yml b/tests/integration/targets/one_image/tasks/main.yml
index c8736d73d8..aea8501aa7 100644
--- a/tests/integration/targets/one_image/tasks/main.yml
+++ b/tests/integration/targets/one_image/tasks/main.yml
@@ -166,7 +166,7 @@
 - name: Assert that image was deleted
   assert:
     that:
-    - result is changed
+      - result is changed
 
 # Trying to run with wrong arguments
 - name: Try to use name and ID at the same time
@@ -182,7 +182,7 @@
 - name: Assert that task failed
   assert:
     that:
-    - result is failed
+      - result is failed
 
 - name: Try to rename image without specifying new name
   one_image:
@@ -197,7 +197,7 @@
 - name: Assert that task failed
   assert:
     that:
-    - result is failed
+      - result is failed
 
 - name: Try to rename image without specifying new name
   one_image:
diff --git a/tests/integration/targets/one_template/tasks/main.yml b/tests/integration/targets/one_template/tasks/main.yml
index 58bca9c6c5..0532c16107 100644
--- a/tests/integration/targets/one_template/tasks/main.yml
+++ b/tests/integration/targets/one_template/tasks/main.yml
@@ -70,7 +70,7 @@
 - name: "assert that creation worked"
   assert:
     that:
-    - result is changed
+      - result is changed
 
 
 # Updating a template
@@ -123,7 +123,7 @@
 - name: "assert that it updated the template"
   assert:
     that:
-    - result is changed
+      - result is changed
 
 - name: "Update an existing TEMPLATE with the same changes again"
   one_template:
@@ -173,7 +173,7 @@
 - name: "assert that there was no change"
   assert:
     that:
-    - result is not changed
+      - result is not changed
 
 
 # Deletion of templates
@@ -195,7 +195,7 @@
 - name: "assert that there was no change"
   assert:
     that:
-    - result is not changed
+      - result is not changed
 
 - name: "Delete an existing TEMPLATE"
   one_template:
@@ -214,7 +214,7 @@
 - name: "assert that there was a change"
   assert:
     that:
-    - result is changed
+      - result is changed
 
 
 # Usage without `template` parameter
@@ -232,7 +232,7 @@
 - name: "assert that it failed because template is missing"
   assert:
     that:
-    - result is failed
+      - result is failed
 
 
 # TEARDOWN
diff --git a/tests/integration/targets/one_vnet/tasks/main.yml b/tests/integration/targets/one_vnet/tasks/main.yml
index 1374526570..9e1164fcd7 100644
--- a/tests/integration/targets/one_vnet/tasks/main.yml
+++ b/tests/integration/targets/one_vnet/tasks/main.yml
@@ -112,7 +112,7 @@
 - name: Assert that network was deleted
   assert:
     that:
-    - result is changed
+      - result is changed
 
 # Trying to run with wrong arguments
 - name: Try to create use network with state=present and without the template parameter
diff --git a/tests/integration/targets/osx_defaults/tasks/main.yml b/tests/integration/targets/osx_defaults/tasks/main.yml
index 3ca3180f04..780c3f96c5 100644
--- a/tests/integration/targets/osx_defaults/tasks/main.yml
+++ b/tests/integration/targets/osx_defaults/tasks/main.yml
@@ -21,7 +21,7 @@
 - name: Test if state and value are required together
   assert:
     that:
-    - "'following are missing: value' in missing_value['msg']"
+      - "'following are missing: value' in missing_value['msg']"
 
 - name: Change value of AppleMeasurementUnits to centimeter in check_mode
   osx_defaults:
@@ -36,7 +36,7 @@
 - name: Test if AppleMeasurementUnits value is changed to Centimeters in check_mode
   assert:
     that:
-    - measure_task_check_mode.changed
+      - measure_task_check_mode.changed
 
 - name: Find the current value of AppleMeasurementUnits
   osx_defaults:
@@ -68,7 +68,7 @@
 - name: Test if AppleMeasurementUnits value is changed to {{ new_value }}
   assert:
     that:
-    - change_value.changed
+      - change_value.changed
 
 - name: Again change value of AppleMeasurementUnits to {{ new_value }}
   osx_defaults:
@@ -82,7 +82,7 @@
 - name: Again test if AppleMeasurementUnits value is not changed to {{ new_value }}
   assert:
     that:
-    - not change_value.changed
+      - not change_value.changed
 
 - name: Check a fake setting for delete operation
   osx_defaults:
diff --git a/tests/integration/targets/pids/tasks/main.yml b/tests/integration/targets/pids/tasks/main.yml
index c8feaacf3e..de4a2e406b 100644
--- a/tests/integration/targets/pids/tasks/main.yml
+++ b/tests/integration/targets/pids/tasks/main.yml
@@ -27,8 +27,8 @@
 - name: "Verify that the list of Process IDs (PIDs) returned is empty"
   assert:
     that:
-    - emptypids is not changed
-    - emptypids.pids == []
+      - emptypids is not changed
+      - emptypids.pids == []
 
 - name: "Picking a random process name"
   set_fact:
@@ -38,7 +38,7 @@
   copy:
     src: sleeper.c
     dest: "{{ remote_tmp_dir }}/sleeper.c"
-    mode: 0644
+    mode: "0644"
 
 - name: Compile fake 'sleep' binary
   command: cc {{ remote_tmp_dir }}/sleeper.c -o {{ remote_tmp_dir }}/{{ random_name }}
@@ -47,7 +47,7 @@
   template:
     src: obtainpid.sh.j2
     dest: "{{ remote_tmp_dir }}/obtainpid.sh"
-    mode: 0755
+    mode: "0755"
 
 - name: "Run the fake 'sleep' binary"
   command: sh {{ remote_tmp_dir }}/obtainpid.sh
@@ -86,7 +86,7 @@
 
 - name: "Reading pid from the file"
   slurp:
-    src:  "{{ remote_tmp_dir }}/obtainpid.txt"
+    src: "{{ remote_tmp_dir }}/obtainpid.txt"
   register: newpid
 
 - name: Gather all processes to make debugging easier
@@ -101,12 +101,12 @@
 - name: "Verify that the Process IDs (PIDs) returned is not empty and also equal to the PIDs obtained in console"
   assert:
     that:
-    - "pids.pids | join(' ')  == newpid.content | b64decode | trim"
-    - "pids.pids | length > 0"
-    - "exactpidmatch.pids == []"
-    - "pattern_pid_match.pids | join(' ')  == newpid.content | b64decode | trim"
-    - "caseinsensitive_pattern_pid_match.pids | join(' ')  == newpid.content | b64decode | trim"
-    - newpid.content | b64decode | trim | int in match_all.pids
+      - "pids.pids | join(' ')  == newpid.content | b64decode | trim"
+      - "pids.pids | length > 0"
+      - "exactpidmatch.pids == []"
+      - "pattern_pid_match.pids | join(' ')  == newpid.content | b64decode | trim"
+      - "caseinsensitive_pattern_pid_match.pids | join(' ')  == newpid.content | b64decode | trim"
+      - newpid.content | b64decode | trim | int in match_all.pids
 
 - name: "Register output of bad input pattern"
   pids:
diff --git a/tests/integration/targets/pipx/tasks/testcase-oldsitewide.yml b/tests/integration/targets/pipx/tasks/testcase-oldsitewide.yml
index 1db3e60406..812cd9bd74 100644
--- a/tests/integration/targets/pipx/tasks/testcase-oldsitewide.yml
+++ b/tests/integration/targets/pipx/tasks/testcase-oldsitewide.yml
@@ -7,7 +7,7 @@
   ansible.builtin.file:
     path: /opt/pipx
     state: directory
-    mode: 0755
+    mode: "0755"
 
 - name: Install tox site-wide
   community.general.pipx:
diff --git a/tests/integration/targets/pkgutil/tasks/main.yml b/tests/integration/targets/pkgutil/tasks/main.yml
index 8ceb4adcc3..e7f665efbf 100644
--- a/tests/integration/targets/pkgutil/tasks/main.yml
+++ b/tests/integration/targets/pkgutil/tasks/main.yml
@@ -24,7 +24,7 @@
 - name: Verify cm_add_package
   assert:
     that:
-    - cm_add_package is changed
+      - cm_add_package is changed
 
 - name: Add package (normal mode)
   pkgutil:
@@ -35,7 +35,7 @@
 - name: Verify nm_add_package
   assert:
     that:
-    - nm_add_package is changed
+      - nm_add_package is changed
 
 - name: Add package again (check_mode)
   pkgutil:
@@ -47,7 +47,7 @@
 - name: Verify cm_add_package_again
   assert:
     that:
-    - cm_add_package_again is not changed
+      - cm_add_package_again is not changed
 
 - name: Add package again (normal mode)
   pkgutil:
@@ -58,7 +58,7 @@
 - name: Verify nm_add_package_again
   assert:
     that:
-    - nm_add_package_again is not changed
+      - nm_add_package_again is not changed
 
 
 # REMOVE PACKAGE
@@ -72,7 +72,7 @@
 - name: Verify cm_remove_package
   assert:
     that:
-    - cm_remove_package is changed
+      - cm_remove_package is changed
 
 - name: Remove package (normal mode)
   pkgutil:
@@ -83,7 +83,7 @@
 - name: Verify nm_remove_package
   assert:
     that:
-    - nm_remove_package is changed
+      - nm_remove_package is changed
 
 - name: Remove package again (check_mode)
   pkgutil:
@@ -95,7 +95,7 @@
 - name: Verify cm_remove_package_again
   assert:
     that:
-    - cm_remove_package_again is not changed
+      - cm_remove_package_again is not changed
 
 - name: Remove package again (normal mode)
   pkgutil:
@@ -106,7 +106,7 @@
 - name: Verify nm_remove_package_again
   assert:
     that:
-    - nm_remove_package_again is not changed
+      - nm_remove_package_again is not changed
 
 
 # RESTORE ENVIRONMENT
diff --git a/tests/integration/targets/read_csv/tasks/main.yml b/tests/integration/targets/read_csv/tasks/main.yml
index c09349dd5b..f8b46a3e62 100644
--- a/tests/integration/targets/read_csv/tasks/main.yml
+++ b/tests/integration/targets/read_csv/tasks/main.yml
@@ -26,14 +26,14 @@
 
 - assert:
     that:
-    - users_unique.dict.dag.name == 'dag'
-    - users_unique.dict.dag.gecos == 'Dag Wieërs'
-    - users_unique.dict.dag.uid == '500'
-    - users_unique.dict.dag.gid == '500'
-    - users_unique.dict.jeroen.name == 'jeroen'
-    - users_unique.dict.jeroen.gecos == 'Jeroen Hoekx'
-    - users_unique.dict.jeroen.uid == '501'
-    - users_unique.dict.jeroen.gid == '500'
+      - users_unique.dict.dag.name == 'dag'
+      - users_unique.dict.dag.gecos == 'Dag Wieërs'
+      - users_unique.dict.dag.uid == '500'
+      - users_unique.dict.dag.gid == '500'
+      - users_unique.dict.jeroen.name == 'jeroen'
+      - users_unique.dict.jeroen.gecos == 'Jeroen Hoekx'
+      - users_unique.dict.jeroen.uid == '501'
+      - users_unique.dict.jeroen.gid == '500'
 
 # Read a CSV file and access the first item
 - name: Read users from CSV file and return a list
@@ -43,14 +43,14 @@
 
 - assert:
     that:
-    - users_unique.list.0.name == 'dag'
-    - users_unique.list.0.gecos == 'Dag Wieërs'
-    - users_unique.list.0.uid == '500'
-    - users_unique.list.0.gid == '500'
-    - users_unique.list.1.name == 'jeroen'
-    - users_unique.list.1.gecos == 'Jeroen Hoekx'
-    - users_unique.list.1.uid == '501'
-    - users_unique.list.1.gid == '500'
+      - users_unique.list.0.name == 'dag'
+      - users_unique.list.0.gecos == 'Dag Wieërs'
+      - users_unique.list.0.uid == '500'
+      - users_unique.list.0.gid == '500'
+      - users_unique.list.1.name == 'jeroen'
+      - users_unique.list.1.gecos == 'Jeroen Hoekx'
+      - users_unique.list.1.uid == '501'
+      - users_unique.list.1.gid == '500'
 
 
 # Create basic CSV file using semi-colon
@@ -74,14 +74,14 @@
 
 - assert:
     that:
-    - users_nonunique.dict.dag.name == 'dag'
-    - users_nonunique.dict.dag.gecos == 'Dag Wieers'
-    - users_nonunique.dict.dag.uid == '502'
-    - users_nonunique.dict.dag.gid == '500'
-    - users_nonunique.dict.jeroen.name == 'jeroen'
-    - users_nonunique.dict.jeroen.gecos == 'Jeroen Hoekx'
-    - users_nonunique.dict.jeroen.uid == '501'
-    - users_nonunique.dict.jeroen.gid == '500'
+      - users_nonunique.dict.dag.name == 'dag'
+      - users_nonunique.dict.dag.gecos == 'Dag Wieers'
+      - users_nonunique.dict.dag.uid == '502'
+      - users_nonunique.dict.dag.gid == '500'
+      - users_nonunique.dict.jeroen.name == 'jeroen'
+      - users_nonunique.dict.jeroen.gecos == 'Jeroen Hoekx'
+      - users_nonunique.dict.jeroen.uid == '501'
+      - users_nonunique.dict.jeroen.gid == '500'
 
 
 # Read a CSV file using an non-existing dialect
@@ -94,8 +94,8 @@
 
 - assert:
     that:
-    - users_placebo is failed
-    - users_placebo.msg == "Dialect 'placebo' is not supported by your version of python."
+      - users_placebo is failed
+      - users_placebo.msg == "Dialect 'placebo' is not supported by your version of python."
 
 
 # Create basic CSV file without header
@@ -116,14 +116,14 @@
 
 - assert:
     that:
-    - users_noheader.dict.dag.name == 'dag'
-    - users_noheader.dict.dag.gecos == 'Dag Wieërs'
-    - users_noheader.dict.dag.uid == '500'
-    - users_noheader.dict.dag.gid == '500'
-    - users_noheader.dict.jeroen.name == 'jeroen'
-    - users_noheader.dict.jeroen.gecos == 'Jeroen Hoekx'
-    - users_noheader.dict.jeroen.uid == '501'
-    - users_noheader.dict.jeroen.gid == '500'
+      - users_noheader.dict.dag.name == 'dag'
+      - users_noheader.dict.dag.gecos == 'Dag Wieërs'
+      - users_noheader.dict.dag.uid == '500'
+      - users_noheader.dict.dag.gid == '500'
+      - users_noheader.dict.jeroen.name == 'jeroen'
+      - users_noheader.dict.jeroen.gecos == 'Jeroen Hoekx'
+      - users_noheader.dict.jeroen.uid == '501'
+      - users_noheader.dict.jeroen.gid == '500'
 
 
 # Create broken file
@@ -146,8 +146,8 @@
 
 - assert:
     that:
-    - users_broken is failed
-    - "'Unable to process file' in users_broken.msg"
+      - users_broken is failed
+      - "'Unable to process file' in users_broken.msg"
 
 # Create basic CSV file with BOM
 - name: Create unique CSV file with BOM
@@ -166,11 +166,11 @@
 
 - assert:
     that:
-    - users_bom.list.0.name == 'dag'
-    - users_bom.list.0.gecos == 'Dag Wieërs'
-    - users_bom.list.0.uid == '500'
-    - users_bom.list.0.gid == '500'
-    - users_bom.list.1.name == 'jeroen'
-    - users_bom.list.1.gecos == 'Jeroen Hoekx'
-    - users_bom.list.1.uid == '501'
-    - users_bom.list.1.gid == '500'
+      - users_bom.list.0.name == 'dag'
+      - users_bom.list.0.gecos == 'Dag Wieërs'
+      - users_bom.list.0.uid == '500'
+      - users_bom.list.0.gid == '500'
+      - users_bom.list.1.name == 'jeroen'
+      - users_bom.list.1.gecos == 'Jeroen Hoekx'
+      - users_bom.list.1.uid == '501'
+      - users_bom.list.1.gid == '500'
diff --git a/tests/integration/targets/redis_info/meta/main.yml b/tests/integration/targets/redis_info/meta/main.yml
index cd516fd239..404b9ba31c 100644
--- a/tests/integration/targets/redis_info/meta/main.yml
+++ b/tests/integration/targets/redis_info/meta/main.yml
@@ -4,4 +4,4 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 dependencies:
-- setup_redis_replication
+  - setup_redis_replication
diff --git a/tests/integration/targets/redis_info/tasks/main.yml b/tests/integration/targets/redis_info/tasks/main.yml
index 4a11de3650..52263ecc4f 100644
--- a/tests/integration/targets/redis_info/tasks/main.yml
+++ b/tests/integration/targets/redis_info/tasks/main.yml
@@ -14,10 +14,10 @@
 
 - assert:
     that:
-    - result is not changed
-    - result.info is defined
-    - result.info.tcp_port == master_port
-    - result.info.role == 'master'
+      - result is not changed
+      - result.info is defined
+      - result.info.tcp_port == master_port
+      - result.info.role == 'master'
 
 - name: redis_info - connect to master (check)
   community.general.redis_info:
@@ -29,10 +29,10 @@
 
 - assert:
     that:
-    - result is not changed
-    - result.info is defined
-    - result.info.tcp_port == master_port
-    - result.info.role == 'master'
+      - result is not changed
+      - result.info is defined
+      - result.info.tcp_port == master_port
+      - result.info.role == 'master'
 
 - name: redis_info - connect to replica
   community.general.redis_info:
@@ -42,7 +42,7 @@
 
 - assert:
     that:
-    - result is not changed
-    - result.info is defined
-    - result.info.tcp_port == replica_port
-    - result.info.role == 'slave'
+      - result is not changed
+      - result.info is defined
+      - result.info.tcp_port == replica_port
+      - result.info.role == 'slave'
diff --git a/tests/integration/targets/rundeck/files/test_job.yaml b/tests/integration/targets/rundeck/files/test_job.yaml
index baa852ecce..073e11fd19 100644
--- a/tests/integration/targets/rundeck/files/test_job.yaml
+++ b/tests/integration/targets/rundeck/files/test_job.yaml
@@ -11,18 +11,18 @@
   name: test_job
   nodeFilterEditable: false
   options:
-  - label: Exit Code
-    name: exit_code
-    value: '0'
-  - label: Sleep
-    name: sleep
-    value: '1'
+    - label: Exit Code
+      name: exit_code
+      value: '0'
+    - label: Sleep
+      name: sleep
+      value: '1'
   plugins:
     ExecutionLifecycle: null
   scheduleEnabled: true
   sequence:
     commands:
-    - exec: sleep $RD_OPTION_SLEEP && echo "Test done!" && exit $RD_OPTION_EXIT_CODE
+      - exec: sleep $RD_OPTION_SLEEP && echo "Test done!" && exit $RD_OPTION_EXIT_CODE
     keepgoing: false
     strategy: node-first
   uuid: 3b8a6e54-69fb-42b7-b98f-f82e59238478
diff --git a/tests/integration/targets/rundeck/meta/main.yml b/tests/integration/targets/rundeck/meta/main.yml
index c125e4046a..31dd1cfb9d 100644
--- a/tests/integration/targets/rundeck/meta/main.yml
+++ b/tests/integration/targets/rundeck/meta/main.yml
@@ -4,4 +4,4 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 dependencies:
-- setup_rundeck
+  - setup_rundeck
diff --git a/tests/integration/targets/scaleway_compute/tasks/security_group.yml b/tests/integration/targets/scaleway_compute/tasks/security_group.yml
index 59f81e6af1..971fae6076 100644
--- a/tests/integration/targets/scaleway_compute/tasks/security_group.yml
+++ b/tests/integration/targets/scaleway_compute/tasks/security_group.yml
@@ -19,105 +19,105 @@
 - debug: var=security_group
 
 - block:
-  - name: Create a server with security_group (Check)
-    check_mode: true
-    scaleway_compute:
-      name: '{{ scaleway_name }}'
-      state: present
-      image: '{{ scaleway_image_id }}'
-      organization: '{{ scaleway_organization }}'
-      region: '{{ scaleway_region }}'
-      commercial_type: '{{ scaleway_commerial_type }}'
-      security_group: '{{ security_group.scaleway_security_group.id }}'
+    - name: Create a server with security_group (Check)
+      check_mode: true
+      scaleway_compute:
+        name: '{{ scaleway_name }}'
+        state: present
+        image: '{{ scaleway_image_id }}'
+        organization: '{{ scaleway_organization }}'
+        region: '{{ scaleway_region }}'
+        commercial_type: '{{ scaleway_commerial_type }}'
+        security_group: '{{ security_group.scaleway_security_group.id }}'
 
-    register: server_creation_check_task
+      register: server_creation_check_task
 
-  - debug: var=server_creation_check_task
+    - debug: var=server_creation_check_task
 
-  - assert:
-      that:
-        - server_creation_check_task is success
-        - server_creation_check_task is changed
+    - assert:
+        that:
+          - server_creation_check_task is success
+          - server_creation_check_task is changed
 
-  - name: Create a server
-    scaleway_compute:
-      name: '{{ scaleway_name }}'
-      state: present
-      image: '{{ scaleway_image_id }}'
-      organization: '{{ scaleway_organization }}'
-      region: '{{ scaleway_region }}'
-      commercial_type: '{{ scaleway_commerial_type }}'
-      security_group: '{{ security_group.scaleway_security_group.id }}'
-      wait: true
+    - name: Create a server
+      scaleway_compute:
+        name: '{{ scaleway_name }}'
+        state: present
+        image: '{{ scaleway_image_id }}'
+        organization: '{{ scaleway_organization }}'
+        region: '{{ scaleway_region }}'
+        commercial_type: '{{ scaleway_commerial_type }}'
+        security_group: '{{ security_group.scaleway_security_group.id }}'
+        wait: true
 
-    register: server_creation_task
+      register: server_creation_task
 
-  - debug: var=server_creation_task
+    - debug: var=server_creation_task
 
-  - assert:
-      that:
-        - server_creation_task is success
-        - server_creation_task is changed
+    - assert:
+        that:
+          - server_creation_task is success
+          - server_creation_task is changed
 
-  - name: Create a server with security_group (Confirmation)
-    scaleway_compute:
-      name: '{{ scaleway_name }}'
-      state: present
-      image: '{{ scaleway_image_id }}'
-      organization: '{{ scaleway_organization }}'
-      region: '{{ scaleway_region }}'
-      commercial_type: '{{ scaleway_commerial_type }}'
-      security_group: '{{ security_group.scaleway_security_group.id }}'
-      wait: true
+    - name: Create a server with security_group (Confirmation)
+      scaleway_compute:
+        name: '{{ scaleway_name }}'
+        state: present
+        image: '{{ scaleway_image_id }}'
+        organization: '{{ scaleway_organization }}'
+        region: '{{ scaleway_region }}'
+        commercial_type: '{{ scaleway_commerial_type }}'
+        security_group: '{{ security_group.scaleway_security_group.id }}'
+        wait: true
 
-    register: server_creation_confirmation_task
+      register: server_creation_confirmation_task
 
-  - debug: var=server_creation_confirmation_task
+    - debug: var=server_creation_confirmation_task
 
-  - assert:
-      that:
-        - server_creation_confirmation_task is success
-        - server_creation_confirmation_task is not changed
+    - assert:
+        that:
+          - server_creation_confirmation_task is success
+          - server_creation_confirmation_task is not changed
 
-  - name: Keep current security_group (Check)
-    check_mode: true
-    scaleway_compute:
-      name: '{{ scaleway_name }}'
-      state: present
-      image: '{{ scaleway_image_id }}'
-      organization: '{{ scaleway_organization }}'
-      region: '{{ scaleway_region }}'
-      commercial_type: '{{ scaleway_commerial_type }}'
-      security_group: '{{ security_group.scaleway_security_group.id }}'
-      wait: true
+    - name: Keep current security_group (Check)
+      check_mode: true
+      scaleway_compute:
+        name: '{{ scaleway_name }}'
+        state: present
+        image: '{{ scaleway_image_id }}'
+        organization: '{{ scaleway_organization }}'
+        region: '{{ scaleway_region }}'
+        commercial_type: '{{ scaleway_commerial_type }}'
+        security_group: '{{ security_group.scaleway_security_group.id }}'
+        wait: true
 
-    register: server_creation_confirmation_task
+      register: server_creation_confirmation_task
 
-  - debug: var=server_creation_confirmation_task
+    - debug: var=server_creation_confirmation_task
 
-  - assert:
-      that:
-        - server_creation_confirmation_task is success
-        - server_creation_confirmation_task is not changed
+    - assert:
+        that:
+          - server_creation_confirmation_task is success
+          - server_creation_confirmation_task is not changed
 
-  - name: Keep current security_group
-    scaleway_compute:
-      name: '{{ scaleway_name }}'
-      state: present
-      image: '{{ scaleway_image_id }}'
-      organization: '{{ scaleway_organization }}'
-      region: '{{ scaleway_region }}'
-      commercial_type: '{{ scaleway_commerial_type }}'
-      wait: true
+    - name: Keep current security_group
+      scaleway_compute:
+        name: '{{ scaleway_name }}'
+        state: present
+        image: '{{ scaleway_image_id }}'
+        organization: '{{ scaleway_organization }}'
+        region: '{{ scaleway_region }}'
+        commercial_type: '{{ scaleway_commerial_type }}'
+        wait: true
 
-    register: server_creation_confirmation_task
+      register: server_creation_confirmation_task
 
-  - debug: var=server_creation_confirmation_task
+    - debug: var=server_creation_confirmation_task
 
-  - assert:
-      that:
-        - server_creation_confirmation_task is success
-        - server_creation_confirmation_task is not changed
+    - assert:
+        that:
+          - server_creation_confirmation_task is success
+          - server_creation_confirmation_task is not changed
 
   always:
     - name: Destroy it
diff --git a/tests/integration/targets/scaleway_container_namespace/defaults/main.yml b/tests/integration/targets/scaleway_container_namespace/defaults/main.yml
index 876f8b7a63..de5cb3005a 100644
--- a/tests/integration/targets/scaleway_container_namespace/defaults/main.yml
+++ b/tests/integration/targets/scaleway_container_namespace/defaults/main.yml
@@ -10,6 +10,6 @@ updated_description: Container namespace used for testing scaleway_container_nam
 environment_variables:
   MY_VAR: my_value
 secret_environment_variables:
-   MY_SECRET_VAR: my_secret_value
+  MY_SECRET_VAR: my_secret_value
 updated_secret_environment_variables:
   MY_SECRET_VAR: my_other_secret_value
\ No newline at end of file
diff --git a/tests/integration/targets/scaleway_security_group/tasks/main.yml b/tests/integration/targets/scaleway_security_group/tasks/main.yml
index cab972ae50..40140e0b1f 100644
--- a/tests/integration/targets/scaleway_security_group/tasks/main.yml
+++ b/tests/integration/targets/scaleway_security_group/tasks/main.yml
@@ -31,69 +31,69 @@
       - security_group_creation is changed
 
 - block:
-  - name: Create security group
-    scaleway_security_group:
-      state: present
-      region: '{{ scaleway_region }}'
-      name: security_group
-      description: 'my security group description'
-      organization: '{{ scaleway_organization }}'
-      stateful: false
-      inbound_default_policy: accept
-      outbound_default_policy: accept
-      organization_default: false
-    register: security_group_creation
+    - name: Create security group
+      scaleway_security_group:
+        state: present
+        region: '{{ scaleway_region }}'
+        name: security_group
+        description: 'my security group description'
+        organization: '{{ scaleway_organization }}'
+        stateful: false
+        inbound_default_policy: accept
+        outbound_default_policy: accept
+        organization_default: false
+      register: security_group_creation
 
-  - debug: var=security_group_creation
+    - debug: var=security_group_creation
 
-  - name: Ensure security groups facts is success
-    assert:
-      that:
-        - security_group_creation is success
-        - security_group_creation is changed
+    - name: Ensure security groups facts is success
+      assert:
+        that:
+          - security_group_creation is success
+          - security_group_creation is changed
 
-  - name: Create security group duplicate
-    scaleway_security_group:
-      state: present
-      region: '{{ scaleway_region }}'
-      name: security_group
-      description: 'my security group description'
-      organization: '{{ scaleway_organization }}'
-      stateful: false
-      inbound_default_policy: accept
-      outbound_default_policy: accept
-      organization_default: false
-    register: security_group_creation
+    - name: Create security group duplicate
+      scaleway_security_group:
+        state: present
+        region: '{{ scaleway_region }}'
+        name: security_group
+        description: 'my security group description'
+        organization: '{{ scaleway_organization }}'
+        stateful: false
+        inbound_default_policy: accept
+        outbound_default_policy: accept
+        organization_default: false
+      register: security_group_creation
 
-  - debug: var=security_group_creation
+    - debug: var=security_group_creation
 
-  - name: Ensure security groups duplicate facts is success
-    assert:
-      that:
-        - security_group_creation is success
-        - security_group_creation is not changed
+    - name: Ensure security groups duplicate facts is success
+      assert:
+        that:
+          - security_group_creation is success
+          - security_group_creation is not changed
 
-  - name: Delete security group check
-    check_mode: true
-    scaleway_security_group:
-      state: absent
-      region: '{{ scaleway_region }}'
-      name: security_group
-      description: 'my security group description'
-      organization: '{{ scaleway_organization }}'
-      stateful: false
-      inbound_default_policy: accept
-      outbound_default_policy: accept
-      organization_default: false
-    register: security_group_deletion
+    - name: Delete security group check
+      check_mode: true
+      scaleway_security_group:
+        state: absent
+        region: '{{ scaleway_region }}'
+        name: security_group
+        description: 'my security group description'
+        organization: '{{ scaleway_organization }}'
+        stateful: false
+        inbound_default_policy: accept
+        outbound_default_policy: accept
+        organization_default: false
+      register: security_group_deletion
 
-  - debug: var=security_group_deletion
+    - debug: var=security_group_deletion
 
-  - name: Ensure security groups delete check facts is success
-    assert:
-      that:
-        - security_group_deletion is success
-        - security_group_deletion is changed
+    - name: Ensure security groups delete check facts is success
+      assert:
+        that:
+          - security_group_deletion is success
+          - security_group_deletion is changed
 
   always:
     - name: Delete security group
diff --git a/tests/integration/targets/scaleway_security_group_rule/tasks/main.yml b/tests/integration/targets/scaleway_security_group_rule/tasks/main.yml
index 3839421955..a438e4be57 100644
--- a/tests/integration/targets/scaleway_security_group_rule/tasks/main.yml
+++ b/tests/integration/targets/scaleway_security_group_rule/tasks/main.yml
@@ -44,83 +44,83 @@
       - security_group_rule_creation_task is changed
 
 - block:
-  - name: Create security_group_rule check
-    scaleway_security_group_rule:
-      state: present
-      region: '{{ scaleway_region }}'
-      protocol: '{{ protocol }}'
-      port: '{{ port }}'
-      ip_range: '{{ ip_range }}'
-      direction: '{{ direction }}'
-      action: '{{ action }}'
-      security_group: '{{ security_group.scaleway_security_group.id }}'
-    register: security_group_rule_creation_task
+    - name: Create security_group_rule check
+      scaleway_security_group_rule:
+        state: present
+        region: '{{ scaleway_region }}'
+        protocol: '{{ protocol }}'
+        port: '{{ port }}'
+        ip_range: '{{ ip_range }}'
+        direction: '{{ direction }}'
+        action: '{{ action }}'
+        security_group: '{{ security_group.scaleway_security_group.id }}'
+      register: security_group_rule_creation_task
 
-  - debug: var=security_group_rule_creation_task
+    - debug: var=security_group_rule_creation_task
 
-  - assert:
-      that:
-        - security_group_rule_creation_task is success
-        - security_group_rule_creation_task is changed
+    - assert:
+        that:
+          - security_group_rule_creation_task is success
+          - security_group_rule_creation_task is changed
 
-  - name: Create security_group_rule duplicate
-    scaleway_security_group_rule:
-      state: present
-      region: '{{ scaleway_region }}'
-      protocol: '{{ protocol }}'
-      port: '{{ port }}'
-      ip_range: '{{ ip_range }}'
-      direction: '{{ direction }}'
-      action: '{{ action }}'
-      security_group: '{{ security_group.scaleway_security_group.id }}'
-    register: security_group_rule_creation_task
+    - name: Create security_group_rule duplicate
+      scaleway_security_group_rule:
+        state: present
+        region: '{{ scaleway_region }}'
+        protocol: '{{ protocol }}'
+        port: '{{ port }}'
+        ip_range: '{{ ip_range }}'
+        direction: '{{ direction }}'
+        action: '{{ action }}'
+        security_group: '{{ security_group.scaleway_security_group.id }}'
+      register: security_group_rule_creation_task
 
-  - debug: var=security_group_rule_creation_task
+    - debug: var=security_group_rule_creation_task
 
-  - assert:
-      that:
-        - security_group_rule_creation_task is success
-        - security_group_rule_creation_task is not changed
+    - assert:
+        that:
+          - security_group_rule_creation_task is success
+          - security_group_rule_creation_task is not changed
 
-  - name: Delete security_group_rule check
-    check_mode: true
-    scaleway_security_group_rule:
-      state: absent
-      region: '{{ scaleway_region }}'
-      protocol: '{{ protocol }}'
-      port: '{{ port }}'
-      ip_range: '{{ ip_range }}'
-      direction: '{{ direction }}'
-      action: '{{ action }}'
-      security_group: '{{ security_group.scaleway_security_group.id }}'
-    register: security_group_rule_deletion_task
+    - name: Delete security_group_rule check
+      check_mode: true
+      scaleway_security_group_rule:
+        state: absent
+        region: '{{ scaleway_region }}'
+        protocol: '{{ protocol }}'
+        port: '{{ port }}'
+        ip_range: '{{ ip_range }}'
+        direction: '{{ direction }}'
+        action: '{{ action }}'
+        security_group: '{{ security_group.scaleway_security_group.id }}'
+      register: security_group_rule_deletion_task
 
-  - debug: var=security_group_rule_deletion_task
+    - debug: var=security_group_rule_deletion_task
 
-  - assert:
-      that:
-        - security_group_rule_deletion_task is success
-        - security_group_rule_deletion_task is changed
+    - assert:
+        that:
+          - security_group_rule_deletion_task is success
+          - security_group_rule_deletion_task is changed
 
   always:
-  - name: Delete security_group_rule check
-    scaleway_security_group_rule:
-      state: absent
-      region: '{{ scaleway_region }}'
-      protocol: '{{ protocol }}'
-      port: '{{ port }}'
-      ip_range: '{{ ip_range }}'
-      direction: '{{ direction }}'
-      action: '{{ action }}'
-      security_group: '{{ security_group.scaleway_security_group.id }}'
-    register: security_group_rule_deletion_task
+    - name: Delete security_group_rule check
+      scaleway_security_group_rule:
+        state: absent
+        region: '{{ scaleway_region }}'
+        protocol: '{{ protocol }}'
+        port: '{{ port }}'
+        ip_range: '{{ ip_range }}'
+        direction: '{{ direction }}'
+        action: '{{ action }}'
+        security_group: '{{ security_group.scaleway_security_group.id }}'
+      register: security_group_rule_deletion_task
 
-  - debug: var=security_group_rule_deletion_task
+    - debug: var=security_group_rule_deletion_task
 
-  - assert:
-      that:
-        - security_group_rule_deletion_task is success
-        - security_group_rule_deletion_task is changed
+    - assert:
+        that:
+          - security_group_rule_deletion_task is success
+          - security_group_rule_deletion_task is changed
 
 - name: Delete security_group_rule check
   scaleway_security_group_rule:
@@ -142,83 +142,83 @@
       - security_group_rule_deletion_task is not changed
 
 - block:
-  - name: Create security_group_rule with null check
-    scaleway_security_group_rule:
-      state: present
-      region: '{{ scaleway_region }}'
-      protocol: '{{ protocol }}'
-      port: null
-      ip_range: '{{ ip_range }}'
-      direction: '{{ direction }}'
-      action: '{{ action }}'
-      security_group: '{{ security_group.scaleway_security_group.id }}'
-    register: security_group_rule_creation_task
+    - name: Create security_group_rule with null check
+      scaleway_security_group_rule:
+        state: present
+        region: '{{ scaleway_region }}'
+        protocol: '{{ protocol }}'
+        port: null
+        ip_range: '{{ ip_range }}'
+        direction: '{{ direction }}'
+        action: '{{ action }}'
+        security_group: '{{ security_group.scaleway_security_group.id }}'
+      register: security_group_rule_creation_task
 
-  - debug: var=security_group_rule_creation_task
+    - debug: var=security_group_rule_creation_task
 
-  - assert:
-      that:
-        - security_group_rule_creation_task is success
-        - security_group_rule_creation_task is changed
+    - assert:
+        that:
+          - security_group_rule_creation_task is success
+          - security_group_rule_creation_task is changed
 
-  - name: Create security_group_rule with null duplicate
-    scaleway_security_group_rule:
-      state: present
-      region: '{{ scaleway_region }}'
-      protocol: '{{ protocol }}'
-      port: null
-      ip_range: '{{ ip_range }}'
-      direction: '{{ direction }}'
-      action: '{{ action }}'
-      security_group: '{{ security_group.scaleway_security_group.id }}'
-    register: security_group_rule_creation_task
+    - name: Create security_group_rule with null duplicate
+      scaleway_security_group_rule:
+        state: present
+        region: '{{ scaleway_region }}'
+        protocol: '{{ protocol }}'
+        port: null
+        ip_range: '{{ ip_range }}'
+        direction: '{{ direction }}'
+        action: '{{ action }}'
+        security_group: '{{ security_group.scaleway_security_group.id }}'
+      register: security_group_rule_creation_task
 
-  - debug: var=security_group_rule_creation_task
+    - debug: var=security_group_rule_creation_task
 
-  - assert:
-      that:
-        - security_group_rule_creation_task is success
-        - security_group_rule_creation_task is not changed
+    - assert:
+        that:
+          - security_group_rule_creation_task is success
+          - security_group_rule_creation_task is not changed
 
-  - name: Delete security_group_rule with null check
-    check_mode: true
-    scaleway_security_group_rule:
-      state: absent
-      region: '{{ scaleway_region }}'
-      protocol: '{{ protocol }}'
-      port: null
-      ip_range: '{{ ip_range }}'
-      direction: '{{ direction }}'
-      action: '{{ action }}'
-      security_group: '{{ security_group.scaleway_security_group.id }}'
-    register: security_group_rule_deletion_task
+    - name: Delete security_group_rule with null check
+      check_mode: true
+      scaleway_security_group_rule:
+        state: absent
+        region: '{{ scaleway_region }}'
+        protocol: '{{ protocol }}'
+        port: null
+        ip_range: '{{ ip_range }}'
+        direction: '{{ direction }}'
+        action: '{{ action }}'
+        security_group: '{{ security_group.scaleway_security_group.id }}'
+      register: security_group_rule_deletion_task
 
-  - debug: var=security_group_rule_deletion_task
+    - debug: var=security_group_rule_deletion_task
 
-  - assert:
-      that:
-        - security_group_rule_deletion_task is success
-        - security_group_rule_deletion_task is changed
+    - assert:
+        that:
+          - security_group_rule_deletion_task is success
+          - security_group_rule_deletion_task is changed
 
   always:
-  - name: Delete security_group_rule with null check
-    scaleway_security_group_rule:
-      state: absent
-      region: '{{ scaleway_region }}'
-      protocol: '{{ protocol }}'
-      port: null
-      ip_range: '{{ ip_range }}'
-      direction: '{{ direction }}'
-      action: '{{ action }}'
-      security_group: '{{ security_group.scaleway_security_group.id }}'
-    register: security_group_rule_deletion_task
+    - name: Delete security_group_rule with null check
+      scaleway_security_group_rule:
+        state: absent
+        region: '{{ scaleway_region }}'
+        protocol: '{{ protocol }}'
+        port: null
+        ip_range: '{{ ip_range }}'
+        direction: '{{ direction }}'
+        action: '{{ action }}'
+        security_group: '{{ security_group.scaleway_security_group.id }}'
+      register: security_group_rule_deletion_task
 
-  - debug: var=security_group_rule_deletion_task
+    - debug: var=security_group_rule_deletion_task
 
-  - assert:
-      that:
-        - security_group_rule_deletion_task is success
-        - security_group_rule_deletion_task is changed
+    - assert:
+        that:
+          - security_group_rule_deletion_task is success
+          - security_group_rule_deletion_task is changed
 
 - name: Delete security_group_rule with null check
   scaleway_security_group_rule:
diff --git a/tests/integration/targets/sefcontext/tasks/sefcontext.yml b/tests/integration/targets/sefcontext/tasks/sefcontext.yml
index 258f1ace91..ae815a22f8 100644
--- a/tests/integration/targets/sefcontext/tasks/sefcontext.yml
+++ b/tests/integration/targets/sefcontext/tasks/sefcontext.yml
@@ -38,8 +38,8 @@
 
 - assert:
     that:
-    - first is changed
-    - first.setype == 'httpd_sys_content_t'
+      - first is changed
+      - first.setype == 'httpd_sys_content_t'
 
 - name: Set SELinux file context of foo/bar (again)
   sefcontext:
@@ -51,8 +51,8 @@
 
 - assert:
     that:
-    - second is not changed
-    - second.setype == 'httpd_sys_content_t'
+      - second is not changed
+      - second.setype == 'httpd_sys_content_t'
 
 - name: Change SELinux file context of foo/bar
   sefcontext:
@@ -64,8 +64,8 @@
 
 - assert:
     that:
-    - third is changed
-    - third.setype == 'unlabeled_t'
+      - third is changed
+      - third.setype == 'unlabeled_t'
 
 - name: Change SELinux file context of foo/bar (again)
   sefcontext:
@@ -77,8 +77,8 @@
 
 - assert:
     that:
-    - fourth is not changed
-    - fourth.setype == 'unlabeled_t'
+      - fourth is not changed
+      - fourth.setype == 'unlabeled_t'
 
 - name: Delete SELinux file context of foo/bar
   sefcontext:
@@ -90,8 +90,8 @@
 
 - assert:
     that:
-    - fifth is changed
-    - fifth.setype == 'httpd_sys_content_t'
+      - fifth is changed
+      - fifth.setype == 'httpd_sys_content_t'
 
 - name: Delete SELinux file context of foo/bar (again)
   sefcontext:
@@ -103,8 +103,8 @@
 
 - assert:
     that:
-    - sixth is not changed
-    - sixth.setype == 'unlabeled_t'
+      - sixth is not changed
+      - sixth.setype == 'unlabeled_t'
 
 - name: Set SELinux file context path substitution of foo
   sefcontext:
@@ -116,8 +116,8 @@
 
 - assert:
     that:
-    - subst_first is changed
-    - subst_first.substitute == '/home'
+      - subst_first is changed
+      - subst_first.substitute == '/home'
 
 - name: Set SELinux file context path substitution of foo (again)
   sefcontext:
@@ -129,8 +129,8 @@
 
 - assert:
     that:
-    - subst_second is not changed
-    - subst_second.substitute == '/home'
+      - subst_second is not changed
+      - subst_second.substitute == '/home'
 
 - name: Change SELinux file context path substitution of foo
   sefcontext:
@@ -142,8 +142,8 @@
 
 - assert:
     that:
-    - subst_third is changed
-    - subst_third.substitute == '/boot'
+      - subst_third is changed
+      - subst_third.substitute == '/boot'
 
 - name: Change SELinux file context path substitution of foo (again)
   sefcontext:
@@ -155,8 +155,8 @@
 
 - assert:
     that:
-    - subst_fourth is not changed
-    - subst_fourth.substitute == '/boot'
+      - subst_fourth is not changed
+      - subst_fourth.substitute == '/boot'
 
 - name: Try to delete non-existing SELinux file context path substitution of foo
   sefcontext:
@@ -168,8 +168,8 @@
 
 - assert:
     that:
-    - subst_fifth is not changed
-    - subst_fifth.substitute == '/dev'
+      - subst_fifth is not changed
+      - subst_fifth.substitute == '/dev'
 
 - name: Delete SELinux file context path substitution of foo
   sefcontext:
@@ -181,8 +181,8 @@
 
 - assert:
     that:
-    - subst_sixth is changed
-    - subst_sixth.substitute == '/boot'
+      - subst_sixth is changed
+      - subst_sixth.substitute == '/boot'
 
 - name: Delete SELinux file context path substitution of foo (again)
   sefcontext:
@@ -194,8 +194,8 @@
 
 - assert:
     that:
-    - subst_seventh is not changed
-    - subst_seventh.substitute == '/boot'
+      - subst_seventh is not changed
+      - subst_seventh.substitute == '/boot'
 
 - name: Set SELinux file context path substitution of foo
   sefcontext:
@@ -207,8 +207,8 @@
 
 - assert:
     that:
-    - subst_eighth is changed
-    - subst_eighth.substitute == '/home'
+      - subst_eighth is changed
+      - subst_eighth.substitute == '/home'
 
 - name: Delete SELinux file context path substitution of foo
   sefcontext:
@@ -219,7 +219,7 @@
 
 - assert:
     that:
-    - subst_ninth is changed
+      - subst_ninth is changed
 
 - name: Delete SELinux file context path substitution of foo (again)
   sefcontext:
@@ -230,4 +230,4 @@
 
 - assert:
     that:
-    - subst_tenth is not changed
+      - subst_tenth is not changed
diff --git a/tests/integration/targets/setup_cron/tasks/main.yml b/tests/integration/targets/setup_cron/tasks/main.yml
index b669f0219f..92d2893403 100644
--- a/tests/integration/targets/setup_cron/tasks/main.yml
+++ b/tests/integration/targets/setup_cron/tasks/main.yml
@@ -11,65 +11,65 @@
 - when:
     - not (ansible_os_family == 'Alpine' and ansible_distribution_version is version('3.15', '<'))  # TODO
   block:
-  - name: Include distribution specific variables
-    include_vars: '{{ lookup(''first_found'', search) }}'
-    vars:
-      search:
-        files:
-        - '{{ ansible_distribution | lower }}.yml'
-        - '{{ ansible_os_family | lower }}.yml'
-        - '{{ ansible_system | lower }}.yml'
-        - default.yml
-        paths:
-        - vars
-  - name: install cron package
-    package:
-      name: '{{ cron_pkg }}'
-    when: (cron_pkg | default(false, true)) is truthy
-    register: cron_package_installed
-    until: cron_package_installed is success
-  - when: (faketime_pkg | default(false, true)) is truthy
-    block:
-    - name: install cron and faketime packages
+    - name: Include distribution specific variables
+      include_vars: '{{ lookup(''first_found'', search) }}'
+      vars:
+        search:
+          files:
+            - '{{ ansible_distribution | lower }}.yml'
+            - '{{ ansible_os_family | lower }}.yml'
+            - '{{ ansible_system | lower }}.yml'
+            - default.yml
+          paths:
+            - vars
+    - name: install cron package
       package:
-        name: '{{ faketime_pkg }}'
-      register: faketime_package_installed
-      until: faketime_package_installed is success
-    - name: Find libfaketime path
-      shell: '{{ list_pkg_files }} {{ faketime_pkg }} | grep -F libfaketime.so.1'
-      register: libfaketime_path
-    - when: ansible_service_mgr == 'systemd'
+        name: '{{ cron_pkg }}'
+      when: (cron_pkg | default(false, true)) is truthy
+      register: cron_package_installed
+      until: cron_package_installed is success
+    - when: (faketime_pkg | default(false, true)) is truthy
       block:
-      - name: create directory for cron drop-in file
-        file:
-          path: /etc/systemd/system/{{ cron_service }}.service.d
-          state: directory
-          owner: root
-          group: root
-          mode: '0755'
-      - name: Use faketime with cron service
-        copy:
-          content: '[Service]
+        - name: install cron and faketime packages
+          package:
+            name: '{{ faketime_pkg }}'
+          register: faketime_package_installed
+          until: faketime_package_installed is success
+        - name: Find libfaketime path
+          shell: '{{ list_pkg_files }} {{ faketime_pkg }} | grep -F libfaketime.so.1'
+          register: libfaketime_path
+        - when: ansible_service_mgr == 'systemd'
+          block:
+            - name: create directory for cron drop-in file
+              file:
+                path: /etc/systemd/system/{{ cron_service }}.service.d
+                state: directory
+                owner: root
+                group: root
+                mode: '0755'
+            - name: Use faketime with cron service
+              copy:
+                content: '[Service]
 
-            Environment=LD_PRELOAD={{ libfaketime_path.stdout_lines[0].strip() }}
+                  Environment=LD_PRELOAD={{ libfaketime_path.stdout_lines[0].strip() }}
 
-            Environment="FAKETIME=+0y x10"
+                  Environment="FAKETIME=+0y x10"
 
-            Environment=RANDOM_DELAY=0'
-          dest: /etc/systemd/system/{{ cron_service }}.service.d/faketime.conf
-          owner: root
-          group: root
-          mode: '0644'
-    - when: ansible_system == 'FreeBSD'
-      name: Use faketime with cron service
-      copy:
-        content: cron_env='LD_PRELOAD={{ libfaketime_path.stdout_lines[0].strip() }} FAKETIME="+0y x10"'
-        dest: /etc/rc.conf.d/cron
-        owner: root
-        group: wheel
-        mode: '0644'
-  - name: enable cron service
-    service:
-      daemon-reload: '{{ (ansible_service_mgr == ''systemd'') | ternary(true, omit) }}'
-      name: '{{ cron_service }}'
-      state: restarted
+                  Environment=RANDOM_DELAY=0'
+                dest: /etc/systemd/system/{{ cron_service }}.service.d/faketime.conf
+                owner: root
+                group: root
+                mode: '0644'
+        - when: ansible_system == 'FreeBSD'
+          name: Use faketime with cron service
+          copy:
+            content: cron_env='LD_PRELOAD={{ libfaketime_path.stdout_lines[0].strip() }} FAKETIME="+0y x10"'
+            dest: /etc/rc.conf.d/cron
+            owner: root
+            group: wheel
+            mode: '0644'
+    - name: enable cron service
+      service:
+        daemon-reload: '{{ (ansible_service_mgr == ''systemd'') | ternary(true, omit) }}'
+        name: '{{ cron_service }}'
+        state: restarted
diff --git a/tests/integration/targets/setup_docker/tasks/main.yml b/tests/integration/targets/setup_docker/tasks/main.yml
index 19bc7aa8c3..0c1b86951a 100644
--- a/tests/integration/targets/setup_docker/tasks/main.yml
+++ b/tests/integration/targets/setup_docker/tasks/main.yml
@@ -47,7 +47,7 @@
   become: true
   ansible.builtin.file:
     path: /var/run/docker.sock
-    mode: 0666
+    mode: "0666"
 
 - name: Install python "requests"
   ansible.builtin.pip:
diff --git a/tests/integration/targets/setup_etcd3/defaults/main.yml b/tests/integration/targets/setup_etcd3/defaults/main.yml
index f185ef0c25..3ca15a6220 100644
--- a/tests/integration/targets/setup_etcd3/defaults/main.yml
+++ b/tests/integration/targets/setup_etcd3/defaults/main.yml
@@ -9,7 +9,7 @@
 #
 etcd3_ver: "v3.2.14"
 etcd3_download_server: "https://storage.googleapis.com/etcd"
-#etcd3_download_server: "https://github.com/coreos/etcd/releases/download"
+# etcd3_download_server: "https://github.com/coreos/etcd/releases/download"
 etcd3_download_url: "{{ etcd3_download_server }}/{{ etcd3_ver }}/etcd-{{ etcd3_ver }}-linux-amd64.tar.gz"
 etcd3_download_location: /tmp/etcd-download-test
 etcd3_path: "{{ etcd3_download_location }}/etcd-{{ etcd3_ver }}-linux-amd64"
diff --git a/tests/integration/targets/setup_etcd3/tasks/main.yml b/tests/integration/targets/setup_etcd3/tasks/main.yml
index 1da52e225f..72252cfe51 100644
--- a/tests/integration/targets/setup_etcd3/tasks/main.yml
+++ b/tests/integration/targets/setup_etcd3/tasks/main.yml
@@ -15,90 +15,90 @@
 # setup etcd3 for supported distros
 - block:
 
-  - name: python 2
-    set_fact:
-      python_suffix: ""
-    when: ansible_python_version is version('3', '<')
+    - name: python 2
+      set_fact:
+        python_suffix: ""
+      when: ansible_python_version is version('3', '<')
 
-  - name: python 3
-    set_fact:
-      python_suffix: "-py3"
-    when: ansible_python_version is version('3', '>=')
+    - name: python 3
+      set_fact:
+        python_suffix: "-py3"
+      when: ansible_python_version is version('3', '>=')
 
-  - include_vars: '{{ item }}'
-    with_first_found:
-      - files:
-          - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}{{ python_suffix }}.yml'
-          - '{{ ansible_distribution }}-{{ ansible_distribution_version }}{{ python_suffix }}.yml'
-          - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}{{ python_suffix }}.yml'
-          - '{{ ansible_os_family }}{{ python_suffix }}.yml'
-          - 'default{{ python_suffix }}.yml'
-          - 'default.yml'
-        paths: '../vars'
+    - include_vars: '{{ item }}'
+      with_first_found:
+        - files:
+            - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}{{ python_suffix }}.yml'
+            - '{{ ansible_distribution }}-{{ ansible_distribution_version }}{{ python_suffix }}.yml'
+            - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}{{ python_suffix }}.yml'
+            - '{{ ansible_os_family }}{{ python_suffix }}.yml'
+            - 'default{{ python_suffix }}.yml'
+            - 'default.yml'
+          paths: '../vars'
 
-  - name: Upgrade setuptools python2 module
-    pip:
-      name: setuptools<45
-      extra_args: --upgrade
-      state: present
-    when: python_suffix == ''
+    - name: Upgrade setuptools python2 module
+      pip:
+        name: setuptools<45
+        extra_args: --upgrade
+        state: present
+      when: python_suffix == ''
 
-  - name: Install etcd3 python modules
-    pip:
-      name: "{{ etcd3_pip_module }}"
-      extra_args: --only-binary grpcio
-      state: present
+    - name: Install etcd3 python modules
+      pip:
+        name: "{{ etcd3_pip_module }}"
+        extra_args: --only-binary grpcio
+        state: present
 
-  # Check if re-installing etcd3 is required
-  - name: Check if etcd3ctl exists for reuse.
-    shell: "ETCDCTL_API=3 {{ etcd3_path }}/etcdctl --endpoints=localhost:2379 get foo"
-    args:
-      executable: /bin/bash
-    changed_when: false
-    failed_when: false
-    register: _testetcd3ctl
+    # Check if re-installing etcd3 is required
+    - name: Check if etcd3ctl exists for reuse.
+      shell: "ETCDCTL_API=3 {{ etcd3_path }}/etcdctl --endpoints=localhost:2379 get foo"
+      args:
+        executable: /bin/bash
+      changed_when: false
+      failed_when: false
+      register: _testetcd3ctl
+
+    - block:
+      # Installing etcd3
+        - name: If can't reuse, prepare download folder
+          file:
+            path: "{{ etcd3_download_location }}"
+            state: directory
+          register: _etcddownloadexists
+          when:
+            - _testetcd3ctl.rc != 0
+
+        - name: Delete download folder if already exists (to start clean)
+          file:
+            path: "{{ etcd3_download_location }}"
+            state: absent
+          when:
+            - _etcddownloadexists is not changed
+
+        - name: Recreate download folder if purged
+          file:
+            path: "{{ etcd3_download_location }}"
+            state: directory
+          when:
+            - _etcddownloadexists is not changed
+
+        - name: Download etcd3
+          unarchive:
+            src: "{{ etcd3_download_url }}"
+            dest: "{{ etcd3_download_location }}"
+            remote_src: true
+
+        # Running etcd3 and kill afterwards if it wasn't running before.
+        - name: Run etcd3
+          shell: "{{ etcd3_path }}/etcd &"
+          register: _etcd3run
+          changed_when: true
+
+      #    - name: kill etcd3
+      #      command: "pkill etcd"
 
-  - block:
-    # Installing etcd3
-    - name: If can't reuse, prepare download folder
-      file:
-        path: "{{ etcd3_download_location }}"
-        state: directory
-      register: _etcddownloadexists
       when:
         - _testetcd3ctl.rc != 0
 
-    - name: Delete download folder if already exists (to start clean)
-      file:
-        path: "{{ etcd3_download_location }}"
-        state: absent
-      when:
-        - _etcddownloadexists is not changed
-
-    - name: Recreate download folder if purged
-      file:
-        path: "{{ etcd3_download_location }}"
-        state: directory
-      when:
-        - _etcddownloadexists is not changed
-
-    - name: Download etcd3
-      unarchive:
-        src: "{{ etcd3_download_url }}"
-        dest: "{{ etcd3_download_location }}"
-        remote_src: true
-
-    # Running etcd3 and kill afterwards if it wasn't running before.
-    - name: Run etcd3
-      shell: "{{ etcd3_path }}/etcd &"
-      register: _etcd3run
-      changed_when: true
-
-#    - name: kill etcd3
-#      command: "pkill etcd"
-
-    when:
-      - _testetcd3ctl.rc != 0
-
   when:
-  - ansible_distribution | lower ~ "-" ~ ansible_distribution_major_version | lower != 'centos-6'
+    - ansible_distribution | lower ~ "-" ~ ansible_distribution_major_version | lower != 'centos-6'
diff --git a/tests/integration/targets/setup_flatpak_remote/meta/main.yaml b/tests/integration/targets/setup_flatpak_remote/meta/main.yaml
index 1b3d5b8758..982de6eb03 100644
--- a/tests/integration/targets/setup_flatpak_remote/meta/main.yaml
+++ b/tests/integration/targets/setup_flatpak_remote/meta/main.yaml
@@ -4,4 +4,4 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 dependencies:
-   - setup_remote_tmp_dir
+  - setup_remote_tmp_dir
diff --git a/tests/integration/targets/setup_flatpak_remote/tasks/main.yaml b/tests/integration/targets/setup_flatpak_remote/tasks/main.yaml
index 037784738a..e63cb379a0 100644
--- a/tests/integration/targets/setup_flatpak_remote/tasks/main.yaml
+++ b/tests/integration/targets/setup_flatpak_remote/tasks/main.yaml
@@ -13,20 +13,20 @@
       ansible_distribution == 'Fedora' or
       ansible_distribution == 'Ubuntu' and not ansible_distribution_major_version | int < 16
   block:
-  - name: Copy repo into place
-    unarchive:
-      src: repo.tar.xz
-      dest: '{{ remote_tmp_dir }}'
-      owner: root
-      group: root
-      mode: '0644'
-  - name: Create deterministic link to temp directory
-    file:
-      state: link
-      src: '{{ remote_tmp_dir }}/'
-      path: /tmp/flatpak
-      owner: root
-      group: root
-      mode: '0644'
-    notify: remove temporary flatpak link
+    - name: Copy repo into place
+      unarchive:
+        src: repo.tar.xz
+        dest: '{{ remote_tmp_dir }}'
+        owner: root
+        group: root
+        mode: '0644'
+    - name: Create deterministic link to temp directory
+      file:
+        state: link
+        src: '{{ remote_tmp_dir }}/'
+        path: /tmp/flatpak
+        owner: root
+        group: root
+        mode: '0644'
+      notify: remove temporary flatpak link
   become: true
diff --git a/tests/integration/targets/setup_openssl/tasks/main.yml b/tests/integration/targets/setup_openssl/tasks/main.yml
index b8e003710a..6490e65b41 100644
--- a/tests/integration/targets/setup_openssl/tasks/main.yml
+++ b/tests/integration/targets/setup_openssl/tasks/main.yml
@@ -13,13 +13,13 @@
   vars:
     search:
       files:
-      - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml'
-      - '{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml'
-      - '{{ ansible_distribution }}.yml'
-      - '{{ ansible_os_family }}.yml'
-      - default.yml
+        - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml'
+        - '{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml'
+        - '{{ ansible_distribution }}.yml'
+        - '{{ ansible_os_family }}.yml'
+        - default.yml
       paths:
-      - vars
+        - vars
 
 - name: Install OpenSSL
   become: true
@@ -29,24 +29,24 @@
 
 - when: ansible_facts.distribution ~ ansible_facts.distribution_major_version not in  ['CentOS6', 'RedHat6']
   block:
-  - name: Install cryptography (Python 3)
-    become: true
-    package:
-      name: '{{ cryptography_package_name_python3 }}'
-    when: not cryptography_from_pip and ansible_python_version is version('3.0', '>=')
+    - name: Install cryptography (Python 3)
+      become: true
+      package:
+        name: '{{ cryptography_package_name_python3 }}'
+      when: not cryptography_from_pip and ansible_python_version is version('3.0', '>=')
 
-  - name: Install cryptography (Python 2)
-    become: true
-    package:
-      name: '{{ cryptography_package_name }}'
-    when: not cryptography_from_pip and ansible_python_version is version('3.0', '<')
+    - name: Install cryptography (Python 2)
+      become: true
+      package:
+        name: '{{ cryptography_package_name }}'
+      when: not cryptography_from_pip and ansible_python_version is version('3.0', '<')
 
-  - name: Install cryptography (pip)
-    become: true
-    pip:
-      name: cryptography>=3.3
-      extra_args: "-c {{ remote_constraints }}"
-    when: cryptography_from_pip
+    - name: Install cryptography (pip)
+      become: true
+      pip:
+        name: cryptography>=3.3
+        extra_args: "-c {{ remote_constraints }}"
+      when: cryptography_from_pip
 
 - name: Install pyOpenSSL (Python 3)
   become: true
diff --git a/tests/integration/targets/setup_postgresql_db/defaults/main.yml b/tests/integration/targets/setup_postgresql_db/defaults/main.yml
index 1a33ecafab..8480995959 100644
--- a/tests/integration/targets/setup_postgresql_db/defaults/main.yml
+++ b/tests/integration/targets/setup_postgresql_db/defaults/main.yml
@@ -6,8 +6,8 @@
 postgresql_service: postgresql
 
 postgresql_packages:
-    - postgresql-server
-    - python-psycopg2
+  - postgresql-server
+  - python-psycopg2
 
 pg_user: postgres
 pg_group: root
diff --git a/tests/integration/targets/setup_postgresql_db/tasks/main.yml b/tests/integration/targets/setup_postgresql_db/tasks/main.yml
index 99668ebc95..d6b8701e9a 100644
--- a/tests/integration/targets/setup_postgresql_db/tasks/main.yml
+++ b/tests/integration/targets/setup_postgresql_db/tasks/main.yml
@@ -35,12 +35,12 @@
   vars:
     params:
       files:
-      - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}{{ python_suffix }}.yml'
-      - '{{ ansible_distribution }}-{{ ansible_distribution_version }}{{ python_suffix }}.yml'
-      - '{{ ansible_os_family }}{{ python_suffix }}.yml'
-      - default{{ python_suffix }}.yml
+        - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}{{ python_suffix }}.yml'
+        - '{{ ansible_distribution }}-{{ ansible_distribution_version }}{{ python_suffix }}.yml'
+        - '{{ ansible_os_family }}{{ python_suffix }}.yml'
+        - default{{ python_suffix }}.yml
       paths:
-      - '{{ role_path }}/vars'
+        - '{{ role_path }}/vars'
 
 - name: make sure the dbus service is started under systemd
   systemd:
@@ -79,8 +79,8 @@
   ignore_errors: true
   when: ansible_os_family == "Debian"
   loop:
-  - /etc/postgresql
-  - /var/lib/postgresql
+    - /etc/postgresql
+    - /var/lib/postgresql
   loop_control:
     loop_var: loop_item
 
@@ -170,38 +170,38 @@
     name: '{{ item }}'
     state: present
   with_items:
-  - pt_BR
-  - es_ES
+    - pt_BR
+    - es_ES
   when: ansible_os_family == 'Debian'
 
 - block:
-  - name: Install langpacks (RHEL8)
-    yum:
-      name:
-      - glibc-langpack-es
-      - glibc-langpack-pt
-      - glibc-all-langpacks
-      state: present
-    when: ansible_distribution_major_version is version('8', '>=')
+    - name: Install langpacks (RHEL8)
+      yum:
+        name:
+          - glibc-langpack-es
+          - glibc-langpack-pt
+          - glibc-all-langpacks
+        state: present
+      when: ansible_distribution_major_version is version('8', '>=')
 
-  - name: Check if locales need to be generated (RedHat)
-    shell: localedef --list-archive | grep -a -q '^{{ locale }}$'
-    register: locale_present
-    ignore_errors: true
-    with_items:
-    - es_ES
-    - pt_BR
-    loop_control:
-      loop_var: locale
+    - name: Check if locales need to be generated (RedHat)
+      shell: localedef --list-archive | grep -a -q '^{{ locale }}$'
+      register: locale_present
+      ignore_errors: true
+      with_items:
+        - es_ES
+        - pt_BR
+      loop_control:
+        loop_var: locale
 
-  - name: Reinstall internationalization files
-    shell: yum -y reinstall glibc-common || yum -y install glibc-common
-    when: locale_present is failed
+    - name: Reinstall internationalization files
+      shell: yum -y reinstall glibc-common || yum -y install glibc-common
+      when: locale_present is failed
 
-  - name: Generate locale (RedHat)
-    command: localedef -f ISO-8859-1 -i {{ item.locale }} {{ item.locale }}
-    when: item is failed
-    with_items: '{{ locale_present.results }}'
+    - name: Generate locale (RedHat)
+      command: localedef -f ISO-8859-1 -i {{ item.locale }} {{ item.locale }}
+      when: item is failed
+      with_items: '{{ locale_present.results }}'
   when: ansible_os_family == 'RedHat' and ansible_distribution != 'Fedora'
 
 - name: Install glibc langpacks (Fedora >= 24)
@@ -209,8 +209,8 @@
     name: '{{ item }}'
     state: latest
   with_items:
-  - glibc-langpack-es
-  - glibc-langpack-pt
+    - glibc-langpack-es
+    - glibc-langpack-pt
   when: ansible_distribution == 'Fedora' and ansible_distribution_major_version is version('24', '>=')
 
 - name: enable postgresql service (FreeBSD)
@@ -257,9 +257,9 @@
     dest: /usr/share/postgresql/{{ pg_ver }}/extension/{{ item }}
     mode: '0444'
   with_items:
-  - dummy--1.0.sql
-  - dummy--2.0.sql
-  - dummy--3.0.sql
+    - dummy--1.0.sql
+    - dummy--2.0.sql
+    - dummy--3.0.sql
   when: ansible_os_family == 'Debian'
 
 - name: add update paths
@@ -268,8 +268,8 @@
     mode: '0444'
     state: touch
   with_items:
-  - dummy--1.0--2.0.sql
-  - dummy--2.0--3.0.sql
+    - dummy--1.0--2.0.sql
+    - dummy--2.0--3.0.sql
   when: ansible_os_family == 'Debian'
 
 - name: Get PostgreSQL version
diff --git a/tests/integration/targets/setup_redis_replication/defaults/main.yml b/tests/integration/targets/setup_redis_replication/defaults/main.yml
index a283fa5725..cc2d632b85 100644
--- a/tests/integration/targets/setup_redis_replication/defaults/main.yml
+++ b/tests/integration/targets/setup_redis_replication/defaults/main.yml
@@ -6,21 +6,21 @@
 # General
 redis_packages:
   Alpine:
-  - redis
+    - redis
   Archlinux:
-  - valkey
+    - valkey
   Debian:
-  - redis-server
+    - redis-server
   Ubuntu:
-  - redis-server
+    - redis-server
   openSUSE Leap:
-  - redis
+    - redis
   Fedora:
-  - redis
+    - redis
   CentOS:
-  - redis
+    - redis
   FreeBSD:
-  - redis
+    - redis
 
 redis_user:
   Alpine: redis
diff --git a/tests/integration/targets/setup_redis_replication/handlers/main.yml b/tests/integration/targets/setup_redis_replication/handlers/main.yml
index a0595cbe30..46c7571da1 100644
--- a/tests/integration/targets/setup_redis_replication/handlers/main.yml
+++ b/tests/integration/targets/setup_redis_replication/handlers/main.yml
@@ -28,12 +28,12 @@
     path: "{{ item }}"
     state: absent
   loop:
-  - "{{ master_conf }}"
-  - "{{ master_datadir }}"
-  - "{{ master_logdir }}"
-  - /var/run/redis_{{ master_port }}.pid
-  - "{{ replica_conf }}"
-  - "{{ replica_datadir }}"
-  - "{{ replica_logdir }}"
-  - /var/run/redis_{{ replica_port }}.pid
+    - "{{ master_conf }}"
+    - "{{ master_datadir }}"
+    - "{{ master_logdir }}"
+    - /var/run/redis_{{ master_port }}.pid
+    - "{{ replica_conf }}"
+    - "{{ replica_datadir }}"
+    - "{{ replica_logdir }}"
+    - /var/run/redis_{{ replica_port }}.pid
   listen: cleanup redis
diff --git a/tests/integration/targets/setup_redis_replication/meta/main.yml b/tests/integration/targets/setup_redis_replication/meta/main.yml
index db2617f4ce..2d6cafb56f 100644
--- a/tests/integration/targets/setup_redis_replication/meta/main.yml
+++ b/tests/integration/targets/setup_redis_replication/meta/main.yml
@@ -4,5 +4,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 dependencies:
-- setup_pkg_mgr
-- setup_remote_constraints
+  - setup_pkg_mgr
+  - setup_remote_constraints
diff --git a/tests/integration/targets/setup_redis_replication/tasks/main.yml b/tests/integration/targets/setup_redis_replication/tasks/main.yml
index 076a473594..92ac4fe750 100644
--- a/tests/integration/targets/setup_redis_replication/tasks/main.yml
+++ b/tests/integration/targets/setup_redis_replication/tasks/main.yml
@@ -9,4 +9,4 @@
 
 - import_tasks: setup_redis_cluster.yml
   when:
-  - ansible_distribution in ['CentOS', 'Fedora', 'FreeBSD', 'openSUSE Leap', 'Ubuntu', 'Debian', 'Archlinux', 'Alpine']
+    - ansible_distribution in ['CentOS', 'Fedora', 'FreeBSD', 'openSUSE Leap', 'Ubuntu', 'Debian', 'Archlinux', 'Alpine']
diff --git a/tests/integration/targets/setup_redis_replication/tasks/setup_redis_cluster.yml b/tests/integration/targets/setup_redis_replication/tasks/setup_redis_cluster.yml
index ac02a6dca5..3c9c62ba00 100644
--- a/tests/integration/targets/setup_redis_replication/tasks/setup_redis_cluster.yml
+++ b/tests/integration/targets/setup_redis_replication/tasks/setup_redis_cluster.yml
@@ -27,10 +27,10 @@
     owner: "{{ redis_user[ansible_distribution] }}"
     group: "{{ redis_user[ansible_distribution] }}"
   loop:
-  - "{{ master_datadir }}"
-  - "{{ master_logdir }}"
-  - "{{ replica_datadir }}"
-  - "{{ replica_logdir }}"
+    - "{{ master_datadir }}"
+    - "{{ master_logdir }}"
+    - "{{ replica_datadir }}"
+    - "{{ replica_logdir }}"
 
 - name: Create redis configs
   copy:
@@ -44,14 +44,14 @@
       requirepass {{ redis_password }}
       masterauth {{ redis_password }}
   loop:
-  - file: "{{ master_conf }}"
-    port: "{{ master_port }}"
-    logdir: "{{ master_logdir }}"
-    datadir: "{{ master_datadir }}"
-  - file: "{{ replica_conf }}"
-    port: "{{ replica_port }}"
-    logdir: "{{ replica_logdir }}"
-    datadir: "{{ replica_datadir }}"
+    - file: "{{ master_conf }}"
+      port: "{{ master_port }}"
+      logdir: "{{ master_logdir }}"
+      datadir: "{{ master_datadir }}"
+    - file: "{{ replica_conf }}"
+      port: "{{ replica_port }}"
+      logdir: "{{ replica_logdir }}"
+      datadir: "{{ replica_datadir }}"
 
 - name: Start redis master
   ansible.builtin.command: "{{ redis_bin[ansible_distribution] }} {{ master_conf }}"
diff --git a/tests/integration/targets/setup_wildfly_server/handlers/main.yml b/tests/integration/targets/setup_wildfly_server/handlers/main.yml
index 1383b15753..38522db30a 100644
--- a/tests/integration/targets/setup_wildfly_server/handlers/main.yml
+++ b/tests/integration/targets/setup_wildfly_server/handlers/main.yml
@@ -14,5 +14,5 @@
     path: '{{ item }}'
     state: absent
   loop:
-  - '{{ wf_service_file_path }}'
-  - '{{ default_deploy_root }}'
+    - '{{ wf_service_file_path }}'
+    - '{{ default_deploy_root }}'
diff --git a/tests/integration/targets/setup_wildfly_server/meta/main.yml b/tests/integration/targets/setup_wildfly_server/meta/main.yml
index 2d29ebb672..ca1915e05c 100644
--- a/tests/integration/targets/setup_wildfly_server/meta/main.yml
+++ b/tests/integration/targets/setup_wildfly_server/meta/main.yml
@@ -4,5 +4,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 dependencies:
-- setup_pkg_mgr
-- setup_remote_tmp_dir
+  - setup_pkg_mgr
+  - setup_remote_tmp_dir
diff --git a/tests/integration/targets/snap_alias/tasks/test.yml b/tests/integration/targets/snap_alias/tasks/test.yml
index 50e6e33b49..87a7419358 100644
--- a/tests/integration/targets/snap_alias/tasks/test.yml
+++ b/tests/integration/targets/snap_alias/tasks/test.yml
@@ -43,12 +43,12 @@
 - name: assert single alias
   assert:
     that:
-        - alias_single_0 is changed
-        - alias_single_1 is changed
-        - alias_single_2 is not changed
-        - alias_single_3 is not changed
-        - 'alias_single_1.snap_aliases["hello-world"] == ["hw"]'
-        - 'alias_single_3.snap_aliases["hello-world"] == ["hw"]'
+      - alias_single_0 is changed
+      - alias_single_1 is changed
+      - alias_single_2 is not changed
+      - alias_single_3 is not changed
+      - 'alias_single_1.snap_aliases["hello-world"] == ["hw"]'
+      - 'alias_single_3.snap_aliases["hello-world"] == ["hw"]'
 
 - name: Create multiple aliases (check mode)
   community.general.snap_alias:
@@ -79,12 +79,12 @@
 - name: assert multi alias
   assert:
     that:
-        - alias_multi_0 is changed
-        - alias_multi_1 is changed
-        - alias_multi_2 is not changed
-        - alias_multi_3 is not changed
-        - 'alias_multi_1.snap_aliases["hello-world"] == ["hw", "hw2", "hw3"]'
-        - 'alias_multi_3.snap_aliases["hello-world"] == ["hw", "hw2", "hw3"]'
+      - alias_multi_0 is changed
+      - alias_multi_1 is changed
+      - alias_multi_2 is not changed
+      - alias_multi_3 is not changed
+      - 'alias_multi_1.snap_aliases["hello-world"] == ["hw", "hw2", "hw3"]'
+      - 'alias_multi_3.snap_aliases["hello-world"] == ["hw", "hw2", "hw3"]'
 
 - name: Remove one specific alias (check mode)
   community.general.snap_alias:
@@ -115,12 +115,12 @@
 - name: assert remove alias
   assert:
     that:
-        - alias_remove_0 is changed
-        - alias_remove_1 is changed
-        - alias_remove_2 is not changed
-        - alias_remove_3 is not changed
-        - 'alias_remove_1.snap_aliases["hello-world"] == ["hw2", "hw3"]'
-        - 'alias_remove_3.snap_aliases["hello-world"] == ["hw2", "hw3"]'
+      - alias_remove_0 is changed
+      - alias_remove_1 is changed
+      - alias_remove_2 is not changed
+      - alias_remove_3 is not changed
+      - 'alias_remove_1.snap_aliases["hello-world"] == ["hw2", "hw3"]'
+      - 'alias_remove_3.snap_aliases["hello-world"] == ["hw2", "hw3"]'
 
 - name: Remove all aliases for snap (check mode)
   community.general.snap_alias:
@@ -151,9 +151,9 @@
 - name: assert remove_all alias
   assert:
     that:
-        - alias_remove_all_0 is changed
-        - alias_remove_all_1 is changed
-        - alias_remove_all_2 is not changed
-        - alias_remove_all_3 is not changed
-        - 'alias_remove_all_1.snap_aliases["hello-world"] == []'
-        - 'alias_remove_all_3.snap_aliases["hello-world"] == []'
+      - alias_remove_all_0 is changed
+      - alias_remove_all_1 is changed
+      - alias_remove_all_2 is not changed
+      - alias_remove_all_3 is not changed
+      - 'alias_remove_all_1.snap_aliases["hello-world"] == []'
+      - 'alias_remove_all_3.snap_aliases["hello-world"] == []'
diff --git a/tests/integration/targets/spectrum_model_attrs/tasks/main.yml b/tests/integration/targets/spectrum_model_attrs/tasks/main.yml
index 42e53d7d7d..ecc1eb6005 100644
--- a/tests/integration/targets/spectrum_model_attrs/tasks/main.yml
+++ b/tests/integration/targets/spectrum_model_attrs/tasks/main.yml
@@ -14,65 +14,65 @@
     or oneclick_url is not defined
 
 - block:
-  - name: "001: Enforce maintenance mode for {{ model_name }} with a note about why [check_mode test]"
-    spectrum_model_attrs: &mm_enabled_args
-      url: "{{ oneclick_url }}"
-      username: "{{ oneclick_username }}"
-      password: "{{ oneclick_password }}"
-      name: "{{ model_name }}"
-      type: "{{ model_type }}"
-      validate_certs: false
-      attributes:
-        - name: "isManaged"
-          value: "false"
-        - name: "Notes"
-          value: "{{ note_mm_enabled }}"
-    check_mode: true
-    register: mm_enabled_check_mode
+    - name: "001: Enforce maintenance mode for {{ model_name }} with a note about why [check_mode test]"
+      spectrum_model_attrs: &mm_enabled_args
+        url: "{{ oneclick_url }}"
+        username: "{{ oneclick_username }}"
+        password: "{{ oneclick_password }}"
+        name: "{{ model_name }}"
+        type: "{{ model_type }}"
+        validate_certs: false
+        attributes:
+          - name: "isManaged"
+            value: "false"
+          - name: "Notes"
+            value: "{{ note_mm_enabled }}"
+      check_mode: true
+      register: mm_enabled_check_mode
 
-  - name: "001: assert that changes were made"
-    assert:
-      that:
-        - mm_enabled_check_mode is changed
+    - name: "001: assert that changes were made"
+      assert:
+        that:
+          - mm_enabled_check_mode is changed
 
-  - name: "001: assert that changed_attrs is properly set"
-    assert:
-      that:
-        - mm_enabled_check_mode.changed_attrs.Notes == note_mm_enabled
-        - mm_enabled_check_mode.changed_attrs.isManaged == "false"
+    - name: "001: assert that changed_attrs is properly set"
+      assert:
+        that:
+          - mm_enabled_check_mode.changed_attrs.Notes == note_mm_enabled
+          - mm_enabled_check_mode.changed_attrs.isManaged == "false"
 
-  - name: "002: Enforce maintenance mode for {{ model_name }} with a note about why"
-    spectrum_model_attrs:
-      <<: *mm_enabled_args
-    register: mm_enabled
-    check_mode: false
+    - name: "002: Enforce maintenance mode for {{ model_name }} with a note about why"
+      spectrum_model_attrs:
+        <<: *mm_enabled_args
+      register: mm_enabled
+      check_mode: false
 
-  - name: "002: assert that changes were made"
-    assert:
-      that:
-        - mm_enabled is changed
+    - name: "002: assert that changes were made"
+      assert:
+        that:
+          - mm_enabled is changed
 
-  - name: "002: assert that changed_attrs is properly set"
-    assert:
-      that:
-        - mm_enabled.changed_attrs.Notes == note_mm_enabled
-        - mm_enabled.changed_attrs.isManaged == "false"
+    - name: "002: assert that changed_attrs is properly set"
+      assert:
+        that:
+          - mm_enabled.changed_attrs.Notes == note_mm_enabled
+          - mm_enabled.changed_attrs.isManaged == "false"
 
-  - name: "003: Enforce maintenance mode for {{ model_name }} with a note about why [idempontence test]"
-    spectrum_model_attrs:
-      <<: *mm_enabled_args
-    register: mm_enabled_idp
-    check_mode: false
+    - name: "003: Enforce maintenance mode for {{ model_name }} with a note about why [idempontence test]"
+      spectrum_model_attrs:
+        <<: *mm_enabled_args
+      register: mm_enabled_idp
+      check_mode: false
 
-  - name: "003: assert that changes were not made"
-    assert:
-      that:
-        - mm_enabled_idp is not changed
+    - name: "003: assert that changes were not made"
+      assert:
+        that:
+          - mm_enabled_idp is not changed
 
-  - name: "003: assert that changed_attrs is not set"
-    assert:
-      that:
-        - mm_enabled_idp.changed_attrs == {}
+    - name: "003: assert that changed_attrs is not set"
+      assert:
+        that:
+          - mm_enabled_idp.changed_attrs == {}
 
   vars:
     note_mm_enabled: "MM set via CO #1234 by OJ Simpson"
diff --git a/tests/integration/targets/ssh_config/tasks/options.yml b/tests/integration/targets/ssh_config/tasks/options.yml
index d342943975..2f93b952bd 100644
--- a/tests/integration/targets/ssh_config/tasks/options.yml
+++ b/tests/integration/targets/ssh_config/tasks/options.yml
@@ -20,7 +20,7 @@
     identities_only: true
     controlmaster: "auto"
     controlpath: "~/.ssh/sockets/%r@%h-%p"
-    controlpersist: yes
+    controlpersist: "yes"
     dynamicforward: '10080'
     other_options:
       serveraliveinterval: '30'
@@ -57,7 +57,7 @@
     identities_only: true
     controlmaster: "auto"
     controlpath: "~/.ssh/sockets/%r@%h-%p"
-    controlpersist: yes
+    controlpersist: "yes"
     dynamicforward: '10080'
     other_options:
       serveraliveinterval: '30'
@@ -83,7 +83,7 @@
     identities_only: true
     controlmaster: "auto"
     controlpath: "~/.ssh/sockets/%r@%h-%p"
-    controlpersist: yes
+    controlpersist: "yes"
     dynamicforward: '10080'
     other_options:
       serveraliveinterval: '30'
@@ -126,7 +126,7 @@
     add_keys_to_agent: false
     host_key_algorithms: "+ssh-ed25519"
     identities_only: false
-    controlmaster: no
+    controlmaster: "no"
     controlpath: "~/.ssh/new-sockets/%r@%h-%p"
     controlpersist: "600"
     dynamicforward: '11080'
@@ -154,7 +154,7 @@
     add_keys_to_agent: false
     host_key_algorithms: "+ssh-ed25519"
     identities_only: false
-    controlmaster: no
+    controlmaster: "no"
     controlpath: "~/.ssh/new-sockets/%r@%h-%p"
     controlpersist: "600"
     dynamicforward: '11080'
@@ -298,7 +298,7 @@
     identities_only: true
     controlmaster: "auto"
     controlpath: "~/.ssh/sockets/%r@%h-%p"
-    controlpersist: yes
+    controlpersist: "yes"
     dynamicforward: '10080'
     other_options:
       serveraliveinterval: '30'
@@ -335,7 +335,7 @@
     identities_only: true
     controlmaster: "auto"
     controlpath: "~/.ssh/sockets/%r@%h-%p"
-    controlpersist: yes
+    controlpersist: "yes"
     dynamicforward: '10080'
     other_options:
       serveraliveinterval: '30'
@@ -361,7 +361,7 @@
     identities_only: true
     controlmaster: "auto"
     controlpath: "~/.ssh/sockets/%r@%h-%p"
-    controlpersist: yes
+    controlpersist: "yes"
     dynamicforward: '10080'
     other_options:
       serveraliveinterval: '30'
@@ -404,7 +404,7 @@
     add_keys_to_agent: false
     host_key_algorithms: "+ssh-ed25519"
     identities_only: false
-    controlmaster: no
+    controlmaster: "no"
     controlpath: "~/.ssh/new-sockets/%r@%h-%p"
     controlpersist: "600"
     dynamicforward: '11080'
@@ -432,7 +432,7 @@
     add_keys_to_agent: false
     host_key_algorithms: "+ssh-ed25519"
     identities_only: false
-    controlmaster: no
+    controlmaster: "no"
     controlpath: "~/.ssh/new-sockets/%r@%h-%p"
     controlpersist: "600"
     dynamicforward: '11080'
diff --git a/tests/integration/targets/supervisorctl/tasks/main.yml b/tests/integration/targets/supervisorctl/tasks/main.yml
index 24b505d9ad..dd47971a31 100644
--- a/tests/integration/targets/supervisorctl/tasks/main.yml
+++ b/tests/integration/targets/supervisorctl/tasks/main.yml
@@ -15,45 +15,45 @@
     - ansible_version.minor != 16 or ansible_distribution not in ['CentOS', 'openSUSE Leap']
   block:
     - block:
-      - tempfile:
-          state: directory
-          suffix: supervisorctl-tests
-        register: supervisord_sock_path
+        - tempfile:
+            state: directory
+            suffix: supervisorctl-tests
+          register: supervisord_sock_path
 
-      - command: 'echo {{ remote_tmp_dir }}'
-        register: echo
-      - set_fact:
-          remote_dir: '{{ echo.stdout }}'
+        - command: 'echo {{ remote_tmp_dir }}'
+          register: echo
+        - set_fact:
+            remote_dir: '{{ echo.stdout }}'
 
-      - include_vars: '{{ item }}'
-        with_first_found:
-          - files:
-              - '{{ ansible_distribution }}.yml'
-              - '{{ ansible_os_family }}.yml'
-              - 'defaults.yml'
+        - include_vars: '{{ item }}'
+          with_first_found:
+            - files:
+                - '{{ ansible_distribution }}.yml'
+                - '{{ ansible_os_family }}.yml'
+                - 'defaults.yml'
 
-      - include_tasks: '{{ item }}'
-        with_first_found:
-          - files:
-            - 'install_{{ ansible_distribution }}.yml' # CentOS
-            - 'install_{{ ansible_os_family }}.yml'    # RedHat
-            - 'install_{{ ansible_system }}.yml'       # Linux
+        - include_tasks: '{{ item }}'
+          with_first_found:
+            - files:
+                - 'install_{{ ansible_distribution }}.yml' # CentOS
+                - 'install_{{ ansible_os_family }}.yml'    # RedHat
+                - 'install_{{ ansible_system }}.yml'       # Linux
 
-      - include_tasks: test.yml
-        with_items:
+        - include_tasks: test.yml
+          with_items:
             - { username: '', password: '' }
             - { username: 'testétest', password: 'passéword' } # non-ASCII credentials
-        loop_control:
-          loop_var: credentials
+          loop_control:
+            loop_var: credentials
 
       always:
-      - include_tasks: '{{ item }}'
-        with_first_found:
-          - files:
-            - 'uninstall_{{ ansible_distribution }}.yml' # CentOS
-            - 'uninstall_{{ ansible_os_family }}.yml'    # RedHat
-            - 'uninstall_{{ ansible_system }}.yml'       # Linux
+        - include_tasks: '{{ item }}'
+          with_first_found:
+            - files:
+                - 'uninstall_{{ ansible_distribution }}.yml' # CentOS
+                - 'uninstall_{{ ansible_os_family }}.yml'    # RedHat
+                - 'uninstall_{{ ansible_system }}.yml'       # Linux
 
-      - file:
-          path: '{{ supervisord_sock_path.path }}'
-          state: absent
+        - file:
+            path: '{{ supervisord_sock_path.path }}'
+            state: absent
diff --git a/tests/integration/targets/systemd_info/tasks/main.yml b/tests/integration/targets/systemd_info/tasks/main.yml
index 1feed2d3e7..e41816195b 100644
--- a/tests/integration/targets/systemd_info/tasks/main.yml
+++ b/tests/integration/targets/systemd_info/tasks/main.yml
@@ -14,8 +14,8 @@
 - name: Test systemd_facts
   block:
 
-  - name: Run tests
-    import_tasks: tests.yml
+    - name: Run tests
+      import_tasks: tests.yml
 
   when: >
     (ansible_distribution in ['RedHat', 'CentOS', 'ScientificLinux'] and ansible_distribution_major_version is version('7', '>=')) or
diff --git a/tests/integration/targets/terraform/tasks/complex_variables.yml b/tests/integration/targets/terraform/tasks/complex_variables.yml
index 9788a3eed1..81c708e34d 100644
--- a/tests/integration/targets/terraform/tasks/complex_variables.yml
+++ b/tests/integration/targets/terraform/tasks/complex_variables.yml
@@ -7,7 +7,7 @@
   ansible.builtin.file:
     path: "{{ terraform_project_dir }}/complex_vars"
     state: directory
-    mode: 0755
+    mode: "0755"
 
 - name: copy terraform files to work space
   ansible.builtin.copy:
@@ -49,10 +49,10 @@
         one
         two
       list_of_lists:
-        - [ 1 ]
-        - [ 11, 12, 13 ]
-        - [ 2 ]
-        - [ 3 ]
+        - [1]
+        - [11, 12, 13]
+        - [2]
+        - [3]
     state: present
   register: terraform_init_result
 
diff --git a/tests/integration/targets/terraform/tasks/main.yml b/tests/integration/targets/terraform/tasks/main.yml
index d04757d8e4..513c3ef225 100644
--- a/tests/integration/targets/terraform/tasks/main.yml
+++ b/tests/integration/targets/terraform/tasks/main.yml
@@ -8,20 +8,20 @@
 
 - name: Check for existing Terraform in path
   block:
-  - name: Check if terraform is present in path
-    ansible.builtin.command: "command -v terraform"
-    register: terraform_binary_path
-    ignore_errors: true
+    - name: Check if terraform is present in path
+      ansible.builtin.command: "command -v terraform"
+      register: terraform_binary_path
+      ignore_errors: true
 
-  - name: Check Terraform version
-    ansible.builtin.command: terraform version
-    register: terraform_version_output
-    when: terraform_binary_path.rc == 0
+    - name: Check Terraform version
+      ansible.builtin.command: terraform version
+      register: terraform_version_output
+      when: terraform_binary_path.rc == 0
 
-  - name: Set terraform version
-    ansible.builtin.set_fact:
-      terraform_version_installed: "{{ terraform_version_output.stdout | regex_search('(?!Terraform.*v)([0-9]+\\.[0-9]+\\.[0-9]+)') }}"
-    when: terraform_version_output.changed
+    - name: Set terraform version
+      ansible.builtin.set_fact:
+        terraform_version_installed: "{{ terraform_version_output.stdout | regex_search('(?!Terraform.*v)([0-9]+\\.[0-9]+\\.[0-9]+)') }}"
+      when: terraform_version_output.changed
 
 # This block handles the tasks of installing the Terraform binary. This happens if there is no existing
 # terraform in $PATH OR version does not match `terraform_version`.
@@ -29,22 +29,22 @@
 - name: Execute Terraform install tasks
   block:
 
-  - name: Install Terraform
-    ansible.builtin.debug:
-      msg: "Installing terraform {{ terraform_version }}, found: {{ terraform_version_installed | default('no terraform binary found') }}."
+    - name: Install Terraform
+      ansible.builtin.debug:
+        msg: "Installing terraform {{ terraform_version }}, found: {{ terraform_version_installed | default('no terraform binary found') }}."
 
-  - name: Ensure unzip is present
-    ansible.builtin.package:
-      name: unzip
-      state: present
+    - name: Ensure unzip is present
+      ansible.builtin.package:
+        name: unzip
+        state: present
 
-  - name: Install Terraform binary
-    ansible.builtin.unarchive:
-      src: "{{ terraform_url }}"
-      dest: "{{ remote_tmp_dir }}"
-      mode: 0755
-      remote_src: true
-      validate_certs: "{{ validate_certs }}"
+    - name: Install Terraform binary
+      ansible.builtin.unarchive:
+        src: "{{ terraform_url }}"
+        dest: "{{ remote_tmp_dir }}"
+        mode: "0755"
+        remote_src: true
+        validate_certs: "{{ validate_certs }}"
 
   when: terraform_version_installed is not defined or terraform_version_installed != terraform_version
 
diff --git a/tests/integration/targets/terraform/tasks/test_provider_upgrade.yml b/tests/integration/targets/terraform/tasks/test_provider_upgrade.yml
index b20182c9f3..28d1d8ea22 100644
--- a/tests/integration/targets/terraform/tasks/test_provider_upgrade.yml
+++ b/tests/integration/targets/terraform/tasks/test_provider_upgrade.yml
@@ -7,7 +7,7 @@
   file:
     path: "{{ terraform_project_dir }}/{{ item['name'] }}"
     state: directory
-    mode: 0755
+    mode: "0755"
   loop: "{{ terraform_provider_versions }}"
   loop_control:
     index_var: provider_index
diff --git a/tests/integration/targets/test_ansible_type/tasks/tasks.yml b/tests/integration/targets/test_ansible_type/tasks/tasks.yml
index eb1ba2ec66..443b36d36f 100644
--- a/tests/integration/targets/test_ansible_type/tasks/tasks.yml
+++ b/tests/integration/targets/test_ansible_type/tasks/tasks.yml
@@ -63,7 +63,7 @@
   assert:
     that: '"abc" is community.general.ansible_type(dtype)'
     success_msg: '"abc" is {{ dtype }}'
-    fail_msg:  '"abc" is {{ result }}'
+    fail_msg: '"abc" is {{ result }}'
     quiet: '{{ quiet_test | default(true) | bool }}'
   vars:
     result: '{{ "abc" | community.general.reveal_ansible_type }}'
@@ -73,7 +73,7 @@
   assert:
     that: '123 is community.general.ansible_type(dtype)'
     success_msg: '123 is {{ dtype }}'
-    fail_msg:  '123 is {{ result }}'
+    fail_msg: '123 is {{ result }}'
     quiet: '{{ quiet_test | default(true) | bool }}'
   vars:
     result: '{{ 123 | community.general.reveal_ansible_type }}'
@@ -83,7 +83,7 @@
   assert:
     that: '123.45 is community.general.ansible_type(dtype)'
     success_msg: '123.45 is {{ dtype }}'
-    fail_msg:  '123.45 is {{ result }}'
+    fail_msg: '123.45 is {{ result }}'
     quiet: '{{ quiet_test | default(true) | bool }}'
   vars:
     result: '{{ 123.45 | community.general.reveal_ansible_type }}'
@@ -93,7 +93,7 @@
   assert:
     that: 'true is community.general.ansible_type(dtype)'
     success_msg: 'true is {{ dtype }}'
-    fail_msg:  'true is {{ result }}'
+    fail_msg: 'true is {{ result }}'
     quiet: '{{ quiet_test | default(true) | bool }}'
   vars:
     result: '{{ true | community.general.reveal_ansible_type }}'
@@ -103,7 +103,7 @@
   assert:
     that: '["a", "b", "c"] is community.general.ansible_type(dtype)'
     success_msg: '["a", "b", "c"] is {{ dtype }}'
-    fail_msg:  '["a", "b", "c"] is {{ result }}'
+    fail_msg: '["a", "b", "c"] is {{ result }}'
     quiet: '{{ quiet_test | default(true) | bool }}'
   vars:
     result: '{{ ["a", "b", "c"] | community.general.reveal_ansible_type }}'
@@ -113,7 +113,7 @@
   assert:
     that: '[{"a": 1}, {"b": 2}] is community.general.ansible_type(dtype)'
     success_msg: '[{"a": 1}, {"b": 2}] is {{ dtype }}'
-    fail_msg:  '[{"a": 1}, {"b": 2}] is {{ result }}'
+    fail_msg: '[{"a": 1}, {"b": 2}] is {{ result }}'
     quiet: '{{ quiet_test | default(true) | bool }}'
   vars:
     result: '{{ [{"a": 1}, {"b": 2}] | community.general.reveal_ansible_type }}'
@@ -123,7 +123,7 @@
   assert:
     that: '{"a": 1} is community.general.ansible_type(dtype)'
     success_msg: '{"a": 1} is {{ dtype }}'
-    fail_msg:  '{"a": 1} is {{ result }}'
+    fail_msg: '{"a": 1} is {{ result }}'
     quiet: '{{ quiet_test | default(true) | bool }}'
   vars:
     result: '{{ {"a": 1} | community.general.reveal_ansible_type }}'
@@ -133,7 +133,7 @@
   assert:
     that: '{"a": 1, "b": 2} is community.general.ansible_type(dtype)'
     success_msg: '{"a": 1, "b": 2} is {{ dtype }}'
-    fail_msg:  '{"a": 1, "b": 2} is {{ result }}'
+    fail_msg: '{"a": 1, "b": 2} is {{ result }}'
     quiet: '{{ quiet_test | default(true) | bool }}'
   vars:
     result: '{{ {"a": 1, "b": 2} | community.general.reveal_ansible_type }}'
@@ -184,7 +184,7 @@
       _AnsibleTaggedStr: str
       _AnsibleTaggedInt: int
       _AnsibleTaggedFloat: float
-    data: {'a': 1, 'b': 1.1, 'c': 'abc', 'd': True, 'e': ['x', 'y', 'z'], 'f': {'x': 1, 'y': 2}}
+    data: {'a': 1, 'b': 1.1, 'c': 'abc', 'd': true, 'e': ['x', 'y', 'z'], 'f': {'x': 1, 'y': 2}}
     result: '{{ data | community.general.reveal_ansible_type(alias) }}'
     dtype: dict[str, bool|dict|float|int|list|str]
 
@@ -200,7 +200,7 @@
       _AnsibleTaggedStr: str
       _AnsibleTaggedInt: int
       _AnsibleTaggedFloat: float
-    data: [1, 2, 1.1, 'abc', True, ['x', 'y', 'z'], {'x': 1, 'y': 2}]
+    data: [1, 2, 1.1, 'abc', true, ['x', 'y', 'z'], {'x': 1, 'y': 2}]
     result: '{{ data | community.general.reveal_ansible_type(alias) }}'
     dtype: list[bool|dict|float|int|list|str]
 
diff --git a/tests/integration/targets/ufw/tasks/main.yml b/tests/integration/targets/ufw/tasks/main.yml
index 5fba2fa4d7..83e6a5138a 100644
--- a/tests/integration/targets/ufw/tasks/main.yml
+++ b/tests/integration/targets/ufw/tasks/main.yml
@@ -27,19 +27,19 @@
 
 # Run the tests
 - block:
-  - include_tasks: run-test.yml
-    with_fileglob:
-    - "tests/*.yml"
+    - include_tasks: run-test.yml
+      with_fileglob:
+        - "tests/*.yml"
   become: true
 
   # Cleanup
   always:
-  - pause:
-      # ufw creates backups of the rule files with a timestamp; if reset is called
-      # twice in a row fast enough (so that both timestamps are taken in the same second),
-      # the second call will notice that the backup files are already there and fail.
-      # Waiting one second fixes this problem.
-      seconds: 1
-  - name: Reset ufw to factory defaults and disable
-    ufw:
-      state: reset
+    - pause:
+        # ufw creates backups of the rule files with a timestamp; if reset is called
+        # twice in a row fast enough (so that both timestamps are taken in the same second),
+        # the second call will notice that the backup files are already there and fail.
+        # Waiting one second fixes this problem.
+        seconds: 1
+    - name: Reset ufw to factory defaults and disable
+      ufw:
+        state: reset
diff --git a/tests/integration/targets/ufw/tasks/tests/basic.yml b/tests/integration/targets/ufw/tasks/tests/basic.yml
index 8c179d7aed..3be130da78 100644
--- a/tests/integration/targets/ufw/tasks/tests/basic.yml
+++ b/tests/integration/targets/ufw/tasks/tests/basic.yml
@@ -27,10 +27,10 @@
   register: enable_idem_check
 - assert:
     that:
-    - enable_check is changed
-    - enable is changed
-    - enable_idem is not changed
-    - enable_idem_check is not changed
+      - enable_check is changed
+      - enable is changed
+      - enable_idem is not changed
+      - enable_idem_check is not changed
 
 # ############################################
 - name: ipv4 allow (check mode)
@@ -61,10 +61,10 @@
   register: ipv4_allow_idem_check
 - assert:
     that:
-    - ipv4_allow_check is changed
-    - ipv4_allow is changed
-    - ipv4_allow_idem is not changed
-    - ipv4_allow_idem_check is not changed
+      - ipv4_allow_check is changed
+      - ipv4_allow is changed
+      - ipv4_allow_idem is not changed
+      - ipv4_allow_idem_check is not changed
 
 # ############################################
 - name: delete ipv4 allow (check mode)
@@ -99,10 +99,10 @@
   register: delete_ipv4_allow_idem_check
 - assert:
     that:
-    - delete_ipv4_allow_check is changed
-    - delete_ipv4_allow is changed
-    - delete_ipv4_allow_idem is not changed
-    - delete_ipv4_allow_idem_check is not changed
+      - delete_ipv4_allow_check is changed
+      - delete_ipv4_allow is changed
+      - delete_ipv4_allow_idem is not changed
+      - delete_ipv4_allow_idem_check is not changed
 
 # ############################################
 - name: ipv6 allow (check mode)
@@ -133,10 +133,10 @@
   register: ipv6_allow_idem_check
 - assert:
     that:
-    - ipv6_allow_check is changed
-    - ipv6_allow is changed
-    - ipv6_allow_idem is not changed
-    - ipv6_allow_idem_check is not changed
+      - ipv6_allow_check is changed
+      - ipv6_allow is changed
+      - ipv6_allow_idem is not changed
+      - ipv6_allow_idem_check is not changed
 
 # ############################################
 - name: delete ipv6 allow (check mode)
@@ -171,10 +171,10 @@
   register: delete_ipv6_allow_idem_check
 - assert:
     that:
-    - delete_ipv6_allow_check is changed
-    - delete_ipv6_allow is changed
-    - delete_ipv6_allow_idem is not changed
-    - delete_ipv6_allow_idem_check is not changed
+      - delete_ipv6_allow_check is changed
+      - delete_ipv6_allow is changed
+      - delete_ipv6_allow_idem is not changed
+      - delete_ipv6_allow_idem_check is not changed
 
 
 # ############################################
@@ -206,10 +206,10 @@
   register: ipv4_allow_idem_check
 - assert:
     that:
-    - ipv4_allow_check is changed
-    - ipv4_allow is changed
-    - ipv4_allow_idem is not changed
-    - ipv4_allow_idem_check is not changed
+      - ipv4_allow_check is changed
+      - ipv4_allow is changed
+      - ipv4_allow_idem is not changed
+      - ipv4_allow_idem_check is not changed
 
 # ############################################
 - name: delete ipv4 allow (check mode)
@@ -244,10 +244,10 @@
   register: delete_ipv4_allow_idem_check
 - assert:
     that:
-    - delete_ipv4_allow_check is changed
-    - delete_ipv4_allow is changed
-    - delete_ipv4_allow_idem is not changed
-    - delete_ipv4_allow_idem_check is not changed
+      - delete_ipv4_allow_check is changed
+      - delete_ipv4_allow is changed
+      - delete_ipv4_allow_idem is not changed
+      - delete_ipv4_allow_idem_check is not changed
 
 # ############################################
 - name: ipv6 allow (check mode)
@@ -278,10 +278,10 @@
   register: ipv6_allow_idem_check
 - assert:
     that:
-    - ipv6_allow_check is changed
-    - ipv6_allow is changed
-    - ipv6_allow_idem is not changed
-    - ipv6_allow_idem_check is not changed
+      - ipv6_allow_check is changed
+      - ipv6_allow is changed
+      - ipv6_allow_idem is not changed
+      - ipv6_allow_idem_check is not changed
 
 # ############################################
 - name: delete ipv6 allow (check mode)
@@ -316,10 +316,10 @@
   register: delete_ipv6_allow_idem_check
 - assert:
     that:
-    - delete_ipv6_allow_check is changed
-    - delete_ipv6_allow is changed
-    - delete_ipv6_allow_idem is not changed
-    - delete_ipv6_allow_idem_check is not changed
+      - delete_ipv6_allow_check is changed
+      - delete_ipv6_allow is changed
+      - delete_ipv6_allow_idem is not changed
+      - delete_ipv6_allow_idem_check is not changed
 
 # ############################################
 - name: Reload ufw
@@ -333,8 +333,8 @@
   register: reload_check
 - assert:
     that:
-    - reload is changed
-    - reload_check is changed
+      - reload is changed
+      - reload_check is changed
 
 # ############################################
 - name: Disable (check mode)
@@ -357,10 +357,10 @@
   register: disable_idem_check
 - assert:
     that:
-    - disable_check is changed
-    - disable is changed
-    - disable_idem is not changed
-    - disable_idem_check is not changed
+      - disable_check is changed
+      - disable is changed
+      - disable_idem is not changed
+      - disable_idem_check is not changed
 
 # ############################################
 - name: Re-enable
@@ -400,7 +400,7 @@
   register: reset_idem_check
 - assert:
     that:
-    - reset_check is changed
-    - reset is changed
-    - reset_idem is changed
-    - reset_idem_check is changed
+      - reset_check is changed
+      - reset is changed
+      - reset_idem is changed
+      - reset_idem_check is changed
diff --git a/tests/integration/targets/ufw/tasks/tests/global-state.yml b/tests/integration/targets/ufw/tasks/tests/global-state.yml
index f5f1007510..3913a552f3 100644
--- a/tests/integration/targets/ufw/tasks/tests/global-state.yml
+++ b/tests/integration/targets/ufw/tasks/tests/global-state.yml
@@ -52,14 +52,14 @@
     LC_ALL: C
 - assert:
     that:
-    - logging_check is changed
-    - logging is changed
-    - "ufw_logging.stdout == 'Logging: on (low)'"
-    - logging_idem is not changed
-    - logging_idem_check is not changed
-    - "ufw_logging_change.stdout == 'Logging: on (full)'"
-    - logging_change is changed
-    - logging_change_check is changed
+      - logging_check is changed
+      - logging is changed
+      - "ufw_logging.stdout == 'Logging: on (low)'"
+      - logging_idem is not changed
+      - logging_idem_check is not changed
+      - "ufw_logging_change.stdout == 'Logging: on (full)'"
+      - logging_change is changed
+      - logging_change_check is changed
 
 # ############################################
 - name: Default (check mode)
@@ -138,17 +138,17 @@
   register: default_change_implicit_idem
 - assert:
     that:
-    - default_check is changed
-    - default is changed
-    - "'reject (incoming)' in ufw_defaults.stdout"
-    - default_idem is not changed
-    - default_idem_check is not changed
-    - default_change_check is changed
-    - default_change is changed
-    - "'allow (incoming)' in ufw_defaults_change.stdout"
-    - default_change_2 is changed
-    - default_change_implicit_check is changed
-    - default_change_implicit is changed
-    - default_change_implicit_idem_check is not changed
-    - default_change_implicit_idem is not changed
-    - "'allow (incoming)' in ufw_defaults_change_implicit.stdout"
+      - default_check is changed
+      - default is changed
+      - "'reject (incoming)' in ufw_defaults.stdout"
+      - default_idem is not changed
+      - default_idem_check is not changed
+      - default_change_check is changed
+      - default_change is changed
+      - "'allow (incoming)' in ufw_defaults_change.stdout"
+      - default_change_2 is changed
+      - default_change_implicit_check is changed
+      - default_change_implicit is changed
+      - default_change_implicit_idem_check is not changed
+      - default_change_implicit_idem is not changed
+      - "'allow (incoming)' in ufw_defaults_change_implicit.stdout"
diff --git a/tests/integration/targets/ufw/tasks/tests/insert_relative_to.yml b/tests/integration/targets/ufw/tasks/tests/insert_relative_to.yml
index 67328a0e3f..975600036f 100644
--- a/tests/integration/targets/ufw/tasks/tests/insert_relative_to.yml
+++ b/tests/integration/targets/ufw/tasks/tests/insert_relative_to.yml
@@ -71,14 +71,14 @@
   register: ufw_status
 - assert:
     that:
-    - ufw_status.stdout_lines == expected_stdout
+      - ufw_status.stdout_lines == expected_stdout
   vars:
     expected_stdout:
-    - "0.0.0.0 10"
-    - "0.0.0.0 22"
-    - "0.0.0.0 11"
-    - "0.0.0.0 23"
-    - ":: 110"
-    - ":: 122"
-    - ":: 111"
-    - ":: 123"
+      - "0.0.0.0 10"
+      - "0.0.0.0 22"
+      - "0.0.0.0 11"
+      - "0.0.0.0 23"
+      - ":: 110"
+      - ":: 122"
+      - ":: 111"
+      - ":: 123"
diff --git a/tests/integration/targets/wakeonlan/tasks/main.yml b/tests/integration/targets/wakeonlan/tasks/main.yml
index 0597480318..22bb0706ef 100644
--- a/tests/integration/targets/wakeonlan/tasks/main.yml
+++ b/tests/integration/targets/wakeonlan/tasks/main.yml
@@ -28,8 +28,8 @@
 - name: Check error message
   assert:
     that:
-    - incorrect_mac_length is failed
-    - incorrect_mac_length.msg is search('Incorrect MAC address length')
+      - incorrect_mac_length is failed
+      - incorrect_mac_length.msg is search('Incorrect MAC address length')
 
 - name: Provide an incorrect MAC format
   wakeonlan:
@@ -41,8 +41,8 @@
 - name: Check error message
   assert:
     that:
-    - incorrect_mac_format is failed
-    - incorrect_mac_format.msg is search('Incorrect MAC address format')
+      - incorrect_mac_format is failed
+      - incorrect_mac_format.msg is search('Incorrect MAC address format')
 
 - name: Cause a socket error
   wakeonlan:
@@ -54,5 +54,5 @@
 - name: Check error message
   assert:
     that:
-    - incorrect_broadcast_address is failed
-    - incorrect_broadcast_address.msg is search('not known|Name does not resolve')
+      - incorrect_broadcast_address is failed
+      - incorrect_broadcast_address.msg is search('not known|Name does not resolve')
diff --git a/tests/integration/targets/xattr/tasks/test.yml b/tests/integration/targets/xattr/tasks/test.yml
index 7fe852d77a..dfc4da60e4 100644
--- a/tests/integration/targets/xattr/tasks/test.yml
+++ b/tests/integration/targets/xattr/tasks/test.yml
@@ -23,11 +23,11 @@
 
 - assert:
     that:
-    - "xattr_set_result.changed"
-    - "xattr_get_all_result['xattr']['user.foo'] == 'bar'"
-    - "not xattr_get_all_result.changed"
-    - "xattr_get_specific_result['xattr']['user.foo'] == 'bar'"
-    - "not xattr_get_specific_result.changed"
+      - "xattr_set_result.changed"
+      - "xattr_get_all_result['xattr']['user.foo'] == 'bar'"
+      - "not xattr_get_all_result.changed"
+      - "xattr_get_specific_result['xattr']['user.foo'] == 'bar'"
+      - "not xattr_get_specific_result.changed"
 
 - name: Set attribute again
   xattr:
@@ -39,7 +39,7 @@
 
 - assert:
     that:
-    - "not xattr_set_again_result.changed"
+      - "not xattr_set_again_result.changed"
 
 - name: Unset attribute
   xattr:
@@ -55,9 +55,9 @@
 
 - assert:
     that:
-    - "xattr_unset_result.changed"
-    - "xattr_get_after_unset_result['xattr'] == {}"
-    - "not xattr_get_after_unset_result.changed"
+      - "xattr_unset_result.changed"
+      - "xattr_get_after_unset_result['xattr'] == {}"
+      - "not xattr_get_after_unset_result.changed"
 
 - name: Unset attribute again
   xattr:
@@ -69,4 +69,4 @@
 
 - assert:
     that:
-    - "not xattr_set_again_result.changed"
+      - "not xattr_set_again_result.changed"
diff --git a/tests/integration/targets/xfs_quota/tasks/gquota.yml b/tests/integration/targets/xfs_quota/tasks/gquota.yml
index caca1d341d..3fca599221 100644
--- a/tests/integration/targets/xfs_quota/tasks/gquota.yml
+++ b/tests/integration/targets/xfs_quota/tasks/gquota.yml
@@ -12,136 +12,136 @@
     dev: '{{ remote_tmp_dir }}/img-gquota'
     fstype: xfs
 - block:
-  - name: Mount filesystem
-    become: true
-    ansible.posix.mount:
-      fstab: '{{ remote_tmp_dir }}/fstab'
-      src: '{{ remote_tmp_dir }}/img-gquota'
-      path: '{{ remote_tmp_dir }}/gquota'
-      fstype: xfs
-      opts: gquota
-      state: mounted
-  - name: Apply default group limits
-    xfs_quota:
-      bsoft: '{{ gquota_default_bsoft }}'
-      bhard: '{{ gquota_default_bhard }}'
-      isoft: '{{ gquota_default_isoft }}'
-      ihard: '{{ gquota_default_ihard }}'
-      mountpoint: '{{ remote_tmp_dir }}/gquota'
-      rtbsoft: '{{ gquota_default_rtbsoft }}'
-      rtbhard: '{{ gquota_default_rtbhard }}'
-      type: group
-    become: true
-    register: test_gquota_default_before
-  - name: Assert default group limits results
-    assert:
-      that:
-      - test_gquota_default_before.changed
-      - test_gquota_default_before.bsoft == gquota_default_bsoft|human_to_bytes
-      - test_gquota_default_before.bhard == gquota_default_bhard|human_to_bytes
-      - test_gquota_default_before.isoft == gquota_default_isoft
-      - test_gquota_default_before.ihard == gquota_default_ihard
-      - test_gquota_default_before.rtbsoft == gquota_default_rtbsoft|human_to_bytes
-      - test_gquota_default_before.rtbhard == gquota_default_rtbhard|human_to_bytes
-  - name: Apply group limits
-    xfs_quota:
-      bsoft: '{{ gquota_group_bsoft }}'
-      bhard: '{{ gquota_group_bhard }}'
-      isoft: '{{ gquota_group_isoft }}'
-      ihard: '{{ gquota_group_ihard }}'
-      mountpoint: '{{ remote_tmp_dir }}/gquota'
-      name: xfsquotauser
-      rtbsoft: '{{ gquota_group_rtbsoft }}'
-      rtbhard: '{{ gquota_group_rtbhard }}'
-      type: group
-    become: true
-    register: test_gquota_group_before
-  - name: Assert group limits results for xfsquotauser
-    assert:
-      that:
-      - test_gquota_group_before.changed
-      - test_gquota_group_before.bsoft == gquota_group_bsoft|human_to_bytes
-      - test_gquota_group_before.bhard == gquota_group_bhard|human_to_bytes
-      - test_gquota_group_before.isoft == gquota_group_isoft
-      - test_gquota_group_before.ihard == gquota_group_ihard
-      - test_gquota_group_before.rtbsoft == gquota_group_rtbsoft|human_to_bytes
-      - test_gquota_group_before.rtbhard == gquota_group_rtbhard|human_to_bytes
-  - name: Re-apply default group limits
-    xfs_quota:
-      bsoft: '{{ gquota_default_bsoft }}'
-      bhard: '{{ gquota_default_bhard }}'
-      isoft: '{{ gquota_default_isoft }}'
-      ihard: '{{ gquota_default_ihard }}'
-      mountpoint: '{{ remote_tmp_dir }}/gquota'
-      rtbsoft: '{{ gquota_default_rtbsoft }}'
-      rtbhard: '{{ gquota_default_rtbhard }}'
-      type: group
-    become: true
-    register: test_gquota_default_after
-  - name: Assert default group limits results after re-apply
-    assert:
-      that:
-      - not test_gquota_default_after.changed
-  - name: Re-apply group limits
-    xfs_quota:
-      bsoft: '{{ gquota_group_bsoft }}'
-      bhard: '{{ gquota_group_bhard }}'
-      isoft: '{{ gquota_group_isoft }}'
-      ihard: '{{ gquota_group_ihard }}'
-      mountpoint: '{{ remote_tmp_dir }}/gquota'
-      name: xfsquotauser
-      rtbsoft: '{{ gquota_group_rtbsoft }}'
-      rtbhard: '{{ gquota_group_rtbhard }}'
-      type: group
-    become: true
-    register: test_gquota_group_after
-  - name: Assert group limits results for xfsquotauser after re-apply
-    assert:
-      that:
-      - not test_gquota_group_after.changed
-  - name: Reset default group limits
-    xfs_quota:
-      mountpoint: '{{ remote_tmp_dir }}/gquota'
-      state: absent
-      type: group
-    become: true
-    register: test_reset_gquota_default
-  - name: Assert reset of default group limits results
-    assert:
-      that:
-      - test_reset_gquota_default.changed
-      - test_reset_gquota_default.bsoft == 0
-      - test_reset_gquota_default.bhard == 0
-      - test_reset_gquota_default.isoft == 0
-      - test_reset_gquota_default.ihard == 0
-      - test_reset_gquota_default.rtbsoft == 0
-      - test_reset_gquota_default.rtbhard == 0
-  - name: Reset group limits for xfsquotauser
-    xfs_quota:
-      mountpoint: '{{ remote_tmp_dir }}/gquota'
-      name: xfsquotauser
-      state: absent
-      type: group
-    become: true
-    register: test_reset_gquota_group
-  - name: Assert reset of default group limits results
-    assert:
-      that:
-      - test_reset_gquota_group.changed
-      - test_reset_gquota_group.bsoft == 0
-      - test_reset_gquota_group.bhard == 0
-      - test_reset_gquota_group.isoft == 0
-      - test_reset_gquota_group.ihard == 0
-      - test_reset_gquota_group.rtbsoft == 0
-      - test_reset_gquota_group.rtbhard == 0
+    - name: Mount filesystem
+      become: true
+      ansible.posix.mount:
+        fstab: '{{ remote_tmp_dir }}/fstab'
+        src: '{{ remote_tmp_dir }}/img-gquota'
+        path: '{{ remote_tmp_dir }}/gquota'
+        fstype: xfs
+        opts: gquota
+        state: mounted
+    - name: Apply default group limits
+      xfs_quota:
+        bsoft: '{{ gquota_default_bsoft }}'
+        bhard: '{{ gquota_default_bhard }}'
+        isoft: '{{ gquota_default_isoft }}'
+        ihard: '{{ gquota_default_ihard }}'
+        mountpoint: '{{ remote_tmp_dir }}/gquota'
+        rtbsoft: '{{ gquota_default_rtbsoft }}'
+        rtbhard: '{{ gquota_default_rtbhard }}'
+        type: group
+      become: true
+      register: test_gquota_default_before
+    - name: Assert default group limits results
+      assert:
+        that:
+          - test_gquota_default_before.changed
+          - test_gquota_default_before.bsoft == gquota_default_bsoft|human_to_bytes
+          - test_gquota_default_before.bhard == gquota_default_bhard|human_to_bytes
+          - test_gquota_default_before.isoft == gquota_default_isoft
+          - test_gquota_default_before.ihard == gquota_default_ihard
+          - test_gquota_default_before.rtbsoft == gquota_default_rtbsoft|human_to_bytes
+          - test_gquota_default_before.rtbhard == gquota_default_rtbhard|human_to_bytes
+    - name: Apply group limits
+      xfs_quota:
+        bsoft: '{{ gquota_group_bsoft }}'
+        bhard: '{{ gquota_group_bhard }}'
+        isoft: '{{ gquota_group_isoft }}'
+        ihard: '{{ gquota_group_ihard }}'
+        mountpoint: '{{ remote_tmp_dir }}/gquota'
+        name: xfsquotauser
+        rtbsoft: '{{ gquota_group_rtbsoft }}'
+        rtbhard: '{{ gquota_group_rtbhard }}'
+        type: group
+      become: true
+      register: test_gquota_group_before
+    - name: Assert group limits results for xfsquotauser
+      assert:
+        that:
+          - test_gquota_group_before.changed
+          - test_gquota_group_before.bsoft == gquota_group_bsoft|human_to_bytes
+          - test_gquota_group_before.bhard == gquota_group_bhard|human_to_bytes
+          - test_gquota_group_before.isoft == gquota_group_isoft
+          - test_gquota_group_before.ihard == gquota_group_ihard
+          - test_gquota_group_before.rtbsoft == gquota_group_rtbsoft|human_to_bytes
+          - test_gquota_group_before.rtbhard == gquota_group_rtbhard|human_to_bytes
+    - name: Re-apply default group limits
+      xfs_quota:
+        bsoft: '{{ gquota_default_bsoft }}'
+        bhard: '{{ gquota_default_bhard }}'
+        isoft: '{{ gquota_default_isoft }}'
+        ihard: '{{ gquota_default_ihard }}'
+        mountpoint: '{{ remote_tmp_dir }}/gquota'
+        rtbsoft: '{{ gquota_default_rtbsoft }}'
+        rtbhard: '{{ gquota_default_rtbhard }}'
+        type: group
+      become: true
+      register: test_gquota_default_after
+    - name: Assert default group limits results after re-apply
+      assert:
+        that:
+          - not test_gquota_default_after.changed
+    - name: Re-apply group limits
+      xfs_quota:
+        bsoft: '{{ gquota_group_bsoft }}'
+        bhard: '{{ gquota_group_bhard }}'
+        isoft: '{{ gquota_group_isoft }}'
+        ihard: '{{ gquota_group_ihard }}'
+        mountpoint: '{{ remote_tmp_dir }}/gquota'
+        name: xfsquotauser
+        rtbsoft: '{{ gquota_group_rtbsoft }}'
+        rtbhard: '{{ gquota_group_rtbhard }}'
+        type: group
+      become: true
+      register: test_gquota_group_after
+    - name: Assert group limits results for xfsquotauser after re-apply
+      assert:
+        that:
+          - not test_gquota_group_after.changed
+    - name: Reset default group limits
+      xfs_quota:
+        mountpoint: '{{ remote_tmp_dir }}/gquota'
+        state: absent
+        type: group
+      become: true
+      register: test_reset_gquota_default
+    - name: Assert reset of default group limits results
+      assert:
+        that:
+          - test_reset_gquota_default.changed
+          - test_reset_gquota_default.bsoft == 0
+          - test_reset_gquota_default.bhard == 0
+          - test_reset_gquota_default.isoft == 0
+          - test_reset_gquota_default.ihard == 0
+          - test_reset_gquota_default.rtbsoft == 0
+          - test_reset_gquota_default.rtbhard == 0
+    - name: Reset group limits for xfsquotauser
+      xfs_quota:
+        mountpoint: '{{ remote_tmp_dir }}/gquota'
+        name: xfsquotauser
+        state: absent
+        type: group
+      become: true
+      register: test_reset_gquota_group
+    - name: Assert reset of default group limits results
+      assert:
+        that:
+          - test_reset_gquota_group.changed
+          - test_reset_gquota_group.bsoft == 0
+          - test_reset_gquota_group.bhard == 0
+          - test_reset_gquota_group.isoft == 0
+          - test_reset_gquota_group.ihard == 0
+          - test_reset_gquota_group.rtbsoft == 0
+          - test_reset_gquota_group.rtbhard == 0
   always:
-  - name: Unmount filesystem
-    become: true
-    ansible.posix.mount:
-      fstab: '{{ remote_tmp_dir }}/fstab'
-      path: '{{ remote_tmp_dir }}/gquota'
-      state: unmounted
-  - name: Remove disk image
-    file:
-      path: '{{ remote_tmp_dir }}/img-gquota'
-      state: absent
+    - name: Unmount filesystem
+      become: true
+      ansible.posix.mount:
+        fstab: '{{ remote_tmp_dir }}/fstab'
+        path: '{{ remote_tmp_dir }}/gquota'
+        state: unmounted
+    - name: Remove disk image
+      file:
+        path: '{{ remote_tmp_dir }}/img-gquota'
+        state: absent
diff --git a/tests/integration/targets/xfs_quota/tasks/pquota.yml b/tests/integration/targets/xfs_quota/tasks/pquota.yml
index db364ffd5f..439452da24 100644
--- a/tests/integration/targets/xfs_quota/tasks/pquota.yml
+++ b/tests/integration/targets/xfs_quota/tasks/pquota.yml
@@ -17,8 +17,8 @@
     state: touch
   become: true
   loop:
-  - projid
-  - projects
+    - projid
+    - projects
 - name: Add test xfs quota project id
   lineinfile:
     path: /etc/projid
@@ -32,153 +32,153 @@
     state: present
   become: true
 - block:
-  - name: Mount filesystem
-    become: true
-    ansible.posix.mount:
-      fstab: '{{ remote_tmp_dir }}/fstab'
-      src: '{{ remote_tmp_dir }}/img-pquota'
-      path: '{{ remote_tmp_dir }}/pquota'
-      fstype: xfs
-      opts: pquota
-      state: mounted
-  - name: Create test directory
-    file:
-      path: '{{ remote_tmp_dir }}/pquota/test'
-      state: directory
-    become: true
-  - name: Apply default project limits
-    xfs_quota:
-      bsoft: '{{ pquota_default_bsoft }}'
-      bhard: '{{ pquota_default_bhard }}'
-      isoft: '{{ pquota_default_isoft }}'
-      ihard: '{{ pquota_default_ihard }}'
-      mountpoint: '{{ remote_tmp_dir }}/pquota'
-      rtbsoft: '{{ pquota_default_rtbsoft }}'
-      rtbhard: '{{ pquota_default_rtbhard }}'
-      type: project
-    become: true
-    register: test_pquota_default_before
-  - name: Assert default project limits results
-    assert:
-      that:
-      - test_pquota_default_before.changed
-      - test_pquota_default_before.bsoft == pquota_default_bsoft|human_to_bytes
-      - test_pquota_default_before.bhard == pquota_default_bhard|human_to_bytes
-      - test_pquota_default_before.isoft == pquota_default_isoft
-      - test_pquota_default_before.ihard == pquota_default_ihard
-      - test_pquota_default_before.rtbsoft == pquota_default_rtbsoft|human_to_bytes
-      - test_pquota_default_before.rtbhard == pquota_default_rtbhard|human_to_bytes
-  - name: Apply project limits
-    xfs_quota:
-      bsoft: '{{ pquota_project_bsoft }}'
-      bhard: '{{ pquota_project_bhard }}'
-      isoft: '{{ pquota_project_isoft }}'
-      ihard: '{{ pquota_project_ihard }}'
-      mountpoint: '{{ remote_tmp_dir }}/pquota'
-      name: xft_quotaval
-      rtbsoft: '{{ pquota_project_rtbsoft }}'
-      rtbhard: '{{ pquota_project_rtbhard }}'
-      type: project
-    become: true
-    register: test_pquota_project_before
-  - name: Assert project limits results for xft_quotaval
-    assert:
-      that:
-      - test_pquota_project_before.changed
-      - test_pquota_project_before.bsoft == pquota_project_bsoft|human_to_bytes
-      - test_pquota_project_before.bhard == pquota_project_bhard|human_to_bytes
-      - test_pquota_project_before.isoft == pquota_project_isoft
-      - test_pquota_project_before.ihard == pquota_project_ihard
-      - test_pquota_project_before.rtbsoft == pquota_project_rtbsoft|human_to_bytes
-      - test_pquota_project_before.rtbhard == pquota_project_rtbhard|human_to_bytes
-  - name: Re-apply default project limits
-    xfs_quota:
-      bsoft: '{{ pquota_default_bsoft }}'
-      bhard: '{{ pquota_default_bhard }}'
-      isoft: '{{ pquota_default_isoft }}'
-      ihard: '{{ pquota_default_ihard }}'
-      mountpoint: '{{ remote_tmp_dir }}/pquota'
-      rtbsoft: '{{ pquota_default_rtbsoft }}'
-      rtbhard: '{{ pquota_default_rtbhard }}'
-      type: project
-    become: true
-    register: test_pquota_default_after
-  - name: Assert default project limits results after re-apply
-    assert:
-      that:
-      - not test_pquota_default_after.changed
-  - name: Re-apply project limits
-    xfs_quota:
-      bsoft: '{{ pquota_project_bsoft }}'
-      bhard: '{{ pquota_project_bhard }}'
-      isoft: '{{ pquota_project_isoft }}'
-      ihard: '{{ pquota_project_ihard }}'
-      mountpoint: '{{ remote_tmp_dir }}/pquota'
-      name: xft_quotaval
-      rtbsoft: '{{ pquota_project_rtbsoft }}'
-      rtbhard: '{{ pquota_project_rtbhard }}'
-      type: project
-    become: true
-    register: test_pquota_project_after
-  - name: Assert project limits results for xft_quotaval after re-apply
-    assert:
-      that:
-      - test_pquota_project_after is not changed
-  - name: Reset default project limits
-    xfs_quota:
-      mountpoint: '{{ remote_tmp_dir }}/pquota'
-      state: absent
-      type: project
-    become: true
-    register: test_reset_pquota_default
-  - name: Assert reset of default projecy limits results
-    assert:
-      that:
-      - test_reset_pquota_default.changed
-      - test_reset_pquota_default.bsoft == 0
-      - test_reset_pquota_default.bhard == 0
-      - test_reset_pquota_default.isoft == 0
-      - test_reset_pquota_default.ihard == 0
-      - test_reset_pquota_default.rtbsoft == 0
-      - test_reset_pquota_default.rtbhard == 0
-  - name: Reset project limits for xft_quotaval
-    xfs_quota:
-      mountpoint: '{{ remote_tmp_dir }}/pquota'
-      name: xft_quotaval
-      state: absent
-      type: project
-    become: true
-    register: test_reset_pquota_project
-  - name: Assert reset of project limits results for xft_quotaval
-    assert:
-      that:
-      - test_reset_pquota_project.changed
-      - test_reset_pquota_project.bsoft == 0
-      - test_reset_pquota_project.bhard == 0
-      - test_reset_pquota_project.isoft == 0
-      - test_reset_pquota_project.ihard == 0
-      - test_reset_pquota_project.rtbsoft == 0
-      - test_reset_pquota_project.rtbhard == 0
+    - name: Mount filesystem
+      become: true
+      ansible.posix.mount:
+        fstab: '{{ remote_tmp_dir }}/fstab'
+        src: '{{ remote_tmp_dir }}/img-pquota'
+        path: '{{ remote_tmp_dir }}/pquota'
+        fstype: xfs
+        opts: pquota
+        state: mounted
+    - name: Create test directory
+      file:
+        path: '{{ remote_tmp_dir }}/pquota/test'
+        state: directory
+      become: true
+    - name: Apply default project limits
+      xfs_quota:
+        bsoft: '{{ pquota_default_bsoft }}'
+        bhard: '{{ pquota_default_bhard }}'
+        isoft: '{{ pquota_default_isoft }}'
+        ihard: '{{ pquota_default_ihard }}'
+        mountpoint: '{{ remote_tmp_dir }}/pquota'
+        rtbsoft: '{{ pquota_default_rtbsoft }}'
+        rtbhard: '{{ pquota_default_rtbhard }}'
+        type: project
+      become: true
+      register: test_pquota_default_before
+    - name: Assert default project limits results
+      assert:
+        that:
+          - test_pquota_default_before.changed
+          - test_pquota_default_before.bsoft == pquota_default_bsoft|human_to_bytes
+          - test_pquota_default_before.bhard == pquota_default_bhard|human_to_bytes
+          - test_pquota_default_before.isoft == pquota_default_isoft
+          - test_pquota_default_before.ihard == pquota_default_ihard
+          - test_pquota_default_before.rtbsoft == pquota_default_rtbsoft|human_to_bytes
+          - test_pquota_default_before.rtbhard == pquota_default_rtbhard|human_to_bytes
+    - name: Apply project limits
+      xfs_quota:
+        bsoft: '{{ pquota_project_bsoft }}'
+        bhard: '{{ pquota_project_bhard }}'
+        isoft: '{{ pquota_project_isoft }}'
+        ihard: '{{ pquota_project_ihard }}'
+        mountpoint: '{{ remote_tmp_dir }}/pquota'
+        name: xft_quotaval
+        rtbsoft: '{{ pquota_project_rtbsoft }}'
+        rtbhard: '{{ pquota_project_rtbhard }}'
+        type: project
+      become: true
+      register: test_pquota_project_before
+    - name: Assert project limits results for xft_quotaval
+      assert:
+        that:
+          - test_pquota_project_before.changed
+          - test_pquota_project_before.bsoft == pquota_project_bsoft|human_to_bytes
+          - test_pquota_project_before.bhard == pquota_project_bhard|human_to_bytes
+          - test_pquota_project_before.isoft == pquota_project_isoft
+          - test_pquota_project_before.ihard == pquota_project_ihard
+          - test_pquota_project_before.rtbsoft == pquota_project_rtbsoft|human_to_bytes
+          - test_pquota_project_before.rtbhard == pquota_project_rtbhard|human_to_bytes
+    - name: Re-apply default project limits
+      xfs_quota:
+        bsoft: '{{ pquota_default_bsoft }}'
+        bhard: '{{ pquota_default_bhard }}'
+        isoft: '{{ pquota_default_isoft }}'
+        ihard: '{{ pquota_default_ihard }}'
+        mountpoint: '{{ remote_tmp_dir }}/pquota'
+        rtbsoft: '{{ pquota_default_rtbsoft }}'
+        rtbhard: '{{ pquota_default_rtbhard }}'
+        type: project
+      become: true
+      register: test_pquota_default_after
+    - name: Assert default project limits results after re-apply
+      assert:
+        that:
+          - not test_pquota_default_after.changed
+    - name: Re-apply project limits
+      xfs_quota:
+        bsoft: '{{ pquota_project_bsoft }}'
+        bhard: '{{ pquota_project_bhard }}'
+        isoft: '{{ pquota_project_isoft }}'
+        ihard: '{{ pquota_project_ihard }}'
+        mountpoint: '{{ remote_tmp_dir }}/pquota'
+        name: xft_quotaval
+        rtbsoft: '{{ pquota_project_rtbsoft }}'
+        rtbhard: '{{ pquota_project_rtbhard }}'
+        type: project
+      become: true
+      register: test_pquota_project_after
+    - name: Assert project limits results for xft_quotaval after re-apply
+      assert:
+        that:
+          - test_pquota_project_after is not changed
+    - name: Reset default project limits
+      xfs_quota:
+        mountpoint: '{{ remote_tmp_dir }}/pquota'
+        state: absent
+        type: project
+      become: true
+      register: test_reset_pquota_default
+    - name: Assert reset of default projecy limits results
+      assert:
+        that:
+          - test_reset_pquota_default.changed
+          - test_reset_pquota_default.bsoft == 0
+          - test_reset_pquota_default.bhard == 0
+          - test_reset_pquota_default.isoft == 0
+          - test_reset_pquota_default.ihard == 0
+          - test_reset_pquota_default.rtbsoft == 0
+          - test_reset_pquota_default.rtbhard == 0
+    - name: Reset project limits for xft_quotaval
+      xfs_quota:
+        mountpoint: '{{ remote_tmp_dir }}/pquota'
+        name: xft_quotaval
+        state: absent
+        type: project
+      become: true
+      register: test_reset_pquota_project
+    - name: Assert reset of project limits results for xft_quotaval
+      assert:
+        that:
+          - test_reset_pquota_project.changed
+          - test_reset_pquota_project.bsoft == 0
+          - test_reset_pquota_project.bhard == 0
+          - test_reset_pquota_project.isoft == 0
+          - test_reset_pquota_project.ihard == 0
+          - test_reset_pquota_project.rtbsoft == 0
+          - test_reset_pquota_project.rtbhard == 0
   always:
-  - name: Unmount filesystem
-    become: true
-    ansible.posix.mount:
-      fstab: '{{ remote_tmp_dir }}/fstab'
-      path: '{{ remote_tmp_dir }}/pquota'
-      state: unmounted
-  - name: Remove disk image
-    file:
-      path: '{{ remote_tmp_dir }}/img-pquota'
-      state: absent
-  - name: Remove xfs quota project id
-    lineinfile:
-      path: /etc/projid
-      regexp: ^xft_quotaval:99999$
-      state: absent
-    become: true
-  - name: Remove xfs quota project path
-    lineinfile:
-      path: /etc/projects
-      regexp: ^99999:.*$
-      state: absent
-    become: true
+    - name: Unmount filesystem
+      become: true
+      ansible.posix.mount:
+        fstab: '{{ remote_tmp_dir }}/fstab'
+        path: '{{ remote_tmp_dir }}/pquota'
+        state: unmounted
+    - name: Remove disk image
+      file:
+        path: '{{ remote_tmp_dir }}/img-pquota'
+        state: absent
+    - name: Remove xfs quota project id
+      lineinfile:
+        path: /etc/projid
+        regexp: ^xft_quotaval:99999$
+        state: absent
+      become: true
+    - name: Remove xfs quota project path
+      lineinfile:
+        path: /etc/projects
+        regexp: ^99999:.*$
+        state: absent
+      become: true
diff --git a/tests/integration/targets/xfs_quota/tasks/uquota.yml b/tests/integration/targets/xfs_quota/tasks/uquota.yml
index 36a7eff766..0fcc0b30e0 100644
--- a/tests/integration/targets/xfs_quota/tasks/uquota.yml
+++ b/tests/integration/targets/xfs_quota/tasks/uquota.yml
@@ -12,136 +12,136 @@
     dev: '{{ remote_tmp_dir }}/img-uquota'
     fstype: xfs
 - block:
-  - name: Mount filesystem
-    become: true
-    ansible.posix.mount:
-      fstab: '{{ remote_tmp_dir }}/fstab'
-      src: '{{ remote_tmp_dir }}/img-uquota'
-      path: '{{ remote_tmp_dir }}/uquota'
-      fstype: xfs
-      opts: uquota
-      state: mounted
-  - name: Apply default user limits
-    xfs_quota:
-      bsoft: '{{ uquota_default_bsoft }}'
-      bhard: '{{ uquota_default_bhard }}'
-      isoft: '{{ uquota_default_isoft }}'
-      ihard: '{{ uquota_default_ihard }}'
-      mountpoint: '{{ remote_tmp_dir }}/uquota'
-      rtbsoft: '{{ uquota_default_rtbsoft }}'
-      rtbhard: '{{ uquota_default_rtbhard }}'
-      type: user
-    become: true
-    register: test_uquota_default_before
-  - name: Assert default user limits results
-    assert:
-      that:
-      - test_uquota_default_before.changed
-      - test_uquota_default_before.bsoft == uquota_default_bsoft|human_to_bytes
-      - test_uquota_default_before.bhard == uquota_default_bhard|human_to_bytes
-      - test_uquota_default_before.isoft == uquota_default_isoft
-      - test_uquota_default_before.ihard == uquota_default_ihard
-      - test_uquota_default_before.rtbsoft == uquota_default_rtbsoft|human_to_bytes
-      - test_uquota_default_before.rtbhard == uquota_default_rtbhard|human_to_bytes
-  - name: Apply user limits
-    xfs_quota:
-      bsoft: '{{ uquota_user_bsoft }}'
-      bhard: '{{ uquota_user_bhard }}'
-      isoft: '{{ uquota_user_isoft }}'
-      ihard: '{{ uquota_user_ihard }}'
-      mountpoint: '{{ remote_tmp_dir }}/uquota'
-      name: xfsquotauser
-      rtbsoft: '{{ uquota_user_rtbsoft }}'
-      rtbhard: '{{ uquota_user_rtbhard }}'
-      type: user
-    become: true
-    register: test_uquota_user_before
-  - name: Assert user limits results
-    assert:
-      that:
-      - test_uquota_user_before.changed
-      - test_uquota_user_before.bsoft == uquota_user_bsoft|human_to_bytes
-      - test_uquota_user_before.bhard == uquota_user_bhard|human_to_bytes
-      - test_uquota_user_before.isoft == uquota_user_isoft
-      - test_uquota_user_before.ihard == uquota_user_ihard
-      - test_uquota_user_before.rtbsoft == uquota_user_rtbsoft|human_to_bytes
-      - test_uquota_user_before.rtbhard == uquota_user_rtbhard|human_to_bytes
-  - name: Re-apply default user limits
-    xfs_quota:
-      bsoft: '{{ uquota_default_bsoft }}'
-      bhard: '{{ uquota_default_bhard }}'
-      isoft: '{{ uquota_default_isoft }}'
-      ihard: '{{ uquota_default_ihard }}'
-      mountpoint: '{{ remote_tmp_dir }}/uquota'
-      rtbsoft: '{{ uquota_default_rtbsoft }}'
-      rtbhard: '{{ uquota_default_rtbhard }}'
-      type: user
-    become: true
-    register: test_uquota_default_after
-  - name: Assert default user limits results after re-apply
-    assert:
-      that:
-      - not test_uquota_default_after.changed
-  - name: Re-apply user limits
-    xfs_quota:
-      bsoft: '{{ uquota_user_bsoft }}'
-      bhard: '{{ uquota_user_bhard }}'
-      isoft: '{{ uquota_user_isoft }}'
-      ihard: '{{ uquota_user_ihard }}'
-      mountpoint: '{{ remote_tmp_dir }}/uquota'
-      name: xfsquotauser
-      rtbsoft: '{{ uquota_user_rtbsoft }}'
-      rtbhard: '{{ uquota_user_rtbhard }}'
-      type: user
-    become: true
-    register: test_uquota_user_after
-  - name: Assert user limits results for xfsquotauser after re-apply
-    assert:
-      that:
-      - not test_uquota_user_after.changed
-  - name: Reset default user limits
-    xfs_quota:
-      mountpoint: '{{ remote_tmp_dir }}/uquota'
-      state: absent
-      type: user
-    become: true
-    register: test_reset_uquota_default
-  - name: Assert reset of default user limits results
-    assert:
-      that:
-      - test_reset_uquota_default.changed
-      - test_reset_uquota_default.bsoft == 0
-      - test_reset_uquota_default.bhard == 0
-      - test_reset_uquota_default.isoft == 0
-      - test_reset_uquota_default.ihard == 0
-      - test_reset_uquota_default.rtbsoft == 0
-      - test_reset_uquota_default.rtbhard == 0
-  - name: Reset user limits for xfsquotauser
-    xfs_quota:
-      mountpoint: '{{ remote_tmp_dir }}/uquota'
-      name: xfsquotauser
-      state: absent
-      type: user
-    become: true
-    register: test_reset_uquota_user
-  - name: Assert reset of default user limits results
-    assert:
-      that:
-      - test_reset_uquota_user.changed
-      - test_reset_uquota_user.bsoft == 0
-      - test_reset_uquota_user.bhard == 0
-      - test_reset_uquota_user.isoft == 0
-      - test_reset_uquota_user.ihard == 0
-      - test_reset_uquota_user.rtbsoft == 0
-      - test_reset_uquota_user.rtbhard == 0
+    - name: Mount filesystem
+      become: true
+      ansible.posix.mount:
+        fstab: '{{ remote_tmp_dir }}/fstab'
+        src: '{{ remote_tmp_dir }}/img-uquota'
+        path: '{{ remote_tmp_dir }}/uquota'
+        fstype: xfs
+        opts: uquota
+        state: mounted
+    - name: Apply default user limits
+      xfs_quota:
+        bsoft: '{{ uquota_default_bsoft }}'
+        bhard: '{{ uquota_default_bhard }}'
+        isoft: '{{ uquota_default_isoft }}'
+        ihard: '{{ uquota_default_ihard }}'
+        mountpoint: '{{ remote_tmp_dir }}/uquota'
+        rtbsoft: '{{ uquota_default_rtbsoft }}'
+        rtbhard: '{{ uquota_default_rtbhard }}'
+        type: user
+      become: true
+      register: test_uquota_default_before
+    - name: Assert default user limits results
+      assert:
+        that:
+          - test_uquota_default_before.changed
+          - test_uquota_default_before.bsoft == uquota_default_bsoft|human_to_bytes
+          - test_uquota_default_before.bhard == uquota_default_bhard|human_to_bytes
+          - test_uquota_default_before.isoft == uquota_default_isoft
+          - test_uquota_default_before.ihard == uquota_default_ihard
+          - test_uquota_default_before.rtbsoft == uquota_default_rtbsoft|human_to_bytes
+          - test_uquota_default_before.rtbhard == uquota_default_rtbhard|human_to_bytes
+    - name: Apply user limits
+      xfs_quota:
+        bsoft: '{{ uquota_user_bsoft }}'
+        bhard: '{{ uquota_user_bhard }}'
+        isoft: '{{ uquota_user_isoft }}'
+        ihard: '{{ uquota_user_ihard }}'
+        mountpoint: '{{ remote_tmp_dir }}/uquota'
+        name: xfsquotauser
+        rtbsoft: '{{ uquota_user_rtbsoft }}'
+        rtbhard: '{{ uquota_user_rtbhard }}'
+        type: user
+      become: true
+      register: test_uquota_user_before
+    - name: Assert user limits results
+      assert:
+        that:
+          - test_uquota_user_before.changed
+          - test_uquota_user_before.bsoft == uquota_user_bsoft|human_to_bytes
+          - test_uquota_user_before.bhard == uquota_user_bhard|human_to_bytes
+          - test_uquota_user_before.isoft == uquota_user_isoft
+          - test_uquota_user_before.ihard == uquota_user_ihard
+          - test_uquota_user_before.rtbsoft == uquota_user_rtbsoft|human_to_bytes
+          - test_uquota_user_before.rtbhard == uquota_user_rtbhard|human_to_bytes
+    - name: Re-apply default user limits
+      xfs_quota:
+        bsoft: '{{ uquota_default_bsoft }}'
+        bhard: '{{ uquota_default_bhard }}'
+        isoft: '{{ uquota_default_isoft }}'
+        ihard: '{{ uquota_default_ihard }}'
+        mountpoint: '{{ remote_tmp_dir }}/uquota'
+        rtbsoft: '{{ uquota_default_rtbsoft }}'
+        rtbhard: '{{ uquota_default_rtbhard }}'
+        type: user
+      become: true
+      register: test_uquota_default_after
+    - name: Assert default user limits results after re-apply
+      assert:
+        that:
+          - not test_uquota_default_after.changed
+    - name: Re-apply user limits
+      xfs_quota:
+        bsoft: '{{ uquota_user_bsoft }}'
+        bhard: '{{ uquota_user_bhard }}'
+        isoft: '{{ uquota_user_isoft }}'
+        ihard: '{{ uquota_user_ihard }}'
+        mountpoint: '{{ remote_tmp_dir }}/uquota'
+        name: xfsquotauser
+        rtbsoft: '{{ uquota_user_rtbsoft }}'
+        rtbhard: '{{ uquota_user_rtbhard }}'
+        type: user
+      become: true
+      register: test_uquota_user_after
+    - name: Assert user limits results for xfsquotauser after re-apply
+      assert:
+        that:
+          - not test_uquota_user_after.changed
+    - name: Reset default user limits
+      xfs_quota:
+        mountpoint: '{{ remote_tmp_dir }}/uquota'
+        state: absent
+        type: user
+      become: true
+      register: test_reset_uquota_default
+    - name: Assert reset of default user limits results
+      assert:
+        that:
+          - test_reset_uquota_default.changed
+          - test_reset_uquota_default.bsoft == 0
+          - test_reset_uquota_default.bhard == 0
+          - test_reset_uquota_default.isoft == 0
+          - test_reset_uquota_default.ihard == 0
+          - test_reset_uquota_default.rtbsoft == 0
+          - test_reset_uquota_default.rtbhard == 0
+    - name: Reset user limits for xfsquotauser
+      xfs_quota:
+        mountpoint: '{{ remote_tmp_dir }}/uquota'
+        name: xfsquotauser
+        state: absent
+        type: user
+      become: true
+      register: test_reset_uquota_user
+    - name: Assert reset of default user limits results
+      assert:
+        that:
+          - test_reset_uquota_user.changed
+          - test_reset_uquota_user.bsoft == 0
+          - test_reset_uquota_user.bhard == 0
+          - test_reset_uquota_user.isoft == 0
+          - test_reset_uquota_user.ihard == 0
+          - test_reset_uquota_user.rtbsoft == 0
+          - test_reset_uquota_user.rtbhard == 0
   always:
-  - name: Unmount filesystem
-    become: true
-    ansible.posix.mount:
-      fstab: '{{ remote_tmp_dir }}/fstab'
-      path: '{{ remote_tmp_dir }}/uquota'
-      state: unmounted
-  - name: Remove disk image
-    file:
-      path: '{{ remote_tmp_dir }}/img-uquota'
-      state: absent
+    - name: Unmount filesystem
+      become: true
+      ansible.posix.mount:
+        fstab: '{{ remote_tmp_dir }}/fstab'
+        path: '{{ remote_tmp_dir }}/uquota'
+        state: unmounted
+    - name: Remove disk image
+      file:
+        path: '{{ remote_tmp_dir }}/img-uquota'
+        state: absent
diff --git a/tests/integration/targets/xml/tasks/main.yml b/tests/integration/targets/xml/tasks/main.yml
index 7bd1e90f67..5c2c01ed53 100644
--- a/tests/integration/targets/xml/tasks/main.yml
+++ b/tests/integration/targets/xml/tasks/main.yml
@@ -47,41 +47,41 @@
   when: lxml_xpath_attribute_result_attrname
   block:
 
-  - include_tasks: test-add-children-elements.yml
-  - include_tasks: test-add-children-from-groupvars.yml
-  - include_tasks: test-add-children-insertafter.yml
-  - include_tasks: test-add-children-insertbefore.yml
-  - include_tasks: test-add-children-with-attributes.yml
-  - include_tasks: test-add-element-implicitly.yml
-  - include_tasks: test-count.yml
-  - include_tasks: test-mutually-exclusive-attributes.yml
-  - include_tasks: test-remove-attribute.yml
-  - include_tasks: test-remove-attribute-nochange.yml
-  - include_tasks: test-remove-element.yml
-  - include_tasks: test-remove-element-nochange.yml
-  - include_tasks: test-set-attribute-value.yml
-  - include_tasks: test-set-children-elements.yml
-  - include_tasks: test-set-children-elements-level.yml
-  - include_tasks: test-set-children-elements-value.yml
-  - include_tasks: test-set-element-value.yml
-  - include_tasks: test-set-element-value-empty.yml
-  - include_tasks: test-pretty-print.yml
-  - include_tasks: test-pretty-print-only.yml
-  - include_tasks: test-add-namespaced-children-elements.yml
-  - include_tasks: test-remove-namespaced-attribute.yml
-  - include_tasks: test-remove-namespaced-attribute-nochange.yml
-  - include_tasks: test-set-namespaced-attribute-value.yml
-  - include_tasks: test-set-namespaced-element-value.yml
-  - include_tasks: test-set-namespaced-children-elements.yml
-  - include_tasks: test-get-element-content.yml
-  - include_tasks: test-xmlstring.yml
-  - include_tasks: test-children-elements-xml.yml
+    - include_tasks: test-add-children-elements.yml
+    - include_tasks: test-add-children-from-groupvars.yml
+    - include_tasks: test-add-children-insertafter.yml
+    - include_tasks: test-add-children-insertbefore.yml
+    - include_tasks: test-add-children-with-attributes.yml
+    - include_tasks: test-add-element-implicitly.yml
+    - include_tasks: test-count.yml
+    - include_tasks: test-mutually-exclusive-attributes.yml
+    - include_tasks: test-remove-attribute.yml
+    - include_tasks: test-remove-attribute-nochange.yml
+    - include_tasks: test-remove-element.yml
+    - include_tasks: test-remove-element-nochange.yml
+    - include_tasks: test-set-attribute-value.yml
+    - include_tasks: test-set-children-elements.yml
+    - include_tasks: test-set-children-elements-level.yml
+    - include_tasks: test-set-children-elements-value.yml
+    - include_tasks: test-set-element-value.yml
+    - include_tasks: test-set-element-value-empty.yml
+    - include_tasks: test-pretty-print.yml
+    - include_tasks: test-pretty-print-only.yml
+    - include_tasks: test-add-namespaced-children-elements.yml
+    - include_tasks: test-remove-namespaced-attribute.yml
+    - include_tasks: test-remove-namespaced-attribute-nochange.yml
+    - include_tasks: test-set-namespaced-attribute-value.yml
+    - include_tasks: test-set-namespaced-element-value.yml
+    - include_tasks: test-set-namespaced-children-elements.yml
+    - include_tasks: test-get-element-content.yml
+    - include_tasks: test-xmlstring.yml
+    - include_tasks: test-children-elements-xml.yml
 
-  # Unicode tests
-  - include_tasks: test-add-children-elements-unicode.yml
-  - include_tasks: test-add-children-with-attributes-unicode.yml
-  - include_tasks: test-set-attribute-value-unicode.yml
-  - include_tasks: test-count-unicode.yml
-  - include_tasks: test-get-element-content.yml
-  - include_tasks: test-set-children-elements-unicode.yml
-  - include_tasks: test-set-element-value-unicode.yml
+    # Unicode tests
+    - include_tasks: test-add-children-elements-unicode.yml
+    - include_tasks: test-add-children-with-attributes-unicode.yml
+    - include_tasks: test-set-attribute-value-unicode.yml
+    - include_tasks: test-count-unicode.yml
+    - include_tasks: test-get-element-content.yml
+    - include_tasks: test-set-children-elements-unicode.yml
+    - include_tasks: test-set-element-value-unicode.yml
diff --git a/tests/integration/targets/xml/tasks/test-add-children-elements-unicode.yml b/tests/integration/targets/xml/tasks/test-add-children-elements-unicode.yml
index e15ac5fd92..0b79cdafa5 100644
--- a/tests/integration/targets/xml/tasks/test-add-children-elements-unicode.yml
+++ b/tests/integration/targets/xml/tasks/test-add-children-elements-unicode.yml
@@ -3,34 +3,34 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-beers.xml
-      dest: /tmp/ansible-xml-beers.xml
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-beers.xml
+    dest: /tmp/ansible-xml-beers.xml
 
 
-  - name: Add child element
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: /business/beers
-      add_children:
+- name: Add child element
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: /business/beers
+    add_children:
       - beer: Окское
-    register: add_children_elements_unicode
+  register: add_children_elements_unicode
 
-  - name: Add trailing newline
-    shell: echo "" >> /tmp/ansible-xml-beers.xml
+- name: Add trailing newline
+  shell: echo "" >> /tmp/ansible-xml-beers.xml
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-add-children-elements-unicode.xml
-      dest: /tmp/ansible-xml-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-add-children-elements-unicode.xml
+    dest: /tmp/ansible-xml-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - add_children_elements_unicode is changed
       - comparison is not changed  # identical
-    #command: diff -u {{ role_path }}/results/test-add-children-elements-unicode.xml /tmp/ansible-xml-beers.xml
+  # command: diff -u {{ role_path }}/results/test-add-children-elements-unicode.xml /tmp/ansible-xml-beers.xml
diff --git a/tests/integration/targets/xml/tasks/test-add-children-elements.yml b/tests/integration/targets/xml/tasks/test-add-children-elements.yml
index 29467f6d6f..68e295cccf 100644
--- a/tests/integration/targets/xml/tasks/test-add-children-elements.yml
+++ b/tests/integration/targets/xml/tasks/test-add-children-elements.yml
@@ -3,34 +3,34 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-beers.xml
-      dest: /tmp/ansible-xml-beers.xml
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-beers.xml
+    dest: /tmp/ansible-xml-beers.xml
 
 
-  - name: Add child element
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: /business/beers
-      add_children:
+- name: Add child element
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: /business/beers
+    add_children:
       - beer: Old Rasputin
-    register: add_children_elements
+  register: add_children_elements
 
-  - name: Add trailing newline
-    shell: echo "" >> /tmp/ansible-xml-beers.xml
+- name: Add trailing newline
+  shell: echo "" >> /tmp/ansible-xml-beers.xml
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-add-children-elements.xml
-      dest: /tmp/ansible-xml-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-add-children-elements.xml
+    dest: /tmp/ansible-xml-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - add_children_elements is changed
       - comparison is not changed  # identical
-    #command: diff -u {{ role_path }}/results/test-add-children-elements.xml /tmp/ansible-xml-beers.xml
+  # command: diff -u {{ role_path }}/results/test-add-children-elements.xml /tmp/ansible-xml-beers.xml
diff --git a/tests/integration/targets/xml/tasks/test-add-children-from-groupvars.yml b/tests/integration/targets/xml/tasks/test-add-children-from-groupvars.yml
index 2b232b6d0d..d65abd152a 100644
--- a/tests/integration/targets/xml/tasks/test-add-children-from-groupvars.yml
+++ b/tests/integration/targets/xml/tasks/test-add-children-from-groupvars.yml
@@ -3,33 +3,33 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-beers.xml
-      dest: /tmp/ansible-xml-beers.xml
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-beers.xml
+    dest: /tmp/ansible-xml-beers.xml
 
 
-  - name: Add child element
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: /business/beers
-      add_children: '{{ bad_beers }}'
-    register: add_children_from_groupvars
+- name: Add child element
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: /business/beers
+    add_children: '{{ bad_beers }}'
+  register: add_children_from_groupvars
 
-  - name: Add trailing newline
-    shell: echo "" >> /tmp/ansible-xml-beers.xml
+- name: Add trailing newline
+  shell: echo "" >> /tmp/ansible-xml-beers.xml
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-add-children-from-groupvars.xml
-      dest: /tmp/ansible-xml-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-add-children-from-groupvars.xml
+    dest: /tmp/ansible-xml-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - add_children_from_groupvars is changed
       - comparison is not changed  # identical
-    #command: diff -u {{ role_path }}/results/test-add-children-from-groupvars.xml /tmp/ansible-xml-beers.xml
+  # command: diff -u {{ role_path }}/results/test-add-children-from-groupvars.xml /tmp/ansible-xml-beers.xml
diff --git a/tests/integration/targets/xml/tasks/test-add-children-insertafter.yml b/tests/integration/targets/xml/tasks/test-add-children-insertafter.yml
index 7795c89663..4c581556e8 100644
--- a/tests/integration/targets/xml/tasks/test-add-children-insertafter.yml
+++ b/tests/integration/targets/xml/tasks/test-add-children-insertafter.yml
@@ -3,34 +3,34 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-beers.xml
-      dest: /tmp/ansible-xml-beers.xml
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-beers.xml
+    dest: /tmp/ansible-xml-beers.xml
 
 
-  - name: Add child element
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: '/business/beers/beer[text()="St. Bernardus Abbot 12"]'
-      insertafter: true
-      add_children:
+- name: Add child element
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: '/business/beers/beer[text()="St. Bernardus Abbot 12"]'
+    insertafter: true
+    add_children:
       - beer: Old Rasputin
       - beer: Old Motor Oil
       - beer: Old Curmudgeon
-      pretty_print: true
-    register: add_children_insertafter
+    pretty_print: true
+  register: add_children_insertafter
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-add-children-insertafter.xml
-      dest: /tmp/ansible-xml-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-add-children-insertafter.xml
+    dest: /tmp/ansible-xml-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - add_children_insertafter is changed
       - comparison is not changed  # identical
diff --git a/tests/integration/targets/xml/tasks/test-add-children-insertbefore.yml b/tests/integration/targets/xml/tasks/test-add-children-insertbefore.yml
index b14c5e06fc..6b7b325e8f 100644
--- a/tests/integration/targets/xml/tasks/test-add-children-insertbefore.yml
+++ b/tests/integration/targets/xml/tasks/test-add-children-insertbefore.yml
@@ -3,34 +3,34 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-beers.xml
-      dest: /tmp/ansible-xml-beers.xml
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-beers.xml
+    dest: /tmp/ansible-xml-beers.xml
 
 
-  - name: Add child element
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: '/business/beers/beer[text()="St. Bernardus Abbot 12"]'
-      insertbefore: true
-      add_children:
+- name: Add child element
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: '/business/beers/beer[text()="St. Bernardus Abbot 12"]'
+    insertbefore: true
+    add_children:
       - beer: Old Rasputin
       - beer: Old Motor Oil
       - beer: Old Curmudgeon
-      pretty_print: true
-    register: add_children_insertbefore
+    pretty_print: true
+  register: add_children_insertbefore
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-add-children-insertbefore.xml
-      dest: /tmp/ansible-xml-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-add-children-insertbefore.xml
+    dest: /tmp/ansible-xml-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - add_children_insertbefore is changed
       - comparison is not changed  # identical
diff --git a/tests/integration/targets/xml/tasks/test-add-children-with-attributes-unicode.yml b/tests/integration/targets/xml/tasks/test-add-children-with-attributes-unicode.yml
index 07905aa15c..b09a117e5b 100644
--- a/tests/integration/targets/xml/tasks/test-add-children-with-attributes-unicode.yml
+++ b/tests/integration/targets/xml/tasks/test-add-children-with-attributes-unicode.yml
@@ -3,36 +3,36 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-beers.xml
-      dest: /tmp/ansible-xml-beers.xml
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-beers.xml
+    dest: /tmp/ansible-xml-beers.xml
 
 
-  - name: Add child element
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: /business/beers
-      add_children:
+- name: Add child element
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: /business/beers
+    add_children:
       - beer:
           name: Окское
           type: экстра
-    register: add_children_with_attributes_unicode
+  register: add_children_with_attributes_unicode
 
-  - name: Add trailing newline
-    shell: echo "" >> /tmp/ansible-xml-beers.xml
+- name: Add trailing newline
+  shell: echo "" >> /tmp/ansible-xml-beers.xml
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-add-children-with-attributes-unicode.xml
-      dest: /tmp/ansible-xml-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-add-children-with-attributes-unicode.xml
+    dest: /tmp/ansible-xml-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - add_children_with_attributes_unicode is changed
       - comparison is not changed  # identical
-    #command: diff -u {{ role_path }}/results/test-add-children-with-attributes-unicode.xml /tmp/ansible-xml-beers.xml
+  # command: diff -u {{ role_path }}/results/test-add-children-with-attributes-unicode.xml /tmp/ansible-xml-beers.xml
diff --git a/tests/integration/targets/xml/tasks/test-add-children-with-attributes.yml b/tests/integration/targets/xml/tasks/test-add-children-with-attributes.yml
index fede24395f..3cc1b36875 100644
--- a/tests/integration/targets/xml/tasks/test-add-children-with-attributes.yml
+++ b/tests/integration/targets/xml/tasks/test-add-children-with-attributes.yml
@@ -3,40 +3,40 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-beers.xml
-      dest: /tmp/ansible-xml-beers.xml
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-beers.xml
+    dest: /tmp/ansible-xml-beers.xml
 
 
-  - name: Add child element
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: /business/beers
-      add_children:
+- name: Add child element
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: /business/beers
+    add_children:
       - beer:
           name: Ansible Brew
           type: light
-    register: add_children_with_attributes
+  register: add_children_with_attributes
 
-  - name: Add trailing newline
-    shell: echo "" >> /tmp/ansible-xml-beers.xml
+- name: Add trailing newline
+  shell: echo "" >> /tmp/ansible-xml-beers.xml
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-add-children-with-attributes.xml
-      dest: /tmp/ansible-xml-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-add-children-with-attributes.xml
+    dest: /tmp/ansible-xml-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  # NOTE: This test may fail if lxml does not support predictable element attribute order
-  #       So we filter the failure out for these platforms (e.g. CentOS 6)
-  #       The module still works fine, we simply are not comparing as smart as we should.
-  - name: Test expected result
-    assert:
-      that:
+# NOTE: This test may fail if lxml does not support predictable element attribute order
+#       So we filter the failure out for these platforms (e.g. CentOS 6)
+#       The module still works fine, we simply are not comparing as smart as we should.
+- name: Test expected result
+  assert:
+    that:
       - add_children_with_attributes is changed
       - comparison is not changed  # identical
-    when: lxml_predictable_attribute_order
-    #command: diff -u {{ role_path }}/results/test-add-children-with-attributes.xml /tmp/ansible-xml-beers.xml
+  when: lxml_predictable_attribute_order
+  # command: diff -u {{ role_path }}/results/test-add-children-with-attributes.xml /tmp/ansible-xml-beers.xml
diff --git a/tests/integration/targets/xml/tasks/test-add-element-implicitly.yml b/tests/integration/targets/xml/tasks/test-add-element-implicitly.yml
index b1718e452e..65cc19ca12 100644
--- a/tests/integration/targets/xml/tasks/test-add-element-implicitly.yml
+++ b/tests/integration/targets/xml/tasks/test-add-element-implicitly.yml
@@ -44,8 +44,8 @@
 
 - name: Add an attribute with a value
   xml:
-     file: /tmp/ansible-xml-beers-implicit.xml
-     xpath: /business/owner/@dob='1976-04-12'
+    file: /tmp/ansible-xml-beers-implicit.xml
+    xpath: /business/owner/@dob='1976-04-12'
 
 - name: Add an element with a value, alternate syntax
   xml:
@@ -112,8 +112,8 @@
 - name: Test expected result
   assert:
     that:
-    - comparison is not changed  # identical
-  #command: diff -u {{ role_path }}/results/test-add-element-implicitly.xml /tmp/ansible-xml-beers-implicit.xml
+      - comparison is not changed  # identical
+  # command: diff -u {{ role_path }}/results/test-add-element-implicitly.xml /tmp/ansible-xml-beers-implicit.xml
 
 
 # Now we repeat the same, just to ensure proper use of namespaces
@@ -205,7 +205,7 @@
     value: xml tag with no special characters
     pretty_print: true
     namespaces:
-      a:  http://example.com/some/namespace
+      a: http://example.com/some/namespace
 
 
 - name: Add an element with dash
@@ -215,7 +215,7 @@
     value: xml tag with dashes
     pretty_print: true
     namespaces:
-      a:  http://example.com/some/namespace
+      a: http://example.com/some/namespace
 
 - name: Add an element with dot
   xml:
@@ -224,7 +224,7 @@
     value: xml tag with dashes and dots
     pretty_print: true
     namespaces:
-      a:  http://example.com/some/namespace
+      a: http://example.com/some/namespace
 
 - name: Add an element with underscore
   xml:
@@ -233,7 +233,7 @@
     value: xml tag with dashes, dots and underscores
     pretty_print: true
     namespaces:
-      a:  http://example.com/some/namespace
+      a: http://example.com/some/namespace
 
 - name: Pretty Print this!
   xml:
diff --git a/tests/integration/targets/xml/tasks/test-add-namespaced-children-elements.yml b/tests/integration/targets/xml/tasks/test-add-namespaced-children-elements.yml
index 2a9daab787..884fc4a917 100644
--- a/tests/integration/targets/xml/tasks/test-add-namespaced-children-elements.yml
+++ b/tests/integration/targets/xml/tasks/test-add-namespaced-children-elements.yml
@@ -3,37 +3,37 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-namespaced-beers.xml
-      dest: /tmp/ansible-xml-namespaced-beers.xml
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-namespaced-beers.xml
+    dest: /tmp/ansible-xml-namespaced-beers.xml
 
 
-  - name: Add namespaced child element
-    xml:
-      path: /tmp/ansible-xml-namespaced-beers.xml
-      xpath: /bus:business/ber:beers
-      namespaces:
-        bus: http://test.business
-        ber: http://test.beers
-      add_children:
+- name: Add namespaced child element
+  xml:
+    path: /tmp/ansible-xml-namespaced-beers.xml
+    xpath: /bus:business/ber:beers
+    namespaces:
+      bus: http://test.business
+      ber: http://test.beers
+    add_children:
       - beer: Old Rasputin
-    register: add_namespaced_children_elements
+  register: add_namespaced_children_elements
 
-  - name: Add trailing newline
-    shell: echo "" >> /tmp/ansible-xml-namespaced-beers.xml
+- name: Add trailing newline
+  shell: echo "" >> /tmp/ansible-xml-namespaced-beers.xml
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-add-namespaced-children-elements.xml
-      dest: /tmp/ansible-xml-namespaced-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-add-namespaced-children-elements.xml
+    dest: /tmp/ansible-xml-namespaced-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - add_namespaced_children_elements is changed
       - comparison is not changed  # identical
-    #command: diff -u {{ role_path }}/results/test-add-namespaced-children-elements.xml /tmp/ansible-xml-namespaced-beers.xml
+  # command: diff -u {{ role_path }}/results/test-add-namespaced-children-elements.xml /tmp/ansible-xml-namespaced-beers.xml
diff --git a/tests/integration/targets/xml/tasks/test-children-elements-xml.yml b/tests/integration/targets/xml/tasks/test-children-elements-xml.yml
index 1c8c2b804d..630699dd56 100644
--- a/tests/integration/targets/xml/tasks/test-children-elements-xml.yml
+++ b/tests/integration/targets/xml/tasks/test-children-elements-xml.yml
@@ -3,35 +3,35 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-beers.xml
-      dest: /tmp/ansible-xml-beers.xml
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-beers.xml
+    dest: /tmp/ansible-xml-beers.xml
 
 
-  - name: Add child element with xml format
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: /business/beers
-      input_type: xml
-      add_children:
+- name: Add child element with xml format
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: /business/beers
+    input_type: xml
+    add_children:
       - '<beer>Old Rasputin</beer>'
-    register: children_elements
+  register: children_elements
 
-  - name: Add trailing newline
-    shell: echo "" >> /tmp/ansible-xml-beers.xml
+- name: Add trailing newline
+  shell: echo "" >> /tmp/ansible-xml-beers.xml
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-add-children-elements.xml
-      dest: /tmp/ansible-xml-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-add-children-elements.xml
+    dest: /tmp/ansible-xml-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - children_elements is changed
       - comparison is not changed  # identical
-    #command: diff -u {{ role_path }}/results/test-add-children-elements.xml /tmp/ansible-xml-beers.xml
+  # command: diff -u {{ role_path }}/results/test-add-children-elements.xml /tmp/ansible-xml-beers.xml
diff --git a/tests/integration/targets/xml/tasks/test-count-unicode.yml b/tests/integration/targets/xml/tasks/test-count-unicode.yml
index 118e2986db..e54e466902 100644
--- a/tests/integration/targets/xml/tasks/test-count-unicode.yml
+++ b/tests/integration/targets/xml/tasks/test-count-unicode.yml
@@ -3,21 +3,21 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-beers-unicode.xml
-      dest: /tmp/ansible-xml-beers-unicode.xml
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-beers-unicode.xml
+    dest: /tmp/ansible-xml-beers-unicode.xml
 
 
-  - name: Count child element
-    xml:
-      path: /tmp/ansible-xml-beers-unicode.xml
-      xpath: /business/beers/beer
-      count: true
-    register: beers
+- name: Count child element
+  xml:
+    path: /tmp/ansible-xml-beers-unicode.xml
+    xpath: /business/beers/beer
+    count: true
+  register: beers
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - beers is not changed
       - beers.count == 2
diff --git a/tests/integration/targets/xml/tasks/test-count.yml b/tests/integration/targets/xml/tasks/test-count.yml
index 79be9402fe..1e4b043a02 100644
--- a/tests/integration/targets/xml/tasks/test-count.yml
+++ b/tests/integration/targets/xml/tasks/test-count.yml
@@ -3,21 +3,21 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-beers.xml
-      dest: /tmp/ansible-xml-beers.xml
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-beers.xml
+    dest: /tmp/ansible-xml-beers.xml
 
 
-  - name: Add child element
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: /business/beers/beer
-      count: true
-    register: beers
+- name: Add child element
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: /business/beers/beer
+    count: true
+  register: beers
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - beers is not changed
       - beers.count == 3
diff --git a/tests/integration/targets/xml/tasks/test-get-element-content-unicode.yml b/tests/integration/targets/xml/tasks/test-get-element-content-unicode.yml
index 475f962ebe..f57e5fa33d 100644
--- a/tests/integration/targets/xml/tasks/test-get-element-content-unicode.yml
+++ b/tests/integration/targets/xml/tasks/test-get-element-content-unicode.yml
@@ -3,34 +3,34 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-beers-unicode.xml
-      dest: /tmp/ansible-xml-beers-unicode.xml
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-beers-unicode.xml
+    dest: /tmp/ansible-xml-beers-unicode.xml
 
 
-  - name: Get element attributes
-    xml:
-      path: /tmp/ansible-xml-beers-unicode.xml
-      xpath: /business/rating
-      content: attribute
-    register: get_element_attribute
+- name: Get element attributes
+  xml:
+    path: /tmp/ansible-xml-beers-unicode.xml
+    xpath: /business/rating
+    content: attribute
+  register: get_element_attribute
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - get_element_attribute is not changed
       - get_element_attribute.matches[0]['rating'] is defined and get_element_attribute.matches[0]['rating']['subjective'] == 'да'
 
-  - name: Get element text
-    xml:
-      path: /tmp/ansible-xml-beers-unicode.xml
-      xpath: /business/rating
-      content: text
-    register: get_element_text
+- name: Get element text
+  xml:
+    path: /tmp/ansible-xml-beers-unicode.xml
+    xpath: /business/rating
+    content: text
+  register: get_element_text
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - get_element_text is not changed
       - get_element_text.matches[0]['rating'] == 'десять'
diff --git a/tests/integration/targets/xml/tasks/test-get-element-content.yml b/tests/integration/targets/xml/tasks/test-get-element-content.yml
index c75bdb223a..2bef5fd165 100644
--- a/tests/integration/targets/xml/tasks/test-get-element-content.yml
+++ b/tests/integration/targets/xml/tasks/test-get-element-content.yml
@@ -3,49 +3,49 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-beers.xml
-      dest: /tmp/ansible-xml-beers.xml
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-beers.xml
+    dest: /tmp/ansible-xml-beers.xml
 
 
-  - name: Get element attributes
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: /business/rating
-      content: attribute
-    register: get_element_attribute
+- name: Get element attributes
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: /business/rating
+    content: attribute
+  register: get_element_attribute
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - get_element_attribute is not changed
       - get_element_attribute.matches[0]['rating'] is defined
       - get_element_attribute.matches[0]['rating']['subjective'] == 'true'
 
-  - name: Get element attributes (should fail)
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: /business/rating
-      content: attribute
-      attribute: subjective
-    register: get_element_attribute_wrong
-    ignore_errors: true
+- name: Get element attributes (should fail)
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: /business/rating
+    content: attribute
+    attribute: subjective
+  register: get_element_attribute_wrong
+  ignore_errors: true
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - get_element_attribute_wrong is failed
 
-  - name: Get element text
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: /business/rating
-      content: text
-    register: get_element_text
+- name: Get element text
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: /business/rating
+    content: text
+  register: get_element_text
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - get_element_text is not changed
       - get_element_text.matches[0]['rating'] == '10'
diff --git a/tests/integration/targets/xml/tasks/test-mutually-exclusive-attributes.yml b/tests/integration/targets/xml/tasks/test-mutually-exclusive-attributes.yml
index 33f129e2e6..90bd14f7ed 100644
--- a/tests/integration/targets/xml/tasks/test-mutually-exclusive-attributes.yml
+++ b/tests/integration/targets/xml/tasks/test-mutually-exclusive-attributes.yml
@@ -3,24 +3,24 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-beers.xml
-      dest: /tmp/ansible-xml-beers.xml
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-beers.xml
+    dest: /tmp/ansible-xml-beers.xml
 
 
-  - name: Specify both children to add and a value
-    xml:
-        path: /tmp/ansible-xml-beers.xml
-        add_children:
-        - child01
-        - child02
-        value: conflict!
-    register: module_output
-    ignore_errors: true
+- name: Specify both children to add and a value
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    add_children:
+      - child01
+      - child02
+    value: conflict!
+  register: module_output
+  ignore_errors: true
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - module_output is not changed
       - module_output is failed
diff --git a/tests/integration/targets/xml/tasks/test-pretty-print-only.yml b/tests/integration/targets/xml/tasks/test-pretty-print-only.yml
index 03d3299aa7..bd419e2313 100644
--- a/tests/integration/targets/xml/tasks/test-pretty-print-only.yml
+++ b/tests/integration/targets/xml/tasks/test-pretty-print-only.yml
@@ -3,31 +3,31 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-beers.xml
-      dest: /tmp/ansible-xml-beers.xml.orig
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-beers.xml
+    dest: /tmp/ansible-xml-beers.xml.orig
 
-  - name: Remove spaces from test fixture
-    shell: sed 's/^[ ]*//g' < /tmp/ansible-xml-beers.xml.orig > /tmp/ansible-xml-beers.xml
+- name: Remove spaces from test fixture
+  shell: sed 's/^[ ]*//g' < /tmp/ansible-xml-beers.xml.orig > /tmp/ansible-xml-beers.xml
 
-  - name: Pretty print without modification
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      pretty_print: true
-    register: pretty_print_only
+- name: Pretty print without modification
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    pretty_print: true
+  register: pretty_print_only
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-pretty-print-only.xml
-      dest: /tmp/ansible-xml-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-pretty-print-only.xml
+    dest: /tmp/ansible-xml-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - pretty_print_only is changed
       - comparison is not changed  # identical
-    #command: diff -u {{ role_path }}/results/test-pretty-print-only.xml /tmp/ansible-xml-beers.xml
+  # command: diff -u {{ role_path }}/results/test-pretty-print-only.xml /tmp/ansible-xml-beers.xml
diff --git a/tests/integration/targets/xml/tasks/test-pretty-print.yml b/tests/integration/targets/xml/tasks/test-pretty-print.yml
index 51b34502d5..baa8570cf2 100644
--- a/tests/integration/targets/xml/tasks/test-pretty-print.yml
+++ b/tests/integration/targets/xml/tasks/test-pretty-print.yml
@@ -3,32 +3,32 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-beers.xml
-      dest: /tmp/ansible-xml-beers.xml
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-beers.xml
+    dest: /tmp/ansible-xml-beers.xml
 
 
-  - name: Pretty print
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: /business/beers
-      pretty_print: true
-      add_children:
+- name: Pretty print
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: /business/beers
+    pretty_print: true
+    add_children:
       - beer: Old Rasputin
-    register: pretty_print
+  register: pretty_print
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-pretty-print.xml
-      dest: /tmp/ansible-xml-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-pretty-print.xml
+    dest: /tmp/ansible-xml-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - pretty_print is changed
       - comparison is not changed  # identical
-    #command: diff -u {{ role_path }}/results/test-pretty-print.xml /tmp/ansible-xml-beers.xml
+  # command: diff -u {{ role_path }}/results/test-pretty-print.xml /tmp/ansible-xml-beers.xml
diff --git a/tests/integration/targets/xml/tasks/test-remove-attribute-nochange.yml b/tests/integration/targets/xml/tasks/test-remove-attribute-nochange.yml
index 3222bd4368..7e1cc73456 100644
--- a/tests/integration/targets/xml/tasks/test-remove-attribute-nochange.yml
+++ b/tests/integration/targets/xml/tasks/test-remove-attribute-nochange.yml
@@ -3,30 +3,30 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: results/test-remove-attribute.xml
-      dest: /tmp/ansible-xml-beers.xml
+- name: Setup test fixture
+  copy:
+    src: results/test-remove-attribute.xml
+    dest: /tmp/ansible-xml-beers.xml
 
 
-  - name: Remove non-existing '/business/rating/@subjective'
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: /business/rating/@subjective
-      state: absent
-    register: remove_attribute
+- name: Remove non-existing '/business/rating/@subjective'
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: /business/rating/@subjective
+    state: absent
+  register: remove_attribute
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-remove-attribute.xml
-      dest: /tmp/ansible-xml-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-remove-attribute.xml
+    dest: /tmp/ansible-xml-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - remove_attribute is not changed
       - comparison is not changed  # identical
-    #command: diff -u {{ role_path }}/results/test-remove-attribute.xml /tmp/ansible-xml-beers.xml
+  # command: diff -u {{ role_path }}/results/test-remove-attribute.xml /tmp/ansible-xml-beers.xml
diff --git a/tests/integration/targets/xml/tasks/test-remove-attribute.yml b/tests/integration/targets/xml/tasks/test-remove-attribute.yml
index e8952a655e..9b24a37a9f 100644
--- a/tests/integration/targets/xml/tasks/test-remove-attribute.yml
+++ b/tests/integration/targets/xml/tasks/test-remove-attribute.yml
@@ -3,33 +3,33 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-beers.xml
-      dest: /tmp/ansible-xml-beers.xml
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-beers.xml
+    dest: /tmp/ansible-xml-beers.xml
 
 
-  - name: Remove '/business/rating/@subjective'
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: /business/rating/@subjective
-      state: absent
-    register: remove_attribute
+- name: Remove '/business/rating/@subjective'
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: /business/rating/@subjective
+    state: absent
+  register: remove_attribute
 
-  - name: Add trailing newline
-    shell: echo "" >> /tmp/ansible-xml-beers.xml
+- name: Add trailing newline
+  shell: echo "" >> /tmp/ansible-xml-beers.xml
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-remove-attribute.xml
-      dest: /tmp/ansible-xml-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-remove-attribute.xml
+    dest: /tmp/ansible-xml-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - remove_attribute is changed
       - comparison is not changed  # identical
-    #command: diff -u {{ role_path }}/results/test-remove-attribute.xml /tmp/ansible-xml-beers.xml
+  # command: diff -u {{ role_path }}/results/test-remove-attribute.xml /tmp/ansible-xml-beers.xml
diff --git a/tests/integration/targets/xml/tasks/test-remove-element-nochange.yml b/tests/integration/targets/xml/tasks/test-remove-element-nochange.yml
index c1312c5a75..44b1e95a3f 100644
--- a/tests/integration/targets/xml/tasks/test-remove-element-nochange.yml
+++ b/tests/integration/targets/xml/tasks/test-remove-element-nochange.yml
@@ -3,30 +3,30 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: results/test-remove-element.xml
-      dest: /tmp/ansible-xml-beers.xml
+- name: Setup test fixture
+  copy:
+    src: results/test-remove-element.xml
+    dest: /tmp/ansible-xml-beers.xml
 
 
-  - name: Remove non-existing '/business/rating'
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: /business/rating
-      state: absent
-    register: remove_element
+- name: Remove non-existing '/business/rating'
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: /business/rating
+    state: absent
+  register: remove_element
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-remove-element.xml
-      dest: /tmp/ansible-xml-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-remove-element.xml
+    dest: /tmp/ansible-xml-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - remove_element is not changed
       - comparison is not changed  # identical
-    #command: diff -u {{ role_path }}/results/test-remove-element.xml /tmp/ansible-xml-beers.xml
+  # command: diff -u {{ role_path }}/results/test-remove-element.xml /tmp/ansible-xml-beers.xml
diff --git a/tests/integration/targets/xml/tasks/test-remove-element.yml b/tests/integration/targets/xml/tasks/test-remove-element.yml
index bea376ba93..c2fc081304 100644
--- a/tests/integration/targets/xml/tasks/test-remove-element.yml
+++ b/tests/integration/targets/xml/tasks/test-remove-element.yml
@@ -3,33 +3,33 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-beers.xml
-      dest: /tmp/ansible-xml-beers.xml
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-beers.xml
+    dest: /tmp/ansible-xml-beers.xml
 
 
-  - name: Remove '/business/rating'
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: /business/rating
-      state: absent
-    register: remove_element
+- name: Remove '/business/rating'
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: /business/rating
+    state: absent
+  register: remove_element
 
-  - name: Add trailing newline
-    shell: echo "" >> /tmp/ansible-xml-beers.xml
+- name: Add trailing newline
+  shell: echo "" >> /tmp/ansible-xml-beers.xml
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-remove-element.xml
-      dest: /tmp/ansible-xml-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-remove-element.xml
+    dest: /tmp/ansible-xml-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - remove_element is changed
       - comparison is not changed  # identical
-    #command: diff -u {{ role_path }}/results/test-remove-element.xml /tmp/ansible-xml-beers.xml
+  # command: diff -u {{ role_path }}/results/test-remove-element.xml /tmp/ansible-xml-beers.xml
diff --git a/tests/integration/targets/xml/tasks/test-remove-namespaced-attribute-nochange.yml b/tests/integration/targets/xml/tasks/test-remove-namespaced-attribute-nochange.yml
index 61b7179ba0..97855ce77b 100644
--- a/tests/integration/targets/xml/tasks/test-remove-namespaced-attribute-nochange.yml
+++ b/tests/integration/targets/xml/tasks/test-remove-namespaced-attribute-nochange.yml
@@ -3,35 +3,35 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: results/test-remove-namespaced-attribute.xml
-      dest: /tmp/ansible-xml-namespaced-beers.xml
+- name: Setup test fixture
+  copy:
+    src: results/test-remove-namespaced-attribute.xml
+    dest: /tmp/ansible-xml-namespaced-beers.xml
 
 
-  - name: Remove non-existing namespaced '/bus:business/rat:rating/@attr:subjective'
-    xml:
-      path: /tmp/ansible-xml-namespaced-beers.xml
-      xpath: /bus:business/rat:rating/@attr:subjective
-      namespaces:
-        bus: http://test.business
-        ber: http://test.beers
-        rat: http://test.rating
-        attr: http://test.attribute
-      state: absent
-    register: remove_namespaced_attribute
+- name: Remove non-existing namespaced '/bus:business/rat:rating/@attr:subjective'
+  xml:
+    path: /tmp/ansible-xml-namespaced-beers.xml
+    xpath: /bus:business/rat:rating/@attr:subjective
+    namespaces:
+      bus: http://test.business
+      ber: http://test.beers
+      rat: http://test.rating
+      attr: http://test.attribute
+    state: absent
+  register: remove_namespaced_attribute
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-remove-namespaced-attribute.xml
-      dest: /tmp/ansible-xml-namespaced-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-remove-namespaced-attribute.xml
+    dest: /tmp/ansible-xml-namespaced-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - remove_namespaced_attribute is not changed
       - comparison is not changed  # identical
-    #command: diff -u {{ role_path }}/results/test-remove-namespaced-attribute.xml /tmp/ansible-xml-namespaced-beers.xml
+  # command: diff -u {{ role_path }}/results/test-remove-namespaced-attribute.xml /tmp/ansible-xml-namespaced-beers.xml
diff --git a/tests/integration/targets/xml/tasks/test-remove-namespaced-attribute.yml b/tests/integration/targets/xml/tasks/test-remove-namespaced-attribute.yml
index a725ee79cf..45e37d41d4 100644
--- a/tests/integration/targets/xml/tasks/test-remove-namespaced-attribute.yml
+++ b/tests/integration/targets/xml/tasks/test-remove-namespaced-attribute.yml
@@ -3,38 +3,38 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-namespaced-beers.xml
-      dest: /tmp/ansible-xml-namespaced-beers.xml
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-namespaced-beers.xml
+    dest: /tmp/ansible-xml-namespaced-beers.xml
 
 
-  - name: Remove namespaced '/bus:business/rat:rating/@attr:subjective'
-    xml:
-      path: /tmp/ansible-xml-namespaced-beers.xml
-      xpath: /bus:business/rat:rating/@attr:subjective
-      namespaces:
-        bus: http://test.business
-        ber: http://test.beers
-        rat: http://test.rating
-        attr: http://test.attribute
-      state: absent
-    register: remove_namespaced_attribute
+- name: Remove namespaced '/bus:business/rat:rating/@attr:subjective'
+  xml:
+    path: /tmp/ansible-xml-namespaced-beers.xml
+    xpath: /bus:business/rat:rating/@attr:subjective
+    namespaces:
+      bus: http://test.business
+      ber: http://test.beers
+      rat: http://test.rating
+      attr: http://test.attribute
+    state: absent
+  register: remove_namespaced_attribute
 
-  - name: Add trailing newline
-    shell: echo "" >> /tmp/ansible-xml-namespaced-beers.xml
+- name: Add trailing newline
+  shell: echo "" >> /tmp/ansible-xml-namespaced-beers.xml
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-remove-namespaced-attribute.xml
-      dest: /tmp/ansible-xml-namespaced-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-remove-namespaced-attribute.xml
+    dest: /tmp/ansible-xml-namespaced-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - remove_namespaced_attribute is changed
       - comparison is not changed  # identical
-    #command: diff -u {{ role_path }}/results/test-remove-namespaced-attribute.xml /tmp/ansible-xml-namespaced-beers.xml
+  # command: diff -u {{ role_path }}/results/test-remove-namespaced-attribute.xml /tmp/ansible-xml-namespaced-beers.xml
diff --git a/tests/integration/targets/xml/tasks/test-remove-namespaced-element-nochange.yml b/tests/integration/targets/xml/tasks/test-remove-namespaced-element-nochange.yml
index fd83c54c32..bda8643643 100644
--- a/tests/integration/targets/xml/tasks/test-remove-namespaced-element-nochange.yml
+++ b/tests/integration/targets/xml/tasks/test-remove-namespaced-element-nochange.yml
@@ -3,35 +3,35 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: results/test-remove-element.xml
-      dest: /tmp/ansible-xml-namespaced-beers.xml
+- name: Setup test fixture
+  copy:
+    src: results/test-remove-element.xml
+    dest: /tmp/ansible-xml-namespaced-beers.xml
 
 
-  - name: Remove non-existing namespaced '/bus:business/rat:rating'
-    xml:
-      path: /tmp/ansible-xml-namespaced-beers.xml
-      xpath: /bus:business/rat:rating
-      namespaces:
-        bus: http://test.business
-        ber: http://test.beers
-        rat: http://test.rating
-        attr: http://test.attribute
-      state: absent
-    register: remove_namespaced_element
+- name: Remove non-existing namespaced '/bus:business/rat:rating'
+  xml:
+    path: /tmp/ansible-xml-namespaced-beers.xml
+    xpath: /bus:business/rat:rating
+    namespaces:
+      bus: http://test.business
+      ber: http://test.beers
+      rat: http://test.rating
+      attr: http://test.attribute
+    state: absent
+  register: remove_namespaced_element
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-remove-element.xml
-      dest: /tmp/ansible-xml-namespaced-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-remove-element.xml
+    dest: /tmp/ansible-xml-namespaced-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - remove_namespaced_element is not changed
       - comparison is not changed  # identical
-    #command: diff -u {{ role_path }}/results/test-remove-element.xml /tmp/ansible-xml-namespaced-beers.xml
+  # command: diff -u {{ role_path }}/results/test-remove-element.xml /tmp/ansible-xml-namespaced-beers.xml
diff --git a/tests/integration/targets/xml/tasks/test-remove-namespaced-element.yml b/tests/integration/targets/xml/tasks/test-remove-namespaced-element.yml
index c4129f33e2..4bbab437ca 100644
--- a/tests/integration/targets/xml/tasks/test-remove-namespaced-element.yml
+++ b/tests/integration/targets/xml/tasks/test-remove-namespaced-element.yml
@@ -3,38 +3,38 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-namespaced-beers.xml
-      dest: /tmp/ansible-xml-namespaced-beers.xml
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-namespaced-beers.xml
+    dest: /tmp/ansible-xml-namespaced-beers.xml
 
 
-  - name: Remove namespaced '/bus:business/rat:rating'
-    xml:
-      path: /tmp/ansible-xml-namespaced-beers.xml
-      xpath: /bus:business/rat:rating
-      namespaces:
-        bus: http://test.business
-        ber: http://test.beers
-        rat: http://test.rating
-        attr: http://test.attribute
-      state: absent
-    register: remove_namespaced_element
+- name: Remove namespaced '/bus:business/rat:rating'
+  xml:
+    path: /tmp/ansible-xml-namespaced-beers.xml
+    xpath: /bus:business/rat:rating
+    namespaces:
+      bus: http://test.business
+      ber: http://test.beers
+      rat: http://test.rating
+      attr: http://test.attribute
+    state: absent
+  register: remove_namespaced_element
 
-  - name: Add trailing newline
-    shell: echo "" >> /tmp/ansible-xml-namespaced-beers.xml
+- name: Add trailing newline
+  shell: echo "" >> /tmp/ansible-xml-namespaced-beers.xml
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-remove-element.xml
-      dest: /tmp/ansible-xml-namespaced-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-remove-element.xml
+    dest: /tmp/ansible-xml-namespaced-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - remove_namespaced_element is changed
       - comparison is not changed  # identical
-    #command: diff -u {{ role_path }}/results/test-remove-element.xml /tmp/ansible-xml-namespaced-beers.xml
+  # command: diff -u {{ role_path }}/results/test-remove-element.xml /tmp/ansible-xml-namespaced-beers.xml
diff --git a/tests/integration/targets/xml/tasks/test-set-attribute-value-unicode.yml b/tests/integration/targets/xml/tasks/test-set-attribute-value-unicode.yml
index bf35bfdd95..a64442a215 100644
--- a/tests/integration/targets/xml/tasks/test-set-attribute-value-unicode.yml
+++ b/tests/integration/targets/xml/tasks/test-set-attribute-value-unicode.yml
@@ -3,34 +3,34 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-beers.xml
-      dest: /tmp/ansible-xml-beers.xml
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-beers.xml
+    dest: /tmp/ansible-xml-beers.xml
 
 
-  - name: Set '/business/rating/@subjective' to 'нет'
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: /business/rating
-      attribute: subjective
-      value: нет
-    register: set_attribute_value_unicode
+- name: Set '/business/rating/@subjective' to 'нет'
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: /business/rating
+    attribute: subjective
+    value: нет
+  register: set_attribute_value_unicode
 
-  - name: Add trailing newline
-    shell: echo "" >> /tmp/ansible-xml-beers.xml
+- name: Add trailing newline
+  shell: echo "" >> /tmp/ansible-xml-beers.xml
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-set-attribute-value-unicode.xml
-      dest: /tmp/ansible-xml-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-set-attribute-value-unicode.xml
+    dest: /tmp/ansible-xml-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - set_attribute_value_unicode is changed
       - comparison is not changed  # identical
-    #command: diff -u {{ role_path }}/results/test-set-attribute-value-unicode.xml /tmp/ansible-xml-beers.xml
+  # command: diff -u {{ role_path }}/results/test-set-attribute-value-unicode.xml /tmp/ansible-xml-beers.xml
diff --git a/tests/integration/targets/xml/tasks/test-set-attribute-value.yml b/tests/integration/targets/xml/tasks/test-set-attribute-value.yml
index 2908e00aa3..a5229a61f5 100644
--- a/tests/integration/targets/xml/tasks/test-set-attribute-value.yml
+++ b/tests/integration/targets/xml/tasks/test-set-attribute-value.yml
@@ -3,34 +3,34 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-beers.xml
-      dest: /tmp/ansible-xml-beers.xml
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-beers.xml
+    dest: /tmp/ansible-xml-beers.xml
 
 
-  - name: Set '/business/rating/@subjective' to 'false'
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: /business/rating
-      attribute: subjective
-      value: 'false'
-    register: set_attribute_value
+- name: Set '/business/rating/@subjective' to 'false'
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: /business/rating
+    attribute: subjective
+    value: 'false'
+  register: set_attribute_value
 
-  - name: Add trailing newline
-    shell: echo "" >> /tmp/ansible-xml-beers.xml
+- name: Add trailing newline
+  shell: echo "" >> /tmp/ansible-xml-beers.xml
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-set-attribute-value.xml
-      dest: /tmp/ansible-xml-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-set-attribute-value.xml
+    dest: /tmp/ansible-xml-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - set_attribute_value is changed
       - comparison is not changed  # identical
-    #command: diff -u {{ role_path }}/results/test-set-attribute-value.xml /tmp/ansible-xml-beers.xml
+  # command: diff -u {{ role_path }}/results/test-set-attribute-value.xml /tmp/ansible-xml-beers.xml
diff --git a/tests/integration/targets/xml/tasks/test-set-children-elements-level.yml b/tests/integration/targets/xml/tasks/test-set-children-elements-level.yml
index 648f5b25af..48d0de64a3 100644
--- a/tests/integration/targets/xml/tasks/test-set-children-elements-level.yml
+++ b/tests/integration/targets/xml/tasks/test-set-children-elements-level.yml
@@ -3,79 +3,79 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-beers.xml
-      dest: /tmp/ansible-xml-beers.xml
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-beers.xml
+    dest: /tmp/ansible-xml-beers.xml
 
 
-  - name: Set child elements
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: /business/beers
-      set_children: &children
-        - beer:
-            alcohol: "0.5"
-            name: 90 Minute IPA
-            _:
-              - Water:
-                  liter: "0.2"
-                  quantity: 200g
-              - Starch:
-                  quantity: 10g
-              - Hops:
-                  quantity: 50g
-              - Yeast:
-                  quantity: 20g
-        - beer:
-            alcohol: "0.3"
-            name: Harvest Pumpkin Ale
-            _:
-              - Water:
-                  liter: "0.2"
-                  quantity: 200g
-              - Hops:
-                  quantity: 25g
-              - Yeast:
-                  quantity: 20g
-    register: set_children_elements_level
+- name: Set child elements
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: /business/beers
+    set_children: &children
+      - beer:
+          alcohol: "0.5"
+          name: 90 Minute IPA
+          _:
+            - Water:
+                liter: "0.2"
+                quantity: 200g
+            - Starch:
+                quantity: 10g
+            - Hops:
+                quantity: 50g
+            - Yeast:
+                quantity: 20g
+      - beer:
+          alcohol: "0.3"
+          name: Harvest Pumpkin Ale
+          _:
+            - Water:
+                liter: "0.2"
+                quantity: 200g
+            - Hops:
+                quantity: 25g
+            - Yeast:
+                quantity: 20g
+  register: set_children_elements_level
 
-  - name: Add trailing newline
-    shell: echo "" >> /tmp/ansible-xml-beers.xml
+- name: Add trailing newline
+  shell: echo "" >> /tmp/ansible-xml-beers.xml
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-set-children-elements-level.xml
-      dest: /tmp/ansible-xml-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-set-children-elements-level.xml
+    dest: /tmp/ansible-xml-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - set_children_elements_level is changed
       - comparison is not changed  # identical
-    #command: diff -u {{ role_path }}/results/test-set-children-elements-level.xml /tmp/ansible-xml-beers.xml
+  # command: diff -u {{ role_path }}/results/test-set-children-elements-level.xml /tmp/ansible-xml-beers.xml
 
 
-  - name: Set child elements (again)
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: /business/beers
-      set_children: *children
-    register: set_children_again
+- name: Set child elements (again)
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: /business/beers
+    set_children: *children
+  register: set_children_again
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-set-children-elements-level.xml
-      dest: /tmp/ansible-xml-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-set-children-elements-level.xml
+    dest: /tmp/ansible-xml-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - set_children_again is not changed
       - comparison is not changed   # identical
diff --git a/tests/integration/targets/xml/tasks/test-set-children-elements-unicode.yml b/tests/integration/targets/xml/tasks/test-set-children-elements-unicode.yml
index 8c4fc10941..f890c01bc4 100644
--- a/tests/integration/targets/xml/tasks/test-set-children-elements-unicode.yml
+++ b/tests/integration/targets/xml/tasks/test-set-children-elements-unicode.yml
@@ -3,51 +3,51 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-beers.xml
-      dest: /tmp/ansible-xml-beers.xml
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-beers.xml
+    dest: /tmp/ansible-xml-beers.xml
 
 
-  - name: Set child elements
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: /business/beers
-      set_children: &children
+- name: Set child elements
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: /business/beers
+    set_children: &children
       - beer: Окское
       - beer: Невское
-    register: set_children_elements_unicode
+  register: set_children_elements_unicode
 
-  - name: Add trailing newline
-    shell: echo "" >> /tmp/ansible-xml-beers.xml
+- name: Add trailing newline
+  shell: echo "" >> /tmp/ansible-xml-beers.xml
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-set-children-elements-unicode.xml
-      dest: /tmp/ansible-xml-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-set-children-elements-unicode.xml
+    dest: /tmp/ansible-xml-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - set_children_elements_unicode is changed
       - comparison is not changed  # identical
-    #command: diff -u {{ role_path }}/results/test-set-children-elements-unicode.xml /tmp/ansible-xml-beers.xml
+  # command: diff -u {{ role_path }}/results/test-set-children-elements-unicode.xml /tmp/ansible-xml-beers.xml
 
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-set-children-elements-unicode.xml
-      dest: /tmp/ansible-xml-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-set-children-elements-unicode.xml
+    dest: /tmp/ansible-xml-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - set_children_again is not changed
       - comparison is not changed  # identical
-    #command: diff -u {{ role_path }}/results/test-set-children-elements-unicode.xml /tmp/ansible-xml-beers.xml
+  # command: diff -u {{ role_path }}/results/test-set-children-elements-unicode.xml /tmp/ansible-xml-beers.xml
diff --git a/tests/integration/targets/xml/tasks/test-set-children-elements-value.yml b/tests/integration/targets/xml/tasks/test-set-children-elements-value.yml
index 1f5bdd3df7..17ed24d283 100644
--- a/tests/integration/targets/xml/tasks/test-set-children-elements-value.yml
+++ b/tests/integration/targets/xml/tasks/test-set-children-elements-value.yml
@@ -3,62 +3,62 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-beers.xml
-      dest: /tmp/ansible-xml-beers.xml
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-beers.xml
+    dest: /tmp/ansible-xml-beers.xml
 
 
-  - name: Set child elements
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: /business/beers
-      set_children: &children
-        - beer:
-            alcohol: "0.5"
-            name: 90 Minute IPA
-            +value: "2"
-        - beer:
-            alcohol: "0.3"
-            name: Harvest Pumpkin Ale
-            +value: "5"
-    register: set_children_elements_value
+- name: Set child elements
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: /business/beers
+    set_children: &children
+      - beer:
+          alcohol: "0.5"
+          name: 90 Minute IPA
+          +value: "2"
+      - beer:
+          alcohol: "0.3"
+          name: Harvest Pumpkin Ale
+          +value: "5"
+  register: set_children_elements_value
 
-  - name: Add trailing newline
-    shell: echo "" >> /tmp/ansible-xml-beers.xml
+- name: Add trailing newline
+  shell: echo "" >> /tmp/ansible-xml-beers.xml
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-set-children-elements-value.xml
-      dest: /tmp/ansible-xml-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-set-children-elements-value.xml
+    dest: /tmp/ansible-xml-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - set_children_elements_value is changed
       - comparison is not changed  # identical
 
 
-  - name: Set child elements (again)
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: /business/beers
-      set_children: *children
-    register: set_children_again
+- name: Set child elements (again)
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: /business/beers
+    set_children: *children
+  register: set_children_again
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-set-children-elements-value.xml
-      dest: /tmp/ansible-xml-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-set-children-elements-value.xml
+    dest: /tmp/ansible-xml-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - set_children_again is not changed
       - comparison is not changed   # identical
diff --git a/tests/integration/targets/xml/tasks/test-set-children-elements.yml b/tests/integration/targets/xml/tasks/test-set-children-elements.yml
index ed9e4a54ee..d2987e83f4 100644
--- a/tests/integration/targets/xml/tasks/test-set-children-elements.yml
+++ b/tests/integration/targets/xml/tasks/test-set-children-elements.yml
@@ -3,84 +3,84 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-beers.xml
-      dest: /tmp/ansible-xml-beers.xml
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-beers.xml
+    dest: /tmp/ansible-xml-beers.xml
 
-  - name: Set child elements - empty list
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: /business/beers
-      set_children: []
-    register: set_children_elements
+- name: Set child elements - empty list
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: /business/beers
+    set_children: []
+  register: set_children_elements
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-set-children-elements-empty-list.xml
-      dest: /tmp/ansible-xml-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-set-children-elements-empty-list.xml
+    dest: /tmp/ansible-xml-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - set_children_elements is changed
       - comparison is not changed  # identical
-    #command: diff -u {{ role_path }}/results/test-set-children-elements.xml /tmp/ansible-xml-beers.xml
+  # command: diff -u {{ role_path }}/results/test-set-children-elements.xml /tmp/ansible-xml-beers.xml
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-beers.xml
-      dest: /tmp/ansible-xml-beers.xml
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-beers.xml
+    dest: /tmp/ansible-xml-beers.xml
 
-  - name: Set child elements
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: /business/beers
-      set_children: &children
-        - beer: 90 Minute IPA
-        - beer: Harvest Pumpkin Ale
-    register: set_children_elements
+- name: Set child elements
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: /business/beers
+    set_children: &children
+      - beer: 90 Minute IPA
+      - beer: Harvest Pumpkin Ale
+  register: set_children_elements
 
-  - name: Add trailing newline
-    shell: echo "" >> /tmp/ansible-xml-beers.xml
+- name: Add trailing newline
+  shell: echo "" >> /tmp/ansible-xml-beers.xml
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-set-children-elements.xml
-      dest: /tmp/ansible-xml-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-set-children-elements.xml
+    dest: /tmp/ansible-xml-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - set_children_elements is changed
       - comparison is not changed  # identical
-    #command: diff -u {{ role_path }}/results/test-set-children-elements.xml /tmp/ansible-xml-beers.xml
+  # command: diff -u {{ role_path }}/results/test-set-children-elements.xml /tmp/ansible-xml-beers.xml
 
 
-  - name: Set child elements (again)
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: /business/beers
-      set_children: *children
-    register: set_children_again
+- name: Set child elements (again)
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: /business/beers
+    set_children: *children
+  register: set_children_again
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-set-children-elements.xml
-      dest: /tmp/ansible-xml-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-set-children-elements.xml
+    dest: /tmp/ansible-xml-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - set_children_again is not changed
       - comparison is not changed  # identical
-    #command: diff -u {{ role_path }}/results/test-set-children-elements.xml /tmp/ansible-xml-beers.xml
+  # command: diff -u {{ role_path }}/results/test-set-children-elements.xml /tmp/ansible-xml-beers.xml
diff --git a/tests/integration/targets/xml/tasks/test-set-element-value-empty.yml b/tests/integration/targets/xml/tasks/test-set-element-value-empty.yml
index 4041bf9106..3c5212db45 100644
--- a/tests/integration/targets/xml/tasks/test-set-element-value-empty.yml
+++ b/tests/integration/targets/xml/tasks/test-set-element-value-empty.yml
@@ -3,33 +3,33 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-beers.xml
-      dest: /tmp/ansible-xml-beers.xml
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-beers.xml
+    dest: /tmp/ansible-xml-beers.xml
 
 
-  - name: Set '/business/website/address' to empty string.
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: /business/website/address
-      value: ''
-    register: set_element_value_empty
+- name: Set '/business/website/address' to empty string.
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: /business/website/address
+    value: ''
+  register: set_element_value_empty
 
-  - name: Add trailing newline
-    shell: echo "" >> /tmp/ansible-xml-beers.xml
+- name: Add trailing newline
+  shell: echo "" >> /tmp/ansible-xml-beers.xml
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-set-element-value-empty.xml
-      dest: /tmp/ansible-xml-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-set-element-value-empty.xml
+    dest: /tmp/ansible-xml-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - set_element_value_empty is changed
       - comparison is not changed  # identical
-    #command: diff -u {{ role_path }}/results/test-set-element-value-empty.xml /tmp/ansible-xml-beers.xml
+  # command: diff -u {{ role_path }}/results/test-set-element-value-empty.xml /tmp/ansible-xml-beers.xml
diff --git a/tests/integration/targets/xml/tasks/test-set-element-value-unicode.yml b/tests/integration/targets/xml/tasks/test-set-element-value-unicode.yml
index 616f26ddc8..7dec91b920 100644
--- a/tests/integration/targets/xml/tasks/test-set-element-value-unicode.yml
+++ b/tests/integration/targets/xml/tasks/test-set-element-value-unicode.yml
@@ -3,48 +3,48 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-beers.xml
-      dest: /tmp/ansible-xml-beers.xml
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-beers.xml
+    dest: /tmp/ansible-xml-beers.xml
 
 
-  - name: Add 2nd '/business/rating' with value 'пять'
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: /business
-      add_children:
+- name: Add 2nd '/business/rating' with value 'пять'
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: /business
+    add_children:
       - rating: пять
 
-  - name: Set '/business/rating' to 'пять'
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: /business/rating
-      value: пять
-    register: set_element_first_run
+- name: Set '/business/rating' to 'пять'
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: /business/rating
+    value: пять
+  register: set_element_first_run
 
-  - name: Set '/business/rating' to 'false'... again
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: /business/rating
-      value: пять
-    register: set_element_second_run
+- name: Set '/business/rating' to 'false'... again
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: /business/rating
+    value: пять
+  register: set_element_second_run
 
-  - name: Add trailing newline
-    shell: echo "" >> /tmp/ansible-xml-beers.xml
+- name: Add trailing newline
+  shell: echo "" >> /tmp/ansible-xml-beers.xml
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-set-element-value-unicode.xml
-      dest: /tmp/ansible-xml-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-set-element-value-unicode.xml
+    dest: /tmp/ansible-xml-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - set_element_first_run is changed
       - set_element_second_run is not changed
       - comparison is not changed  # identical
-    #command: diff -u {{ role_path }}/results/test-set-element-value-unicode.xml /tmp/ansible-xml-beers.xml
+  # command: diff -u {{ role_path }}/results/test-set-element-value-unicode.xml /tmp/ansible-xml-beers.xml
diff --git a/tests/integration/targets/xml/tasks/test-set-element-value.yml b/tests/integration/targets/xml/tasks/test-set-element-value.yml
index b563b25766..83b0840bac 100644
--- a/tests/integration/targets/xml/tasks/test-set-element-value.yml
+++ b/tests/integration/targets/xml/tasks/test-set-element-value.yml
@@ -3,48 +3,48 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-beers.xml
-      dest: /tmp/ansible-xml-beers.xml
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-beers.xml
+    dest: /tmp/ansible-xml-beers.xml
 
 
-  - name: Add 2nd '/business/rating' with value '5'
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: /business
-      add_children:
+- name: Add 2nd '/business/rating' with value '5'
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: /business
+    add_children:
       - rating: '5'
 
-  - name: Set '/business/rating' to '5'
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: /business/rating
-      value: '5'
-    register: set_element_first_run
+- name: Set '/business/rating' to '5'
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: /business/rating
+    value: '5'
+  register: set_element_first_run
 
-  - name: Set '/business/rating' to '5'... again
-    xml:
-      path: /tmp/ansible-xml-beers.xml
-      xpath: /business/rating
-      value: '5'
-    register: set_element_second_run
+- name: Set '/business/rating' to '5'... again
+  xml:
+    path: /tmp/ansible-xml-beers.xml
+    xpath: /business/rating
+    value: '5'
+  register: set_element_second_run
 
-  - name: Add trailing newline
-    shell: echo "" >> /tmp/ansible-xml-beers.xml
+- name: Add trailing newline
+  shell: echo "" >> /tmp/ansible-xml-beers.xml
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-set-element-value.xml
-      dest: /tmp/ansible-xml-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-set-element-value.xml
+    dest: /tmp/ansible-xml-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - set_element_first_run is changed
       - set_element_second_run is not changed
       - comparison is not changed  # identical
-    #command: diff -u {{ role_path }}/results/test-set-element-value.xml /tmp/ansible-xml-beers.xml
+  # command: diff -u {{ role_path }}/results/test-set-element-value.xml /tmp/ansible-xml-beers.xml
diff --git a/tests/integration/targets/xml/tasks/test-set-namespaced-attribute-value.yml b/tests/integration/targets/xml/tasks/test-set-namespaced-attribute-value.yml
index 7c1bbd2376..0c1992730d 100644
--- a/tests/integration/targets/xml/tasks/test-set-namespaced-attribute-value.yml
+++ b/tests/integration/targets/xml/tasks/test-set-namespaced-attribute-value.yml
@@ -3,39 +3,39 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-namespaced-beers.xml
-      dest: /tmp/ansible-xml-namespaced-beers.xml
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-namespaced-beers.xml
+    dest: /tmp/ansible-xml-namespaced-beers.xml
 
 
-  - name: Set namespaced '/bus:business/rat:rating/@attr:subjective' to 'false'
-    xml:
-      path: /tmp/ansible-xml-namespaced-beers.xml
-      xpath: /bus:business/rat:rating
-      namespaces:
-        bus: http://test.business
-        ber: http://test.beers
-        rat: http://test.rating
-        attr: http://test.attribute
-      attribute: attr:subjective
-      value: 'false'
-    register: set_namespaced_attribute_value
+- name: Set namespaced '/bus:business/rat:rating/@attr:subjective' to 'false'
+  xml:
+    path: /tmp/ansible-xml-namespaced-beers.xml
+    xpath: /bus:business/rat:rating
+    namespaces:
+      bus: http://test.business
+      ber: http://test.beers
+      rat: http://test.rating
+      attr: http://test.attribute
+    attribute: attr:subjective
+    value: 'false'
+  register: set_namespaced_attribute_value
 
-  - name: Add trailing newline
-    shell: echo "" >> /tmp/ansible-xml-namespaced-beers.xml
+- name: Add trailing newline
+  shell: echo "" >> /tmp/ansible-xml-namespaced-beers.xml
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-set-namespaced-attribute-value.xml
-      dest: /tmp/ansible-xml-namespaced-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    src: results/test-set-namespaced-attribute-value.xml
+    dest: /tmp/ansible-xml-namespaced-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - set_namespaced_attribute_value is changed
       - comparison is not changed  # identical
-    #command: diff -u {{ role_path }}/results/test-set-namespaced-attribute-value.xml /tmp/ansible-xml-namespaced-beers.xml
+  # command: diff -u {{ role_path }}/results/test-set-namespaced-attribute-value.xml /tmp/ansible-xml-namespaced-beers.xml
diff --git a/tests/integration/targets/xml/tasks/test-set-namespaced-children-elements.yml b/tests/integration/targets/xml/tasks/test-set-namespaced-children-elements.yml
index e6ed1bdecc..dbda409d07 100644
--- a/tests/integration/targets/xml/tasks/test-set-namespaced-children-elements.yml
+++ b/tests/integration/targets/xml/tasks/test-set-namespaced-children-elements.yml
@@ -3,59 +3,59 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-namespaced-beers.xml
-      dest: /tmp/ansible-xml-namespaced-beers-xml.xml
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-namespaced-beers.xml
+    dest: /tmp/ansible-xml-namespaced-beers-xml.xml
 
-  - name: Set child elements
-    xml:
-      path: /tmp/ansible-xml-namespaced-beers-xml.xml
-      xpath: /bus:business/ber:beers
-      namespaces:
-        bus: http://test.business
-        ber: http://test.beers
-      set_children:
+- name: Set child elements
+  xml:
+    path: /tmp/ansible-xml-namespaced-beers-xml.xml
+    xpath: /bus:business/ber:beers
+    namespaces:
+      bus: http://test.business
+      ber: http://test.beers
+    set_children:
       - beer: 90 Minute IPA
       - beer: Harvest Pumpkin Ale
 
-  - name: Copy state after first set_children
-    copy:
-      src: /tmp/ansible-xml-namespaced-beers.xml
-      dest: /tmp/ansible-xml-namespaced-beers-1.xml
-      remote_src: true
+- name: Copy state after first set_children
+  copy:
+    src: /tmp/ansible-xml-namespaced-beers.xml
+    dest: /tmp/ansible-xml-namespaced-beers-1.xml
+    remote_src: true
 
-  - name: Set child elements again
-    xml:
-      path: /tmp/ansible-xml-namespaced-beers-xml.xml
-      xpath: /bus:business/ber:beers
-      namespaces:
-        bus: http://test.business
-        ber: http://test.beers
-      set_children:
+- name: Set child elements again
+  xml:
+    path: /tmp/ansible-xml-namespaced-beers-xml.xml
+    xpath: /bus:business/ber:beers
+    namespaces:
+      bus: http://test.business
+      ber: http://test.beers
+    set_children:
       - beer: 90 Minute IPA
       - beer: Harvest Pumpkin Ale
-    register: set_children_again
+  register: set_children_again
 
-  - name: Copy state after second set_children
-    copy:
-      src: /tmp/ansible-xml-namespaced-beers.xml
-      dest: /tmp/ansible-xml-namespaced-beers-2.xml
-      remote_src: true
+- name: Copy state after second set_children
+  copy:
+    src: /tmp/ansible-xml-namespaced-beers.xml
+    dest: /tmp/ansible-xml-namespaced-beers-2.xml
+    remote_src: true
 
-  - name: Compare to expected result
-    copy:
-      src: /tmp/ansible-xml-namespaced-beers-1.xml
-      dest: /tmp/ansible-xml-namespaced-beers-2.xml
-      remote_src: true
-    check_mode: true
-    diff: true
-    register: comparison
-    #command: diff /tmp/ansible-xml-namespaced-beers-1.xml /tmp/ansible-xml-namespaced-beers-2.xml
+- name: Compare to expected result
+  copy:
+    src: /tmp/ansible-xml-namespaced-beers-1.xml
+    dest: /tmp/ansible-xml-namespaced-beers-2.xml
+    remote_src: true
+  check_mode: true
+  diff: true
+  register: comparison
+  # command: diff /tmp/ansible-xml-namespaced-beers-1.xml /tmp/ansible-xml-namespaced-beers-2.xml
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - set_children_again is not changed  # idempotency
       - set_namespaced_attribute_value is changed
       - comparison is not changed  # identical
diff --git a/tests/integration/targets/xml/tasks/test-set-namespaced-element-value.yml b/tests/integration/targets/xml/tasks/test-set-namespaced-element-value.yml
index 9944da8a55..6bdcd2e0e6 100644
--- a/tests/integration/targets/xml/tasks/test-set-namespaced-element-value.yml
+++ b/tests/integration/targets/xml/tasks/test-set-namespaced-element-value.yml
@@ -3,51 +3,51 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Setup test fixture
-    copy:
-      src: fixtures/ansible-xml-namespaced-beers.xml
-      dest: /tmp/ansible-xml-namespaced-beers.xml
+- name: Setup test fixture
+  copy:
+    src: fixtures/ansible-xml-namespaced-beers.xml
+    dest: /tmp/ansible-xml-namespaced-beers.xml
 
 
-  - name: Set namespaced '/bus:business/rat:rating' to '11'
-    xml:
-      path: /tmp/ansible-xml-namespaced-beers.xml
-      namespaces:
-        bus: http://test.business
-        ber: http://test.beers
-        rat: http://test.rating
-        attr: http://test.attribute
-      xpath: /bus:business/rat:rating
-      value: '11'
-    register: set_element_first_run
+- name: Set namespaced '/bus:business/rat:rating' to '11'
+  xml:
+    path: /tmp/ansible-xml-namespaced-beers.xml
+    namespaces:
+      bus: http://test.business
+      ber: http://test.beers
+      rat: http://test.rating
+      attr: http://test.attribute
+    xpath: /bus:business/rat:rating
+    value: '11'
+  register: set_element_first_run
 
-  - name: Set namespaced '/bus:business/rat:rating' to '11' again
-    xml:
-      path: /tmp/ansible-xml-namespaced-beers.xml
-      namespaces:
-        bus: http://test.business
-        ber: http://test.beers
-        rat: http://test.rating
-        attr: http://test.attribute
-      xpath: /bus:business/rat:rating
-      value: '11'
-    register: set_element_second_run
+- name: Set namespaced '/bus:business/rat:rating' to '11' again
+  xml:
+    path: /tmp/ansible-xml-namespaced-beers.xml
+    namespaces:
+      bus: http://test.business
+      ber: http://test.beers
+      rat: http://test.rating
+      attr: http://test.attribute
+    xpath: /bus:business/rat:rating
+    value: '11'
+  register: set_element_second_run
 
-  - name: Add trailing newline
-    shell: echo "" >> /tmp/ansible-xml-namespaced-beers.xml
+- name: Add trailing newline
+  shell: echo "" >> /tmp/ansible-xml-namespaced-beers.xml
 
-  - name: Compare to expected result
-    copy:
-      src: results/test-set-namespaced-element-value.xml
-      dest: /tmp/ansible-xml-namespaced-beers.xml
-    check_mode: true
-    diff: true
-    register: comparison
-    #command: diff -u {{ role_path }}/results/test-set-namespaced-element-value.xml /tmp/ansible-xml-namespaced-beers.xml
+- name: Compare to expected result
+  copy:
+    src: results/test-set-namespaced-element-value.xml
+    dest: /tmp/ansible-xml-namespaced-beers.xml
+  check_mode: true
+  diff: true
+  register: comparison
+  # command: diff -u {{ role_path }}/results/test-set-namespaced-element-value.xml /tmp/ansible-xml-namespaced-beers.xml
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - set_element_first_run is changed
       - set_element_second_run is not changed
       - comparison is not changed  # identical
diff --git a/tests/integration/targets/xml/tasks/test-xmlstring.yml b/tests/integration/targets/xml/tasks/test-xmlstring.yml
index 1c2e4de4a8..c7339742b1 100644
--- a/tests/integration/targets/xml/tasks/test-xmlstring.yml
+++ b/tests/integration/targets/xml/tasks/test-xmlstring.yml
@@ -3,83 +3,83 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-  - name: Copy expected results to remote
-    copy:
-      src: "results/{{ item }}"
-      dest: "/tmp/{{ item }}"
-    with_items:
-      - test-pretty-print.xml
-      - test-pretty-print-only.xml
+- name: Copy expected results to remote
+  copy:
+    src: "results/{{ item }}"
+    dest: "/tmp/{{ item }}"
+  with_items:
+    - test-pretty-print.xml
+    - test-pretty-print-only.xml
 
-  # NOTE: Jinja2 templating eats trailing newlines
-  - name: Read from xmlstring (not using pretty_print)
-    xml:
-      xmlstring: "{{ lookup('file', '{{ role_path }}/fixtures/ansible-xml-beers.xml') }}"
-      xpath: .
-    register: xmlresponse
+# NOTE: Jinja2 templating eats trailing newlines
+- name: Read from xmlstring (not using pretty_print)
+  xml:
+    xmlstring: "{{ lookup('file', '{{ role_path }}/fixtures/ansible-xml-beers.xml') }}"
+    xpath: .
+  register: xmlresponse
 
-  - name: Compare to expected result
-    copy:
-      content: "{{ xmlresponse.xmlstring }}\n"
-      dest: '/tmp/test-pretty-print-only.xml'
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    content: "{{ xmlresponse.xmlstring }}\n"
+    dest: '/tmp/test-pretty-print-only.xml'
+  check_mode: true
+  diff: true
+  register: comparison
 
-  - name: Test expected result
-    assert:
-      that:
+- name: Test expected result
+  assert:
+    that:
       - xmlresponse is not changed
       - comparison is not changed  # identical
-    #command: diff -u {{ role_path }}/results/test-pretty-print-only.xml /tmp/ansible-xml-beers.xml
+  # command: diff -u {{ role_path }}/results/test-pretty-print-only.xml /tmp/ansible-xml-beers.xml
 
 
-  # NOTE: Jinja2 templating eats trailing newlines
-  - name: Read from xmlstring (using pretty_print)
-    xml:
-      xmlstring: "{{ lookup('file', '{{ role_path }}/fixtures/ansible-xml-beers.xml') }}"
-      pretty_print: true
-    register: xmlresponse
+# NOTE: Jinja2 templating eats trailing newlines
+- name: Read from xmlstring (using pretty_print)
+  xml:
+    xmlstring: "{{ lookup('file', '{{ role_path }}/fixtures/ansible-xml-beers.xml') }}"
+    pretty_print: true
+  register: xmlresponse
 
-  - name: Compare to expected result
-    copy:
-      content: '{{ xmlresponse.xmlstring }}'
-      dest: '/tmp/test-pretty-print-only.xml'
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    content: '{{ xmlresponse.xmlstring }}'
+    dest: '/tmp/test-pretty-print-only.xml'
+  check_mode: true
+  diff: true
+  register: comparison
 
-  # FIXME: This change is related to the newline added by pretty_print
-  - name: Test expected result
-    assert:
-      that:
+# FIXME: This change is related to the newline added by pretty_print
+- name: Test expected result
+  assert:
+    that:
       - xmlresponse is changed
       - comparison is not changed  # identical
-    #command: diff -u {{ role_path }}/results/test-pretty-print-only.xml /tmp/ansible-xml-beers.xml
+  # command: diff -u {{ role_path }}/results/test-pretty-print-only.xml /tmp/ansible-xml-beers.xml
 
 
-  # NOTE: Jinja2 templating eats trailing newlines
-  - name: Read from xmlstring
-    xml:
-      xmlstring: "{{ lookup('file', '{{ role_path }}/fixtures/ansible-xml-beers.xml') }}"
-      xpath: /business/beers
-      pretty_print: true
-      add_children:
+# NOTE: Jinja2 templating eats trailing newlines
+- name: Read from xmlstring
+  xml:
+    xmlstring: "{{ lookup('file', '{{ role_path }}/fixtures/ansible-xml-beers.xml') }}"
+    xpath: /business/beers
+    pretty_print: true
+    add_children:
       - beer: Old Rasputin
-    register: xmlresponse_modification
+  register: xmlresponse_modification
 
-  - name: Compare to expected result
-    copy:
-      content: '{{ xmlresponse_modification.xmlstring }}'
-      dest: '/tmp/test-pretty-print.xml'
-    check_mode: true
-    diff: true
-    register: comparison
+- name: Compare to expected result
+  copy:
+    content: '{{ xmlresponse_modification.xmlstring }}'
+    dest: '/tmp/test-pretty-print.xml'
+  check_mode: true
+  diff: true
+  register: comparison
 
-  # FIXME: This change is related to the newline added by pretty_print
-  - name: Test expected result
-    assert:
-      that:
+# FIXME: This change is related to the newline added by pretty_print
+- name: Test expected result
+  assert:
+    that:
       - xmlresponse_modification is changed
       - comparison is not changed  # identical
-    #command: diff -u {{ role_path }}/results/test-pretty-print.xml /tmp/ansible-xml-beers.xml
+  # command: diff -u {{ role_path }}/results/test-pretty-print.xml /tmp/ansible-xml-beers.xml
diff --git a/tests/integration/targets/xml/vars/main.yml b/tests/integration/targets/xml/vars/main.yml
index a8dfc23962..a7b08c3137 100644
--- a/tests/integration/targets/xml/vars/main.yml
+++ b/tests/integration/targets/xml/vars/main.yml
@@ -6,6 +6,6 @@
 # -*- mode: yaml -*
 
 bad_beers:
-- beer: "Natty Lite"
-- beer: "Miller Lite"
-- beer: "Coors Lite"
+  - beer: "Natty Lite"
+  - beer: "Miller Lite"
+  - beer: "Coors Lite"
diff --git a/tests/integration/targets/yarn/tasks/run.yml b/tests/integration/targets/yarn/tasks/run.yml
index 0d7d6fb421..d48eacc4d4 100644
--- a/tests/integration/targets/yarn/tasks/run.yml
+++ b/tests/integration/targets/yarn/tasks/run.yml
@@ -33,7 +33,7 @@
 
 # Set vars for our test harness
 - vars:
-    #node_bin_path: "/usr/local/lib/nodejs/node-v{{nodejs_version}}/bin"
+    # node_bin_path: "/usr/local/lib/nodejs/node-v{{nodejs_version}}/bin"
     node_bin_path: "/usr/local/lib/nodejs/{{ nodejs_path }}/bin"
     yarn_bin_path: "{{ remote_tmp_dir }}/yarn-v{{ yarn_version }}/bin"
     package: 'iconv-lite'
diff --git a/tests/integration/targets/zpool/tasks/add_remove_vdevs.yml b/tests/integration/targets/zpool/tasks/add_remove_vdevs.yml
index c5f5e77270..f2cd7c55b9 100644
--- a/tests/integration/targets/zpool/tasks/add_remove_vdevs.yml
+++ b/tests/integration/targets/zpool/tasks/add_remove_vdevs.yml
@@ -23,7 +23,7 @@
     - name: Check if vdev was added
       ansible.builtin.command:
         cmd: "zpool status -P -L {{ zpool_generic_pool_name }}"
-      register:  single_disk_pool_check
+      register: single_disk_pool_check
       changed_when: false
 
     - name: Assert that added disk is present
@@ -58,7 +58,7 @@
     - name: Check if vdev was added
       ansible.builtin.command:
         cmd: "zpool status -P -L {{ zpool_generic_pool_name }}"
-      register:  mirror_pool_check
+      register: mirror_pool_check
       changed_when: false
 
     - name: Assert that added vdev is present
@@ -94,7 +94,7 @@
     - name: Check if vdev was added
       ansible.builtin.command:
         cmd: "zpool status -P -L {{ zpool_generic_pool_name }}"
-      register:  raidz_pool_check
+      register: raidz_pool_check
       changed_when: false
 
     - name: Assert that added vdev is present
@@ -131,7 +131,7 @@
     - name: Check if vdev was removed
       ansible.builtin.command:
         cmd: "zpool status -P -L {{ zpool_generic_pool_name }}"
-      register:  remove_vdev_check
+      register: remove_vdev_check
       changed_when: false
 
     - name: Assert that removed vdev is absent
diff --git a/tests/integration/targets/zpool/tasks/properties.yml b/tests/integration/targets/zpool/tasks/properties.yml
index 431af4ab55..ec7a8c3d7b 100644
--- a/tests/integration/targets/zpool/tasks/properties.yml
+++ b/tests/integration/targets/zpool/tasks/properties.yml
@@ -9,7 +9,7 @@
     pool_properties:
       ashift: 12
     filesystem_properties:
-      compression: off
+      compression: false
     vdevs:
       - type: mirror
         disks: "{{ zpool_vdevs_disk_config.vdev3 }}"
diff --git a/tests/integration/targets/zypper/tasks/zypper.yml b/tests/integration/targets/zypper/tasks/zypper.yml
index dd61a3ab32..ae7dc83b4a 100644
--- a/tests/integration/targets/zypper/tasks/zypper.yml
+++ b/tests/integration/targets/zypper/tasks/zypper.yml
@@ -31,8 +31,8 @@
 - name: verify uninstallation of hello
   assert:
     that:
-        - "zypper_result.rc == 0"
-        - "rpm_result.rc == 1"
+      - "zypper_result.rc == 0"
+      - "rpm_result.rc == 1"
 
 # UNINSTALL AGAIN
 - name: uninstall hello again
@@ -44,7 +44,7 @@
 - name: verify no change on re-uninstall
   assert:
     that:
-        - "not zypper_result.changed"
+      - "not zypper_result.changed"
 
 # INSTALL
 - name: install hello
@@ -64,9 +64,9 @@
 - name: verify installation of hello
   assert:
     that:
-        - "zypper_result.rc == 0"
-        - "zypper_result.changed"
-        - "rpm_result.rc == 0"
+      - "zypper_result.rc == 0"
+      - "zypper_result.changed"
+      - "rpm_result.rc == 0"
 
 # INSTALL AGAIN
 - name: install hello again
@@ -78,7 +78,7 @@
 - name: verify no change on second install
   assert:
     that:
-        - "not zypper_result.changed"
+      - "not zypper_result.changed"
 
 # Multiple packages
 - name: uninstall hello and metamail
@@ -102,8 +102,8 @@
 - name: verify packages uninstalled
   assert:
     that:
-        - "rpm_hello_result.rc != 0"
-        - "rpm_metamail_result.rc != 0"
+      - "rpm_hello_result.rc != 0"
+      - "rpm_metamail_result.rc != 0"
 
 - name: install hello and metamail
   zypper:
@@ -126,10 +126,10 @@
 - name: verify packages installed
   assert:
     that:
-        - "zypper_result.rc == 0"
-        - "zypper_result.changed"
-        - "rpm_hello_result.rc == 0"
-        - "rpm_metamail_result.rc == 0"
+      - "zypper_result.rc == 0"
+      - "zypper_result.changed"
+      - "rpm_hello_result.rc == 0"
+      - "rpm_metamail_result.rc == 0"
 
 - name: uninstall hello and metamail
   zypper:
@@ -230,9 +230,9 @@
 - name: verify installation of empty
   assert:
     that:
-        - "zypper_result.rc == 0"
-        - "zypper_result.changed"
-        - "rpm_result.rc == 0"
+      - "zypper_result.rc == 0"
+      - "zypper_result.changed"
+      - "rpm_result.rc == 0"
 
 - name: uninstall empty
   zypper:
@@ -253,7 +253,7 @@
 - name: check that we extract rpm package in testdir folder and folder var is exist
   assert:
     that:
-     - "stat_result.stat.exists == true"
+      - "stat_result.stat.exists == true"
 
 # Build and install an empty rpm with error in post script
 - name: uninstall post_error
@@ -308,9 +308,9 @@
 - name: verify installation of post_error
   assert:
     that:
-        - "zypper_result.rc == 0"
-        - "zypper_result.changed"
-        - "rpm_result.rc == 0"
+      - "zypper_result.rc == 0"
+      - "zypper_result.changed"
+      - "rpm_result.rc == 0"
 
 - name: uninstall post_error
   zypper:
@@ -332,9 +332,9 @@
 - name: verify installation of post_error
   assert:
     that:
-        - "zypper_result.rc == 107"
-        - "not zypper_result.changed"
-        - "rpm_result.rc == 0"
+      - "zypper_result.rc == 107"
+      - "not zypper_result.changed"
+      - "rpm_result.rc == 0"
 
 - name: uninstall post_error
   zypper:
diff --git a/tests/integration/targets/zypper_repository/tasks/zypper_repository.yml b/tests/integration/targets/zypper_repository/tasks/zypper_repository.yml
index ec362af108..8c322421c4 100644
--- a/tests/integration/targets/zypper_repository/tasks/zypper_repository.yml
+++ b/tests/integration/targets/zypper_repository/tasks/zypper_repository.yml
@@ -218,72 +218,72 @@
 #        (Maybe 'Uyuni' needs to be replaced with something else?)
 - when: ansible_distribution_version is version('15.4', '<')
   block:
-  - name: add new repository via url to .repo file
-    community.general.zypper_repository:
-      repo: http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable/openSUSE_Leap_{{ ansible_distribution_version }}/systemsmanagement:Uyuni:Stable.repo
-      state: present
-    register: added_by_repo_file
+    - name: add new repository via url to .repo file
+      community.general.zypper_repository:
+        repo: http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable/openSUSE_Leap_{{ ansible_distribution_version }}/systemsmanagement:Uyuni:Stable.repo
+        state: present
+      register: added_by_repo_file
 
-  - name: get repository details from zypper
-    command: zypper lr systemsmanagement_Uyuni_Stable
-    register: get_repository_details_from_zypper
+    - name: get repository details from zypper
+      command: zypper lr systemsmanagement_Uyuni_Stable
+      register: get_repository_details_from_zypper
 
-  - name: verify adding via .repo file was successful
-    assert:
-      that:
-        - "added_by_repo_file is changed"
-        - "get_repository_details_from_zypper.rc == 0"
-        - "'/systemsmanagement:/Uyuni:/Stable/' in get_repository_details_from_zypper.stdout"
+    - name: verify adding via .repo file was successful
+      assert:
+        that:
+          - "added_by_repo_file is changed"
+          - "get_repository_details_from_zypper.rc == 0"
+          - "'/systemsmanagement:/Uyuni:/Stable/' in get_repository_details_from_zypper.stdout"
 
-  - name: add same repository via url to .repo file again to verify idempotency
-    community.general.zypper_repository:
-      repo: http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable/openSUSE_Leap_{{ ansible_distribution_version }}/systemsmanagement:Uyuni:Stable.repo
-      state: present
-    register: added_again_by_repo_file
+    - name: add same repository via url to .repo file again to verify idempotency
+      community.general.zypper_repository:
+        repo: http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable/openSUSE_Leap_{{ ansible_distribution_version }}/systemsmanagement:Uyuni:Stable.repo
+        state: present
+      register: added_again_by_repo_file
 
-  - name: verify nothing was changed adding a repo with the same .repo file
-    assert:
-      that:
-        - added_again_by_repo_file is not changed
+    - name: verify nothing was changed adding a repo with the same .repo file
+      assert:
+        that:
+          - added_again_by_repo_file is not changed
 
-  - name: remove repository via url to .repo file
-    community.general.zypper_repository:
-      repo: http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable/openSUSE_Leap_{{ ansible_distribution_version }}/systemsmanagement:Uyuni:Stable.repo
-      state: absent
-    register: removed_by_repo_file
+    - name: remove repository via url to .repo file
+      community.general.zypper_repository:
+        repo: http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable/openSUSE_Leap_{{ ansible_distribution_version }}/systemsmanagement:Uyuni:Stable.repo
+        state: absent
+      register: removed_by_repo_file
 
-  - name: get list of files in /etc/zypp/repos.d/
-    command: ls /etc/zypp/repos.d/
-    changed_when: false
-    register: etc_zypp_reposd
+    - name: get list of files in /etc/zypp/repos.d/
+      command: ls /etc/zypp/repos.d/
+      changed_when: false
+      register: etc_zypp_reposd
 
-  - name: verify removal via .repo file was successful, including cleanup of local .repo file in /etc/zypp/repos.d/
-    assert:
-      that:
-        - "removed_by_repo_file"
-        - "'/systemsmanagement:/Uyuni:/Stable/' not in etc_zypp_reposd.stdout"
+    - name: verify removal via .repo file was successful, including cleanup of local .repo file in /etc/zypp/repos.d/
+      assert:
+        that:
+          - "removed_by_repo_file"
+          - "'/systemsmanagement:/Uyuni:/Stable/' not in etc_zypp_reposd.stdout"
 
 # FIXME: THIS DOESN'T SEEM TO WORK ANYMORE WITH ANY OPENSUSE VERSION IN CI!
 - when: false
   block:
-  - name: Copy test .repo file
-    copy:
-      src: 'files/systemsmanagement_Uyuni_Utils.repo'
-      dest: '{{ remote_tmp_dir }}'
+    - name: Copy test .repo file
+      copy:
+        src: 'files/systemsmanagement_Uyuni_Utils.repo'
+        dest: '{{ remote_tmp_dir }}'
 
-  - name: add new repository via local path to .repo file
-    community.general.zypper_repository:
-      repo: "{{ remote_tmp_dir }}/systemsmanagement_Uyuni_Utils.repo"
-      state: present
-    register: added_by_repo_local_file
+    - name: add new repository via local path to .repo file
+      community.general.zypper_repository:
+        repo: "{{ remote_tmp_dir }}/systemsmanagement_Uyuni_Utils.repo"
+        state: present
+      register: added_by_repo_local_file
 
-  - name: get repository details for systemsmanagement_Uyuni_Utils from zypper
-    command: zypper lr systemsmanagement_Uyuni_Utils
-    register: get_repository_details_from_zypper_for_systemsmanagement_Uyuni_Utils
+    - name: get repository details for systemsmanagement_Uyuni_Utils from zypper
+      command: zypper lr systemsmanagement_Uyuni_Utils
+      register: get_repository_details_from_zypper_for_systemsmanagement_Uyuni_Utils
 
-  - name: verify adding repository via local .repo file was successful
-    assert:
-      that:
-        - "added_by_repo_local_file is changed"
-        - "get_repository_details_from_zypper_for_systemsmanagement_Uyuni_Utils.rc == 0"
-        - "'/systemsmanagement:/Uyuni:/Utils/' in get_repository_details_from_zypper_for_systemsmanagement_Uyuni_Utils.stdout"
+    - name: verify adding repository via local .repo file was successful
+      assert:
+        that:
+          - "added_by_repo_local_file is changed"
+          - "get_repository_details_from_zypper_for_systemsmanagement_Uyuni_Utils.rc == 0"
+          - "'/systemsmanagement:/Uyuni:/Utils/' in get_repository_details_from_zypper_for_systemsmanagement_Uyuni_Utils.stdout"
diff --git a/tests/unit/requirements.yml b/tests/unit/requirements.yml
index 586a6a1b37..107fe12569 100644
--- a/tests/unit/requirements.yml
+++ b/tests/unit/requirements.yml
@@ -4,4 +4,4 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 collections:
-- community.internal_test_tools
+  - community.internal_test_tools