diff --git a/roles/oradb-manage-statspack/meta/main.yml b/roles/oradb-manage-statspack/meta/main.yml
index 20862b632..30ea1b718 100644
--- a/roles/oradb-manage-statspack/meta/main.yml
+++ b/roles/oradb-manage-statspack/meta/main.yml
@@ -1,2 +1,3 @@
+---
 dependencies:
-  - { role: orasw-meta }
+  - role: orasw-meta
diff --git a/roles/oradb-manage-statspack/tasks/main.yml b/roles/oradb-manage-statspack/tasks/main.yml
index 2e86e0185..28a37ba8c 100644
--- a/roles/oradb-manage-statspack/tasks/main.yml
+++ b/roles/oradb-manage-statspack/tasks/main.yml
@@ -1,67 +1,67 @@
 ---
 - block:
-  - name: oradb-manage-statspack | Drop Statspack Schema
-    script: spdrop.sh
-    environment:
-      ORACLE_HOME: "{{ oracle_home_db}}"
-      ORACLE_SID: "{{ dbh.oracle_db_instance_name | default(dbh.oracle_db_unique_name | default(dbh.oracle_db_name)) }}"
-    with_items: "{{ oracle_databases }}"
-    loop_control:
-      loop_var: dbh
-      label: "{{ dbh.oracle_db_name }}"
-    register: statspackdropcmd
-    become: yes
-    become_user: "{{ oracle_user }}"
-    when:
-      - dbh.statspack is defined
-      - dbh.statspack.state | default('present') == 'absent'
+    - name: oradb-manage-statspack | Drop Statspack Schema
+      script: spdrop.sh
+      environment:
+        ORACLE_HOME: "{{ oracle_home_db }}"
+        ORACLE_SID: "{{ dbh.oracle_db_instance_name | default(dbh.oracle_db_unique_name | default(dbh.oracle_db_name)) }}"
+      with_items: "{{ oracle_databases }}"
+      loop_control:
+        loop_var: dbh
+        label: "{{ dbh.oracle_db_name }}"
+      register: statspackdropcmd
+      become: true
+      become_user: "{{ oracle_user }}"
+      when:
+        - dbh.statspack is defined
+        - dbh.statspack.state | default('present') == 'absent'
 
-  - debug: msg="{{ item.stdout_lines }}"
-    with_items:
-      - "{{ statspackdropcmd.results }}"
-    loop_control:
-      label: ""
-    when:
-      - statspackdropcmd is defined
-      - item.stdout_lines is defined
+    - debug: msg="{{ item.stdout_lines }}"  # noqa unnamed-task
+      with_items:
+        - "{{ statspackdropcmd.results }}"
+      loop_control:
+        label: ""
+      when:
+        - statspackdropcmd is defined
+        - item.stdout_lines is defined
 
   tags:
     - spdrop
     - spcdb
 
 - block:
-  - name: oradb-manage-statspack | Create Statspack Schema (existing user is ignored)
-    script: spcreate.sh
-    environment:
-      ORACLE_HOME: "{{ oracle_home_db}}"
-      ORACLE_SID: "{{ dbh.oracle_db_instance_name | default(dbh.oracle_db_unique_name | default(dbh.oracle_db_name)) }}"
-      perfstat_password: perfstat
-      temporary_tablespace: "{{ dbh.statspack.tablespace_temp | default('temp')}}"
-      default_tablespace: "{{ dbh.statspack.tablespace | default('sysaux')}}"
-      purgedates: "{{ dbh.statspack.purgedays | default(35)}}"
-      snaplevel: "{{ dbh.statspack.snaplevel | default(7) }}"
-    with_items: "{{ oracle_databases }}"
-    loop_control:
-      loop_var: dbh
-      label: "{{ dbh.oracle_db_name }}"
-    register: statspackcmd
-    become: yes
-    become_user: "{{ oracle_user }}"
-    failed_when:
-      - statspackcmd.rc != 0
-      - '"ORA-01920:" not in statspackcmd.stdout' # ORA-01920: user name 'PERFSTAT' conflicts with another user 
-    when:
-      - dbh.statspack is defined
-      - dbh.statspack.state | default('present') == 'present'
+    - name: oradb-manage-statspack | Create Statspack Schema (existing user is ignored)
+      script: spcreate.sh
+      environment:
+        ORACLE_HOME: "{{ oracle_home_db }}"
+        ORACLE_SID: "{{ dbh.oracle_db_instance_name | default(dbh.oracle_db_unique_name | default(dbh.oracle_db_name)) }}"
+        perfstat_password: perfstat
+        temporary_tablespace: "{{ dbh.statspack.tablespace_temp | default('temp') }}"
+        default_tablespace: "{{ dbh.statspack.tablespace | default('sysaux') }}"
+        purgedates: "{{ dbh.statspack.purgedays | default(35) }}"
+        snaplevel: "{{ dbh.statspack.snaplevel | default(7) }}"
+      with_items: "{{ oracle_databases }}"
+      loop_control:
+        loop_var: dbh
+        label: "{{ dbh.oracle_db_name }}"
+      register: statspackcmd
+      become: true
+      become_user: "{{ oracle_user }}"
+      failed_when:
+        - statspackcmd.rc != 0
+        - '"ORA-01920:" not in statspackcmd.stdout'  # ORA-01920: user name 'PERFSTAT' conflicts with another user
+      when:
+        - dbh.statspack is defined
+        - dbh.statspack.state | default('present') == 'present'
 
-  - debug: msg="{{ item.stdout_lines }}"
-    with_items:
-      - "{{ statspackcmd.results }}"
-    loop_control:
-      label: ""
-    when:
-      - statspackcmd is defined
-      - item.stdout_lines is defined
+    - debug: msg="{{ item.stdout_lines }}"  # noqa unnamed-task
+      with_items:
+        - "{{ statspackcmd.results }}"
+      loop_control:
+        label: ""
+      when:
+        - statspackcmd is defined
+        - item.stdout_lines is defined
   tags:
     - spcreate
     - spcdb
@@ -76,25 +76,25 @@
     job_name: "PERFSTAT.PURGE"
     comments: "Statspack Purge-Job"
     job_type: "plsql_block"
-    job_action: "PERFSTAT.STATSPACK.PURGE({{ dbh.statspack.purgedays | default(purgedays)}});"
+    job_action: "PERFSTAT.STATSPACK.PURGE({{ dbh.statspack.purgedays | default(purgedays) }});"
     logging_level: "runs"
     repeat_interval: "{{ dbh.statspack.purgeinterval | default(purgeinterval) }}"
     state: "present"
 
   environment:
-    ORACLE_HOME: "{{ oracle_home_db}}"
+    ORACLE_HOME: "{{ oracle_home_db }}"
     ORACLE_SID: "{{ dbh.oracle_db_instance_name | default(dbh.oracle_db_unique_name | default(dbh.oracle_db_name)) }}"
   with_items:
-      - "{{oracle_databases}}"
+    - "{{ oracle_databases }}"
   when:
     - oracle_databases is defined
     - dbh.statspack is defined
     - dbh.statspack.state | default('present') == 'present'
   become_user: "{{ oracle_user }}"
   loop_control:
-      loop_var: dbh
-      label: "{{ dbh.oracle_db_name }}"
-  tags: 
+    loop_var: dbh
+    label: "{{ dbh.oracle_db_name }}"
+  tags:
     - spjob
     - spcdb
 
@@ -108,101 +108,101 @@
     job_name: "PERFSTAT.SNAPSHOT"
     comments: "Statspack Snapshot-Job"
     job_type: "plsql_block"
-    job_action: "PERFSTAT.STATSPACK.SNAP(i_snap_level => {{ dbh.statspack.snaplevel | default(snaplevel)}});"
+    job_action: "PERFSTAT.STATSPACK.SNAP(i_snap_level => {{ dbh.statspack.snaplevel | default(snaplevel) }});"
     logging_level: "runs"
     repeat_interval: "{{ dbh.statspack.snapinterval | default(snapinterval) }}"
     state: "present"
   environment:
-    ORACLE_HOME: "{{ oracle_home_db}}"
+    ORACLE_HOME: "{{ oracle_home_db }}"
     ORACLE_SID: "{{ dbh.oracle_db_instance_name | default(dbh.oracle_db_unique_name | default(dbh.oracle_db_name)) }}"
   with_items:
-      - "{{oracle_databases}}"
+    - "{{ oracle_databases }}"
   when:
     - oracle_databases is defined
     - dbh.statspack is defined
     - dbh.statspack.state | default('present') == 'present'
   become_user: "{{ oracle_user }}"
   loop_control:
-      loop_var: dbh
-      label: "{{ dbh.oracle_db_name }}"
-  tags: 
+    loop_var: dbh
+    label: "{{ dbh.oracle_db_name }}"
+  tags:
     - spjob
     - spcdb
 
 - block:
-  - name: oradb-manage-statspack | Drop Statspack Schema (PDB)
-    script: spdrop.sh
-    environment:
-      ORACLE_HOME: "{{ oracle_home_db }}"
-      ORACLE_SID: "{{ oracle_db_instance_name }}"
-      pdb_name: "{{ pdb.0.pdb_name }}"
-    loop:
-      - "{{ oracle_pdbs |flatten(levels=1) }}"
-    loop_control:
-      loop_var: pdb
-      label: "{{ pdb.0.cdb | default('')}} {{ pdb.0.pdb_name | default('') }} {{ oracle_db_instance_name | default('') }}"
-    register: statspackdropcmd
-    become: yes
-    become_user: "{{ oracle_user }}"
-    failed_when:
-      - statspackdropcmd.rc != 0
-      - '"ORA-01920:" not in statspackdropcmd.stdout' # ORA-01920: user name 'PERFSTAT' conflicts with another user 
-    when:
-      - oracle_pdbs is defined
-      - pdb.0.statspack is defined
-      - pdb.0.statspack.state | default('present') == 'absent'
+    - name: oradb-manage-statspack | Drop Statspack Schema (PDB)
+      script: spdrop.sh
+      environment:
+        ORACLE_HOME: "{{ oracle_home_db }}"
+        ORACLE_SID: "{{ oracle_db_instance_name }}"
+        pdb_name: "{{ pdb.0.pdb_name }}"
+      loop:
+        - "{{ oracle_pdbs |flatten(levels=1) }}"
+      loop_control:
+        loop_var: pdb
+        label: "{{ pdb.0.cdb | default('') }} {{ pdb.0.pdb_name | default('') }} {{ oracle_db_instance_name | default('') }}"
+      register: statspackdropcmd
+      become: true
+      become_user: "{{ oracle_user }}"
+      failed_when:
+        - statspackdropcmd.rc != 0
+        - '"ORA-01920:" not in statspackdropcmd.stdout'  # ORA-01920: user name 'PERFSTAT' conflicts with another user
+      when:
+        - oracle_pdbs is defined
+        - pdb.0.statspack is defined
+        - pdb.0.statspack.state | default('present') == 'absent'
 
-  - debug: msg="{{ item.stdout_lines }}"
-    with_items:
-      - "{{ statspackdropcmd.results }}"
-    loop_control:
-      label: ""
-    when:
-      - statspackdropcmd is defined
-      - item.stdout_lines is defined
-  become: yes
+    - debug: msg="{{ item.stdout_lines }}"  # noqa unnamed-task
+      with_items:
+        - "{{ statspackdropcmd.results }}"
+      loop_control:
+        label: ""
+      when:
+        - statspackdropcmd is defined
+        - item.stdout_lines is defined
+  become: true
   become_user: "{{ oracle_user }}"
   tags:
     - spdrop
     - sppdb
 
 - block:
-  - name: oradb-manage-statspack | Create Statspack Schema in PDBs (existing user is ignored)
-    script: spcreate.sh
-    environment:
-      ORACLE_HOME: "{{ oracle_home_db }}"
-      ORACLE_SID: "{{ oracle_db_instance_name }}"
-      perfstat_password: perfstat
-      temporary_tablespace: "{{ pdb.statspack.tablespace_temp | default('temp')}}"
-      default_tablespace: "{{ pdb.statspack.tablespace | default('sysaux')}}"
-      purgedates: "{{ pdb.statspack.purgedays | default(35)}}"
-      snaplevel: "{{ pdb.statspack.snaplevel | default(7) }}"
-      pdb_name: "{{ pdb.0.pdb_name }}"
-    loop:
-      - "{{ oracle_pdbs |flatten(levels=1) }}"
-    loop_control:
-      loop_var: pdb
-      label: "{{ pdb.0.cdb | default('')}} {{ pdb.0.pdb_name | default('') }} {{ oracle_db_instance_name | default('') }}"
-    register: statspackcmd
-    become: yes
-    become_user: "{{ oracle_user }}"
-    failed_when:
-      - statspackcmd.rc != 0
-      - '"ORA-01920:" not in statspackcmd.stdout' # ORA-01920: user name 'PERFSTAT' conflicts with another user 
-    when:
-      - oracle_pdbs is defined
-      - pdb.0.statspack is defined
-      - pdb.0.statspack.state | default('present') == 'present'
+    - name: oradb-manage-statspack | Create Statspack Schema in PDBs (existing user is ignored)
+      script: spcreate.sh
+      environment:
+        ORACLE_HOME: "{{ oracle_home_db }}"
+        ORACLE_SID: "{{ oracle_db_instance_name }}"
+        perfstat_password: perfstat
+        temporary_tablespace: "{{ pdb.statspack.tablespace_temp | default('temp') }}"
+        default_tablespace: "{{ pdb.statspack.tablespace | default('sysaux') }}"
+        purgedates: "{{ pdb.statspack.purgedays | default(35) }}"
+        snaplevel: "{{ pdb.statspack.snaplevel | default(7) }}"
+        pdb_name: "{{ pdb.0.pdb_name }}"
+      loop:
+        - "{{ oracle_pdbs |flatten(levels=1) }}"
+      loop_control:
+        loop_var: pdb
+        label: "{{ pdb.0.cdb | default('') }} {{ pdb.0.pdb_name | default('') }} {{ oracle_db_instance_name | default('') }}"
+      register: statspackcmd
+      become: true
+      become_user: "{{ oracle_user }}"
+      failed_when:
+        - statspackcmd.rc != 0
+        - '"ORA-01920:" not in statspackcmd.stdout'  # ORA-01920: user name 'PERFSTAT' conflicts with another user
+      when:
+        - oracle_pdbs is defined
+        - pdb.0.statspack is defined
+        - pdb.0.statspack.state | default('present') == 'present'
 
-  - debug: msg="{{ item.stdout_lines }}"
-    with_items:
-      - "{{ statspackcmd.results }}"
-    loop_control:
-      label: ""
-    when:
-      - statspackcmd is defined
-      - item.stdout_lines is defined
-  become: yes
+    - debug: msg="{{ item.stdout_lines }}"  # noqa unnamed-task
+      with_items:
+        - "{{ statspackcmd.results }}"
+      loop_control:
+        label: ""
+      when:
+        - statspackcmd is defined
+        - item.stdout_lines is defined
+  become: true
   become_user: "{{ oracle_user }}"
   tags:
     - spcreate
@@ -218,7 +218,7 @@
     job_name: "PERFSTAT.PURGE"
     comments: "Statspack Purge-Job"
     job_type: "plsql_block"
-    job_action: "PERFSTAT.STATSPACK.PURGE({{ pdb.statspack.purgedays | default(purgedays)}});"
+    job_action: "PERFSTAT.STATSPACK.PURGE({{ pdb.statspack.purgedays | default(purgedays) }});"
     logging_level: "runs"
     repeat_interval: "{{ pdb.0.statspack.purgeinterval | default(purgeinterval) }}"
     state: "present"
@@ -227,8 +227,8 @@
   loop:
     - "{{ oracle_pdbs |flatten(levels=1) }}"
   loop_control:
-      loop_var: pdb
-      label: "{{ pdb.0.cdb | default('') }} {{ pdb.0.pdb_name | default('') }}"
+    loop_var: pdb
+    label: "{{ pdb.0.cdb | default('') }} {{ pdb.0.pdb_name | default('') }}"
   when:
     - oracle_pdbs is defined
     - pdb.0.cdb is defined
@@ -236,7 +236,7 @@
     - pdb.0.statspack is defined
     - pdb.0.statspack.state | default('present') == 'present'
   become_user: "{{ oracle_user }}"
-  tags: 
+  tags:
     - spjob
     - sppdb
 
@@ -250,7 +250,7 @@
     job_name: "PERFSTAT.SNAPSHOT"
     comments: "Statspack Snapshot-Job"
     job_type: "plsql_block"
-    job_action: "PERFSTAT.STATSPACK.SNAP(i_snap_level => {{ pdb.0.statspack.snaplevel | default(snaplevel)}});"
+    job_action: "PERFSTAT.STATSPACK.SNAP(i_snap_level => {{ pdb.0.statspack.snaplevel | default(snaplevel) }});"
     logging_level: "runs"
     repeat_interval: "{{ pdb.0.statspack.snapinterval | default(snapinterval) }}"
     state: "present"
@@ -259,16 +259,16 @@
   loop:
     - "{{ oracle_pdbs |flatten(levels=1) }}"
   loop_control:
-      loop_var: pdb
-      label: "{{ pdb.0.cdb | default('') }} {{ pdb.0.pdb_name | default('') }}"
+    loop_var: pdb
+    label: "{{ pdb.0.cdb | default('') }} {{ pdb.0.pdb_name | default('') }}"
   when:
     - oracle_pdbs is defined
     - pdb.0.cdb is defined
     - pdb.0.pdb_name is defined
     - pdb.0.statspack is defined
     - pdb.0.statspack.state | default('present') == 'present'
-  become: yes
+  become: true
   become_user: "{{ oracle_user }}"
   tags:
     - spjob
-    - sppdb
\ No newline at end of file
+    - sppdb