diff --git a/roles/common/README.md b/roles/common/README.md
index 3e1d7a937..ff9d94566 100644
--- a/roles/common/README.md
+++ b/roles/common/README.md
@@ -36,7 +36,6 @@ sets up the host generic stuff
 
 - Minimum Ansible version: `2.14.0`
 
-
 ## Default Variables
 
 ### common_packages
diff --git a/roles/cxoracle/README.md b/roles/cxoracle/README.md
index d16b320a4..46f22fd1d 100644
--- a/roles/cxoracle/README.md
+++ b/roles/cxoracle/README.md
@@ -24,7 +24,6 @@ Install cx_Oracle with pip
 
 - Minimum Ansible version: `2.14.0`
 
-
 ## Default Variables
 
 ### cx_oracle3_source
diff --git a/roles/oradb_datapatch/README.md b/roles/oradb_datapatch/README.md
index 329d94727..06b2a2618 100644
--- a/roles/oradb_datapatch/README.md
+++ b/roles/oradb_datapatch/README.md
@@ -19,7 +19,6 @@ Manage datapatch for Oracle Database
 
 - Minimum Ansible version: `2.14.0`
 
-
 ## Default Variables
 
 ### oradb_datapatch_fail_on_db_not_exist
diff --git a/roles/oradb_facts/README.md b/roles/oradb_facts/README.md
index 52f41f6cc..066d0ee2f 100644
--- a/roles/oradb_facts/README.md
+++ b/roles/oradb_facts/README.md
@@ -19,7 +19,6 @@ Gather Ansible Facts from database
 
 - Minimum Ansible version: `2.14.0`
 
-
 ## Default Variables
 
 ### oradb_facts_db_user
diff --git a/roles/oradb_manage_db/README.md b/roles/oradb_manage_db/README.md
index 81c668fbe..0b6549742 100644
--- a/roles/oradb_manage_db/README.md
+++ b/roles/oradb_manage_db/README.md
@@ -22,7 +22,6 @@ Create, modify and remove Oracle Databases
 
 - Minimum Ansible version: `2.14.0`
 
-
 ## Default Variables
 
 ### dbca_templatename
diff --git a/roles/oradb_manage_parameters/README.md b/roles/oradb_manage_parameters/README.md
index 3a3b41768..ee1787b51 100644
--- a/roles/oradb_manage_parameters/README.md
+++ b/roles/oradb_manage_parameters/README.md
@@ -18,7 +18,6 @@ Manage Oracle Database Parameters
 
 - Minimum Ansible version: `2.14.0`
 
-
 ## Default Variables
 
 ### restart_spparameter_changed
diff --git a/roles/oradb_manage_statspack/README.md b/roles/oradb_manage_statspack/README.md
index e774ccd8f..68eb539ca 100644
--- a/roles/oradb_manage_statspack/README.md
+++ b/roles/oradb_manage_statspack/README.md
@@ -23,7 +23,6 @@ Not RAC aware at the moment.
 
 - Minimum Ansible version: `2.14.0`
 
-
 ## Default Variables
 
 ### purgedays
diff --git a/roles/oradb_manage_wallet/README.md b/roles/oradb_manage_wallet/README.md
new file mode 100644
index 000000000..0e4c0bb09
--- /dev/null
+++ b/roles/oradb_manage_wallet/README.md
@@ -0,0 +1,21 @@
+# oradb_manage_wallet
+
+## Table of content
+
+- [Requirements](#requirements)
+- [Dependencies](#dependencies)
+- [License](#license)
+- [Author](#author)
+
+---
+
+## Requirements
+
+None.
+
+
+
+
+## Dependencies
+
+None.
diff --git a/roles/oradb_rman/README.md b/roles/oradb_rman/README.md
index f5a78d67c..8c25a9ef5 100644
--- a/roles/oradb_rman/README.md
+++ b/roles/oradb_rman/README.md
@@ -34,7 +34,6 @@ All other role variables from `oradb_rman` are deprecated and will be removed in
 
 - Minimum Ansible version: `2.14.0`
 
-
 ## Default Variables
 
 ### oradb_rman_autofs
@@ -79,8 +78,8 @@ Lgofiledirectory for output of cronjobs.
 #### Default value
 
 ```YAML
-oradb_rman_cron_logdir: "{{ rman_cron_logdir | default('/var/log/oracle/rman/log')\
-  \ }}"
+oradb_rman_cron_logdir: "{{ rman_cron_logdir | default('/var/log/oracle/rman/log')
+  }}"
 ```
 
 ### oradb_rman_cron_mkjob
@@ -112,8 +111,8 @@ Lgofiledirectory for `rman_wrapper.sh`.
 #### Default value
 
 ```YAML
-oradb_rman_log_dir: "{{ rman_log_dir | default(odb.0.rman_log_dir | default(oracle_base\
-  \ + '/rman/log')) }}"
+oradb_rman_log_dir: "{{ rman_log_dir | default(odb.0.rman_log_dir | default(oracle_base
+  + '/rman/log')) }}"
 ```
 
 ### oradb_rman_retention_policy_default
@@ -123,8 +122,8 @@ Defines the policy for the RMAN-Templates from role.
 #### Default value
 
 ```YAML
-oradb_rman_retention_policy_default: "{{ rman_retention_policy_default | default('RECOVERY\
-  \ WINDOW OF 14 DAYS') }}"
+oradb_rman_retention_policy_default: "{{ rman_retention_policy_default | default('RECOVERY
+  WINDOW OF 14 DAYS') }}"
 ```
 
 ### oradb_rman_script_dir
@@ -134,8 +133,8 @@ Directory for `*.rman`-Files.
 #### Default value
 
 ```YAML
-oradb_rman_script_dir: "{{ rman_script_dir | default(odb.0.rman_script_dir | default(oracle_base\
-  \ + '/rman')) }}"
+oradb_rman_script_dir: "{{ rman_script_dir | default(odb.0.rman_script_dir | default(oracle_base
+  + '/rman')) }}"
 ```
 
 ### oradb_rman_tns_admin
@@ -146,8 +145,8 @@ This is needed for RMAN-Catalogconnections.
 #### Default value
 
 ```YAML
-oradb_rman_tns_admin: "{{ rman_tns_admin | default(oracle_base + '/rman/network/admin')\
-  \ }}"
+oradb_rman_tns_admin: "{{ rman_tns_admin | default(oracle_base + '/rman/network/admin')
+  }}"
 ```
 
 ### oradb_rman_tnsnames_installed
@@ -172,8 +171,8 @@ Directory for Oracle wallet.
 #### Default value
 
 ```YAML
-oradb_rman_wallet_loc: "{{ rman_wallet_loc | default(oracle_base + '/rman/network/wallet')\
-  \ }}"
+oradb_rman_wallet_loc: "{{ rman_wallet_loc | default(oracle_base + '/rman/network/wallet')
+  }}"
 ```
 
 ### oradb_rman_wallet_password
@@ -208,8 +207,6 @@ oradb_rman_wallet_password: "{{ rman_wallet_password | default('oracleWallet1')
 
 **_tns_**
 
-**_tnsnames_**
-
 **_wallet_**
 
 **_wallet_contents_**
diff --git a/roles/orahost/README.md b/roles/orahost/README.md
index a585d75b8..a40c60f6e 100644
--- a/roles/orahost/README.md
+++ b/roles/orahost/README.md
@@ -66,7 +66,6 @@ Role to configure the hostsystem for ansible-oracle
 
 - Minimum Ansible version: `2.14.0`
 
-
 ## Default Variables
 
 ### asmlib_rpm
@@ -88,7 +87,8 @@ Name / Url for rpm oracleasm-support for RHEL6/OL6.
 #### Default value
 
 ```YAML
-asmlib_rpm_el6: http://download.oracle.com/otn_software/asmlib/oracleasmlib-2.0.4-1.el6.x86_64.rpm
+asmlib_rpm_el6: 
+  http://download.oracle.com/otn_software/asmlib/oracleasmlib-2.0.4-1.el6.x86_64.rpm
 ```
 
 ### asmlib_rpm_el7
@@ -98,7 +98,8 @@ Name / Url for rpm oracleasm-support for RHEL7/OL7.
 #### Default value
 
 ```YAML
-asmlib_rpm_el7: http://download.oracle.com/otn_software/asmlib/oracleasmlib-2.0.12-1.el7.x86_64.rpm
+asmlib_rpm_el7: 
+  http://download.oracle.com/otn_software/asmlib/oracleasmlib-2.0.12-1.el7.x86_64.rpm
 ```
 
 ### asmlib_rpm_el8
@@ -108,7 +109,8 @@ Name / Url for rpm oracleasm-support for RHEL8/OL8.
 #### Default value
 
 ```YAML
-asmlib_rpm_el8: https://download.oracle.com/otn_software/asmlib/oracleasmlib-2.0.17-1.el8.x86_64.rpm
+asmlib_rpm_el8: 
+  https://download.oracle.com/otn_software/asmlib/oracleasmlib-2.0.17-1.el8.x86_64.rpm
 ```
 
 ### asmlib_rpm_sles
@@ -118,7 +120,8 @@ Name / Url for rpm oracleasm-support for SLES.
 #### Default value
 
 ```YAML
-asmlib_rpm_sles: http://oss.oracle.com/projects/oracleasm-support/dist/files/RPMS/sles12/amd64/2.1.8/oracleasm-support-2.1.8-1.SLE12.x86_64.rpm
+asmlib_rpm_sles: 
+  http://oss.oracle.com/projects/oracleasm-support/dist/files/RPMS/sles12/amd64/2.1.8/oracleasm-support-2.1.8-1.SLE12.x86_64.rpm
 ```
 
 ### asmlibsupport_rpm
@@ -144,7 +147,8 @@ asmlibsupport_rpm: Value from `asmlibsupport_rpm_el6`, `asmlibsupport_rpm_el7` o
 #### Default value
 
 ```YAML
-asmlibsupport_rpm_el6: http://oss.oracle.com/projects/oracleasm-support/dist/files/RPMS/rhel6/amd64/2.1.8/oracleasm-support-2.1.8-1.el6.x86_64.rpm
+asmlibsupport_rpm_el6: 
+  http://oss.oracle.com/projects/oracleasm-support/dist/files/RPMS/rhel6/amd64/2.1.8/oracleasm-support-2.1.8-1.el6.x86_64.rpm
 ```
 
 ### asmlibsupport_rpm_el7
@@ -152,7 +156,8 @@ asmlibsupport_rpm_el6: http://oss.oracle.com/projects/oracleasm-support/dist/fil
 #### Default value
 
 ```YAML
-asmlibsupport_rpm_el7: https://yum.oracle.com/repo/OracleLinux/OL7/latest/x86_64/getPackage/oracleasm-support-2.1.11-2.el7.x86_64.rpm
+asmlibsupport_rpm_el7: 
+  https://yum.oracle.com/repo/OracleLinux/OL7/latest/x86_64/getPackage/oracleasm-support-2.1.11-2.el7.x86_64.rpm
 ```
 
 ### asmlibsupport_rpm_el8
@@ -160,7 +165,8 @@ asmlibsupport_rpm_el7: https://yum.oracle.com/repo/OracleLinux/OL7/latest/x86_64
 #### Default value
 
 ```YAML
-asmlibsupport_rpm_el8: https://yum.oracle.com/repo/OracleLinux/OL8/latest/x86_64/getPackage/oracleasm-support-2.1.11-2.el8.x86_64.rpm
+asmlibsupport_rpm_el8: 
+  https://yum.oracle.com/repo/OracleLinux/OL8/latest/x86_64/getPackage/oracleasm-support-2.1.11-2.el8.x86_64.rpm
 ```
 
 ### configure_etc_hosts
@@ -285,8 +291,8 @@ Set IP to 2nd Interface on virtualbox and 1st for all otehr installations
 #### Default value
 
 ```YAML
-etc_hosts_ip: "{% if 'virtualbox' in ansible_virtualization_type %}{{ ansible_all_ipv4_addresses[1]\
-  \ }}{% else %}{{ ansible_default_ipv4.address }}{% endif %}"
+etc_hosts_ip: "{% if 'virtualbox' in ansible_virtualization_type %}{{ ansible_all_ipv4_addresses[1]
+  }}{% else %}{{ ansible_default_ipv4.address }}{% endif %}"
 ```
 
 ### extrarepos_disabled
@@ -304,8 +310,8 @@ extrarepos_disabled: '[]'
 #### Default value
 
 ```YAML
-extrarepos_enabled: "{%- if ansible_distribution == 'OracleLinux' -%}ol{{ ansible_distribution_major_version\
-  \ }}_addons{%- else -%}{%- endif %}"
+extrarepos_enabled: "{%- if ansible_distribution == 'OracleLinux' -%}ol{{ ansible_distribution_major_version
+  }}_addons{%- else -%}{%- endif %}"
 ```
 
 ### firewall_service
@@ -331,7 +337,8 @@ grid_users:
     primgroup: '{{ oracle_group }}'
     othergroups: '{{ asmadmin_group }},{{ asmdba_group }},{{ asmoper_group }},{{ dba_group
       }}'
-    passwd: $6$0xHoAXXF$K75HKb64Hcb/CEcr3YEj2LGERi/U2moJgsCK.ztGxLsKoaXc4UBiNZPL0hlxB5ng6GL.gyipfQOOXplzcdgvD0
+    passwd: 
+      $6$0xHoAXXF$K75HKb64Hcb/CEcr3YEj2LGERi/U2moJgsCK.ztGxLsKoaXc4UBiNZPL0hlxB5ng6GL.gyipfQOOXplzcdgvD0
 ```
 
 ### host_fs_layout
@@ -663,7 +670,8 @@ oracle_users:
     primgroup: '{{ oracle_group }}'
     othergroups: '{{ dba_group }},{{ asmadmin_group }},{{ asmdba_group }},{{ asmoper_group
       }},backupdba,dgdba,kmdba,{{ oper_group }}'
-    passwd: $6$0xHoAXXF$K75HKb64Hcb/CEcr3YEj2LGERi/U2moJgsCK.ztGxLsKoaXc4UBiNZPL0hlxB5ng6GL.gyipfQOOXplzcdgvD0
+    passwd: 
+      $6$0xHoAXXF$K75HKb64Hcb/CEcr3YEj2LGERi/U2moJgsCK.ztGxLsKoaXc4UBiNZPL0hlxB5ng6GL.gyipfQOOXplzcdgvD0
 ```
 
 ### os_family_supported
@@ -673,8 +681,8 @@ Support is limited to RHE/OL and SuSE
 #### Default value
 
 ```YAML
-os_family_supported: "{% if ansible_os_family == 'Suse' %}Suse{% else %}RedHat{% endif\
-  \ %}"
+os_family_supported: "{% if ansible_os_family == 'Suse' %}Suse{% else %}RedHat{% endif
+  %}"
 ```
 
 ### os_min_supported_version
@@ -684,8 +692,8 @@ Minimum supported versions for SLES is 12.1 and RHEL/OL >= 6.4
 #### Default value
 
 ```YAML
-os_min_supported_version: "{% if ansible_os_family == 'Suse' %}12.1{% else %}6.4{%\
-  \ endif %}"
+os_min_supported_version: "{% if ansible_os_family == 'Suse' %}12.1{% else %}6.4{%
+  endif %}"
 ```
 
 ### percent_hugepages
@@ -759,12 +767,6 @@ transparent_hugepage_disable:
 
 **_hostfs_**
 
-**_hugepages_**
-
-**_iptables,firewalld_**
-
-**_molecule-idempotence-notest_**
-
 **_nozeroconf_**
 
 **_orahost_assert_**
@@ -787,16 +789,12 @@ transparent_hugepage_disable:
 
 **_sudoadd_**
 
-**_sysctl_**
-
 **_sysctl,hugepages_**
 
 **_sysctl,hugepages,molecule-idempotence-notest_**
 
 **_sysctl,molecule-idempotence-notest_**
 
-**_timezone_**
-
 **_tphnuma_**
 
 **_tphnuma,molecule-idempotence-notest_**
diff --git a/roles/orahost_cron/README.md b/roles/orahost_cron/README.md
index f8be033e7..13896aa44 100644
--- a/roles/orahost_cron/README.md
+++ b/roles/orahost_cron/README.md
@@ -18,7 +18,6 @@ Configure cronjobs for ansible-oracle
 
 - Minimum Ansible version: `2.14.0`
 
-
 ## Default Variables
 
 ### cron_config
diff --git a/roles/orahost_logrotate/README.md b/roles/orahost_logrotate/README.md
index 01cf2fed3..644e2753b 100644
--- a/roles/orahost_logrotate/README.md
+++ b/roles/orahost_logrotate/README.md
@@ -24,7 +24,6 @@ Configure logrotate for ansible-oracle
 
 - Minimum Ansible version: `2.14.0`
 
-
 ## Default Variables
 
 ### logrotate_config
@@ -53,8 +52,8 @@ logrotate_config:
       - dateext
       - compress
   - name: oracle_rman
-    file: "{{ rman_cron_logdir | default('/var/log/oracle/rman/log') }}/*.log {{ oracle_base\
-      \ }}/admin/*/rman/*.log {{ oracle_base }}/admin/*/rman/log/*.log"
+    file: "{{ rman_cron_logdir | default('/var/log/oracle/rman/log') }}/*.log {{ oracle_base
+      }}/admin/*/rman/*.log {{ oracle_base }}/admin/*/rman/log/*.log"
     options:
       - missingok
       - notifempty
diff --git a/roles/orahost_meta/README.md b/roles/orahost_meta/README.md
index 5fcb84651..cd3268210 100644
--- a/roles/orahost_meta/README.md
+++ b/roles/orahost_meta/README.md
@@ -35,7 +35,6 @@ Meta role used by other roles to share variable defaults.
 
 - Minimum Ansible version: `2.14.0`
 
-
 ## Default Variables
 
 ### asm_diskgroups
diff --git a/roles/orahost_ssh/README.md b/roles/orahost_ssh/README.md
index e618754be..673244f3d 100644
--- a/roles/orahost_ssh/README.md
+++ b/roles/orahost_ssh/README.md
@@ -24,7 +24,6 @@ This role needs a complete refactoring in the future!
 
 - Minimum Ansible version: `2.14.0`
 
-
 ## Default Variables
 
 ### grid_user
@@ -71,8 +70,6 @@ oracle_users:
 
 ## Discovered Tags
 
-**_sshkeys_**
-
 **_sshkeys,known_hosts_**
 
 
diff --git a/roles/orahost_storage/README.md b/roles/orahost_storage/README.md
index 9d1741eb4..a2bf0e576 100644
--- a/roles/orahost_storage/README.md
+++ b/roles/orahost_storage/README.md
@@ -24,7 +24,6 @@ Role to configure the storage for oracle.
 
 - Minimum Ansible version: `2.14.0`
 
-
 ## Default Variables
 
 ### asmlib_binary
diff --git a/roles/orasw_download_patches/README.md b/roles/orasw_download_patches/README.md
index 7c0636080..98ba22b75 100644
--- a/roles/orasw_download_patches/README.md
+++ b/roles/orasw_download_patches/README.md
@@ -27,7 +27,6 @@ Download all patches from Oracle
 
 - Minimum Ansible version: `2.14.0`
 
-
 ## Default Variables
 
 ### http_proxy
diff --git a/roles/orasw_meta/README.md b/roles/orasw_meta/README.md
index 51bfd87ae..43aadc24b 100644
--- a/roles/orasw_meta/README.md
+++ b/roles/orasw_meta/README.md
@@ -72,7 +72,6 @@ There are a lot of variables who are used by `orasw_meta`
 
 - Minimum Ansible version: `2.14.0`
 
-
 ## Default Variables
 
 ### _www_download_bin
@@ -826,8 +825,10 @@ shell_aliases:
   - sqlsys='rlwrap sqlplus "/ as sysdba"'
   - dbh='cd $ORACLE_HOME'
   - dbb='cd $ORACLE_BASE'
-  - talert='tail -500f $ORACLE_BASE/diag/rdbms/$ORA_DB_UNQ_NAME/$ORACLE_SID/trace/alert_$ORACLE_SID.log'
-  - lalert='less $ORACLE_BASE/diag/rdbms/$ORA_DB_UNQ_NAME/$ORACLE_SID/trace/alert_$ORACLE_SID.log'
+  - talert='tail -500f 
+    $ORACLE_BASE/diag/rdbms/$ORA_DB_UNQ_NAME/$ORACLE_SID/trace/alert_$ORACLE_SID.log'
+  - lalert='less 
+    $ORACLE_BASE/diag/rdbms/$ORA_DB_UNQ_NAME/$ORACLE_SID/trace/alert_$ORACLE_SID.log'
   - lsnrstart='lsnrctl start $LSNRNAME'
   - lsnrstop='lsnrctl stop $LSNRNAME'
   - lsnrstatus='lsnrctl status $LSNRNAME'
diff --git a/roles/orasw_meta_internal/README.md b/roles/orasw_meta_internal/README.md
index 1badb800d..ef2374c45 100644
--- a/roles/orasw_meta_internal/README.md
+++ b/roles/orasw_meta_internal/README.md
@@ -59,7 +59,6 @@ This will create issues and problems in `ansible-oracle` and is not supported.
 
 - Minimum Ansible version: `2.14.0`
 
-
 ## Default Variables
 
 ### _db_password_cdb
@@ -184,8 +183,8 @@ _odb_loop_helper: _internal_used_
 #### Default value
 
 ```YAML
-_opdb_home: "{{ (oracle_databases | selectattr('oracle_db_name', 'match', opdb[0]['cdb']))[0]['home']\
-  \ }}"
+_opdb_home: "{{ (oracle_databases | selectattr('oracle_db_name', 'match', opdb[0]['cdb']))[0]['home']
+  }}"
 ```
 
 ### _opdb_loop_helper
@@ -309,6 +308,8 @@ db_password: >-
 
 ### db_service_name
 
+**_Deprecated:_** since v4.0.0<br />
+
 #### Default value
 
 ```YAML
@@ -334,6 +335,8 @@ _IMPORTANT_
 
 Do not set this variable in inventory, set_fact ...!
 
+**_Deprecated:_** since v4.0.0<br />
+
 #### Default value
 
 ```YAML
@@ -346,6 +349,8 @@ The variable is used for shell, command tasks to set environment Variables.
 
 Do not set it in inventory!
 
+**_Deprecated:_** since v4.0.0<br />
+
 #### Default value
 
 ```YAML
@@ -356,17 +361,21 @@ grid_env:
 
 ### listener_home
 
+**_Deprecated:_** since v4.0.0<br />
+
 #### Default value
 
 ```YAML
-listener_home: "{%- if lsnrinst is defined -%}{%- if db_homes_config[lsnrinst.home]['oracle_home']\
-  \ is defined -%}{{ db_homes_config[lsnrinst.home]['oracle_home'] }}{%- else -%}{{\
-  \ oracle_base }}/{{ db_homes_config[lsnrinst.home]['version'] }}/{{ db_homes_config[lsnrinst.home]['home']\
-  \ }}{%- endif -%}{%- endif -%}"
+listener_home: "{%- if lsnrinst is defined -%}{%- if db_homes_config[lsnrinst.home]['oracle_home']
+  is defined -%}{{ db_homes_config[lsnrinst.home]['oracle_home'] }}{%- else -%}{{
+  oracle_base }}/{{ db_homes_config[lsnrinst.home]['version'] }}/{{ db_homes_config[lsnrinst.home]['home']
+  }}{%- endif -%}{%- endif -%}"
 ```
 
 ### listener_port_template
 
+**_Deprecated:_** since v4.0.0<br />
+
 #### Default value
 
 ```YAML
@@ -376,6 +385,8 @@ listener_port_template: '{% if item.listener_port is defined %}{{ item.listener_
 
 ### listener_protocols
 
+**_Deprecated:_** since v4.0.0<br />
+
 #### Default value
 
 ```YAML
@@ -396,6 +407,8 @@ The variable is used for shell, command tasks to set environment Variables.
 
 Do not set it in inventory!
 
+**_Deprecated:_** since v4.0.0<br />
+
 #### Default value
 
 ```YAML
@@ -410,6 +423,8 @@ The variable is used for shell, command tasks to set environment Variables.
 
 Do not set it in inventory!
 
+**_Deprecated:_** since v4.0.0<br />
+
 #### Default value
 
 ```YAML
@@ -430,6 +445,8 @@ _IMPORTANT_
 
 Do not set this variable in inventory, set_fact ...!
 
+**_Deprecated:_** since v4.0.0<br />
+
 #### Default value
 
 ```YAML
@@ -499,8 +516,8 @@ oracle_sw_copy: '{% if install_from_nfs %}false{% else %}true{% endif %}'
 #### Default value
 
 ```YAML
-oracle_sw_extract_path: "{%- if '18' in db_version -%}{{ oracle_home_db }}{%- else\
-  \ -%}{{ oracle_stage }}/{{ item[0].version }}{%- endif -%}"
+oracle_sw_extract_path: "{%- if '18' in db_version -%}{{ oracle_home_db }}{%- else
+  -%}{{ oracle_stage }}/{{ item[0].version }}{%- endif -%}"
 ```
 
 ### oracle_sw_unpack
diff --git a/roles/oraswdb_golden_image/README.md b/roles/oraswdb_golden_image/README.md
index d62bf2381..1e60199bd 100644
--- a/roles/oraswdb_golden_image/README.md
+++ b/roles/oraswdb_golden_image/README.md
@@ -19,7 +19,6 @@ Create Golden-Images from Oracle Database Homes and Oracle Grid-Infrastructure/R
 
 - Minimum Ansible version: `2.14.0`
 
-
 ## Default Variables
 
 ### golden_image_dest
diff --git a/roles/oraswdb_install/README.md b/roles/oraswdb_install/README.md
index a958646dc..ef23e7338 100644
--- a/roles/oraswdb_install/README.md
+++ b/roles/oraswdb_install/README.md
@@ -30,7 +30,6 @@ Install Oracle Database Software
 
 - Minimum Ansible version: `2.14.0`
 
-
 ## Default Variables
 
 ### autostartup_service
@@ -132,8 +131,8 @@ hostinitdaemon: '{{ ansible_service_mgr }}'
 #### Default value
 
 ```YAML
-oracle_ee_options: "{{ _oracle_ee_opiton_dict[db_homes_config[dbh.home]['version']]\
-  \ }}"
+oracle_ee_options: "{{ _oracle_ee_opiton_dict[db_homes_config[dbh.home]['version']]
+  }}"
 ```
 
 ### oraswdb_install_forcechopt
diff --git a/roles/oraswdb_manage_patches/README.md b/roles/oraswdb_manage_patches/README.md
index fb2b3f4f0..ba58befa9 100644
--- a/roles/oraswdb_manage_patches/README.md
+++ b/roles/oraswdb_manage_patches/README.md
@@ -18,7 +18,6 @@ Manage Patch Installation in Database ORACLE_HOMEs.
 
 - Minimum Ansible version: `2.14.0`
 
-
 ## Default Variables
 
 ### oraswdb_manage_patches_cleanup_staging
@@ -53,14 +52,6 @@ oraswdb_manage_patches_cleanup_staging: true
 
 **_ocmconfig_**
 
-**_oragridopatchget_**
-
-**_oragridpatchpush_**
-
-**_oragridpatchunpack_**
-
-**_oraswdbpsuunpack1_**
-
 
 ## Dependencies
 
diff --git a/roles/oraswgi_golden_image/README.md b/roles/oraswgi_golden_image/README.md
index e193e2289..c69761206 100644
--- a/roles/oraswgi_golden_image/README.md
+++ b/roles/oraswgi_golden_image/README.md
@@ -20,7 +20,6 @@ Create Golden-Images from Oracle Grid-Infrastructure/Restart
 
 - Minimum Ansible version: `2.14.0`
 
-
 ## Default Variables
 
 ### golden_image_dest
diff --git a/roles/oraswgi_install/README.md b/roles/oraswgi_install/README.md
index 314502315..5c828320a 100644
--- a/roles/oraswgi_install/README.md
+++ b/roles/oraswgi_install/README.md
@@ -40,7 +40,6 @@ This role has a dependency to `orahost_meta` and `orasw_meta` for default parame
 
 - Minimum Ansible version: `2.14.0`
 
-
 ## Default Variables
 
 ### cvuqdisk_rpm
@@ -105,8 +104,8 @@ oracle_asm_init_dg: crs
 #### Default value
 
 ```YAML
-oracle_asm_storage_option: "{% if oracle_install_version_gi is version('12.2', '>=')\
-  \ %}FLEX_ASM_STORAGE{% else %}LOCAL_ASM_STORAGE{% endif %}"
+oracle_asm_storage_option: "{% if oracle_install_version_gi is version('12.2', '>=')
+  %}FLEX_ASM_STORAGE{% else %}LOCAL_ASM_STORAGE{% endif %}"
 ```
 
 ### oracle_cluster_mgmdb
@@ -238,6 +237,8 @@ run_configtoolallcommand: true
 
 ## Discovered Tags
 
+**_always_**
+
 **_asmfd_**
 
 **_crsctl_**
diff --git a/roles/oraswgi_manage_patches/README.md b/roles/oraswgi_manage_patches/README.md
index 96de0a3e2..762cb8305 100644
--- a/roles/oraswgi_manage_patches/README.md
+++ b/roles/oraswgi_manage_patches/README.md
@@ -19,18 +19,10 @@ Install/Remove Patches from Oracle Database Homes
 
 ## Discovered Tags
 
-**_always_**
-
 **_current_opatch_version_**
 
-**_directories_**
-
-**_ocmconfig_**
-
 **_oragridpatchunpack_**
 
-**_oraswdbpsuunpack1_**
-
 
 ## Dependencies
 
diff --git a/roles/oraswgi_meta/README.md b/roles/oraswgi_meta/README.md
index a70a05863..25864af77 100644
--- a/roles/oraswgi_meta/README.md
+++ b/roles/oraswgi_meta/README.md
@@ -34,7 +34,6 @@ There are a lot of variables who are used by `orasw_meta`
 
 - Minimum Ansible version: `2.14.0`
 
-
 ## Default Variables
 
 ### _grid_install_user