diff --git a/.ansible-lint b/.ansible-lint
index 2c5b2a0a3..0d9f85c8a 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -12,6 +12,7 @@ skip_list:
 exclude_paths:
   - .github
   - .ansible
+  - .ansibledoctor.yml
   - example
   - extensions
   - dbhome-conversion
diff --git a/.ansibledoctor.yml b/.ansibledoctor.yml
index 6866acf6d..9e6cac42a 100644
--- a/.ansibledoctor.yml
+++ b/.ansibledoctor.yml
@@ -2,3 +2,6 @@
 logging:
   level: warning
 base_dir: roles
+
+renderer:
+  force_overwrite: True
diff --git a/.envrc b/.envrc
new file mode 100644
index 000000000..6a85b18aa
--- /dev/null
+++ b/.envrc
@@ -0,0 +1,9 @@
+# shellcheck disable=SC2148
+
+# Performance improvement for direnv with nix together
+if ! has nix_direnv_version || ! nix_direnv_version 3.0.6; then
+  source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.6/direnvrc" "sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM="
+fi
+
+use nix
+direnv allow
diff --git a/.github/workflows/ansible-doctor.yml b/.github/workflows/ansible-doctor.yml
index 86bf932d7..80a814f28 100644
--- a/.github/workflows/ansible-doctor.yml
+++ b/.github/workflows/ansible-doctor.yml
@@ -17,18 +17,18 @@ jobs:
       - name: git clone
         uses: actions/checkout@v3
 
-      - name: Python 3.11
+      - name: Python 3.13
         uses: actions/setup-python@v2
         with:
-          python-version: 3.11
+          python-version: 3.13
 
       - name: Install ansible-doctor
         run: |
-          python -m pip install ansible-doctor==4.0.1 ansible-core==2.16.2
+          python -m pip install -r tools/dev/requirements_doctor.txt
 
       - name: ansible-doctor test
         run: |
-          ansible-doctor --force --no-role-detection --recursive roles
+          ansible-doctor --force --recursive
 
       - name: git diff of ansible-doctor
         run: git diff --exit-code
diff --git a/.github/workflows/ansible-lint.yml b/.github/workflows/ansible-lint.yml
index 4f4a92880..510b1745e 100644
--- a/.github/workflows/ansible-lint.yml
+++ b/.github/workflows/ansible-lint.yml
@@ -18,4 +18,4 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Run ansible-lint
-        uses: ansible/ansible-lint@v24.7.0
+        uses: ansible/ansible-lint@v25.2.1
diff --git a/.gitignore b/.gitignore
index a78875a17..879ab676d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@ example/*/ansible/context
 ansible-navigator.log
 navigator/replay/*json
 .ansible
+.venv
+.direnv
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ecfd3296a..477ce12f2 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -3,7 +3,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
         exclude: ^roles/.*/README.md
@@ -42,15 +42,15 @@ repos:
       - id: antsibull-changelog-lint
 
   - repo: https://github.com/thegeeklab/ansible-doctor
-    rev: v4.0.1
+    rev: v7.0.5
     hooks:
       - id: ansible-doctor
-        entry: ansible-doctor --force --no-role-detection --recursive roles
+        entry: ansible-doctor --force --recursive
         additional_dependencies:
           - ansible-core
 
   - repo: https://github.com/ansible-community/ansible-lint.git
-    rev: v24.7.0
+    rev: v25.2.1
     hooks:
       - id: ansible-lint
         entry: ansible-lint --force-color -p
diff --git a/changelogs/fragments/nix-doctor-lint.yml b/changelogs/fragments/nix-doctor-lint.yml
new file mode 100644
index 000000000..51bc11c53
--- /dev/null
+++ b/changelogs/fragments/nix-doctor-lint.yml
@@ -0,0 +1,8 @@
+---
+minor_changes:
+  - "nix: Adding direnv and nix configuration for easy setup of dev environment via nix-shell (oravirt#516)"
+  - "Upgrade ansible-doctor 6.0.5 and pre-commit (oravirt#516)"
+  - "ansible-lint upgrade to 25.2.1 (oravirt#516)"
+
+security_fixes:
+  - "ansible-core: Upgrade versions due to security alerts from dependbot (oravirt#516)"
diff --git a/changelogs/fragments/oradb_tzupgrade_pdbs.yml b/changelogs/fragments/oradb_tzupgrade_pdbs.yml
new file mode 100644
index 000000000..1e41acbe5
--- /dev/null
+++ b/changelogs/fragments/oradb_tzupgrade_pdbs.yml
@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - "oradb_tzupgrade_pdbs: compose the list of PDBs in Ansible"
diff --git a/roles/common/.ansibledoctor.yml b/roles/common/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/common/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/common/README.md b/roles/common/README.md
index bf4b7e9ba..3d5c6106b 100644
--- a/roles/common/README.md
+++ b/roles/common/README.md
@@ -406,7 +406,6 @@ ol7_repo_file: public-yum-ol7.repo
 
 **_olrepo_**
 
-
 ## Dependencies
 
 - global_handlers
diff --git a/roles/cxoracle/.ansibledoctor.yml b/roles/cxoracle/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/cxoracle/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/cxoracle/README.md b/roles/cxoracle/README.md
index 46f22fd1d..d718f9aa0 100644
--- a/roles/cxoracle/README.md
+++ b/roles/cxoracle/README.md
@@ -87,7 +87,6 @@ use_proxy: false
 
 **_cx_oracle_**
 
-
 ## Dependencies
 
 None.
diff --git a/roles/global_handlers/.ansibledoctor.yml b/roles/global_handlers/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/global_handlers/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/global_handlers/README.md b/roles/global_handlers/README.md
index 4d1ce59ee..43bb78efe 100644
--- a/roles/global_handlers/README.md
+++ b/roles/global_handlers/README.md
@@ -35,8 +35,6 @@ or just displays a reboot advice (false)
 restart_on_requirement: false
 ```
 
-
-
 ## Dependencies
 
 None.
diff --git a/roles/global_handlers/tasks/.gitkeep b/roles/global_handlers/tasks/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/roles/oraapex/.ansibledoctor.yml b/roles/oraapex/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/oraapex/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/oraapex/README.md b/roles/oraapex/README.md
index 5c6ca4403..604cfd2f1 100644
--- a/roles/oraapex/README.md
+++ b/roles/oraapex/README.md
@@ -99,7 +99,6 @@ unarchive apex.zip in RAC only on 1st node or on all nodes?
 This is only true, when ORDS runs on RAC nodes as well, because we need
 the images for ORDS. This should not be done on production setups!
 
-
 ## Open Tasks
 
 - (information): oraapex_rac_primary_only not implemented yet.
diff --git a/roles/oraasm_manage_diskgroups/.ansibledoctor.yml b/roles/oraasm_manage_diskgroups/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/oraasm_manage_diskgroups/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/oraasm_manage_diskgroups/README.md b/roles/oraasm_manage_diskgroups/README.md
index 315fa4ef6..838bc92f3 100644
--- a/roles/oraasm_manage_diskgroups/README.md
+++ b/roles/oraasm_manage_diskgroups/README.md
@@ -26,7 +26,6 @@ Do not set them in inventory!
 
 **_diskgroup_**
 
-
 ## Dependencies
 
 - orasw_meta
diff --git a/roles/oracluvfy/.ansibledoctor.yml b/roles/oracluvfy/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/oracluvfy/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/oracluvfy/README.md b/roles/oracluvfy/README.md
index 5a6620709..8c219c032 100644
--- a/roles/oracluvfy/README.md
+++ b/roles/oracluvfy/README.md
@@ -56,7 +56,6 @@ oracluvfy_home: '{{ oracle_base }}/product/cluvfy'
 
 **_assert_**
 
-
 ## Dependencies
 
 - orasw_meta
diff --git a/roles/oradb_datapatch/.ansibledoctor.yml b/roles/oradb_datapatch/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/oradb_datapatch/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/oradb_manage_db/.ansibledoctor.yml b/roles/oradb_manage_db/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/oradb_manage_db/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/oradb_manage_grants/.ansibledoctor.yml b/roles/oradb_manage_grants/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/oradb_manage_grants/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/oradb_manage_grants/README.md b/roles/oradb_manage_grants/README.md
index 98cc73321..dc409dd0f 100644
--- a/roles/oradb_manage_grants/README.md
+++ b/roles/oradb_manage_grants/README.md
@@ -27,7 +27,6 @@ Manage grants for users in Oracle Databases
 
 **_users_**
 
-
 ## Dependencies
 
 - orasw_meta
diff --git a/roles/oradb_manage_parameters/.ansibledoctor.yml b/roles/oradb_manage_parameters/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/oradb_manage_parameters/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/oradb_manage_parameters/README.md b/roles/oradb_manage_parameters/README.md
index ee1787b51..30f7356a8 100644
--- a/roles/oradb_manage_parameters/README.md
+++ b/roles/oradb_manage_parameters/README.md
@@ -50,7 +50,6 @@ restart_spparameter_changed: false
 **_spfile_bounce_**\
  Bounce database when changed parameter need a restart.
 
-
 ## Dependencies
 
 - orasw_meta
diff --git a/roles/oradb_manage_pdb/.ansibledoctor.yml b/roles/oradb_manage_pdb/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/oradb_manage_pdb/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/oradb_manage_pdb/README.md b/roles/oradb_manage_pdb/README.md
index b8b2a5fca..825b60a21 100644
--- a/roles/oradb_manage_pdb/README.md
+++ b/roles/oradb_manage_pdb/README.md
@@ -50,7 +50,6 @@ pdbadmin_user: >-
 
 **_pdb_**
 
-
 ## Dependencies
 
 - orasw_meta
diff --git a/roles/oradb_manage_profiles/.ansibledoctor.yml b/roles/oradb_manage_profiles/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/oradb_manage_profiles/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/oradb_manage_profiles/README.md b/roles/oradb_manage_profiles/README.md
index dedcaa9e8..6d30c4137 100644
--- a/roles/oradb_manage_profiles/README.md
+++ b/roles/oradb_manage_profiles/README.md
@@ -21,7 +21,6 @@ Manage database profiles in Oracle
 
 **_dbprofiles_**
 
-
 ## Dependencies
 
 - orasw_meta
diff --git a/roles/oradb_manage_redo/.ansibledoctor.yml b/roles/oradb_manage_redo/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/oradb_manage_redo/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/oradb_manage_roles/.ansibledoctor.yml b/roles/oradb_manage_roles/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/oradb_manage_roles/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/oradb_manage_roles/README.md b/roles/oradb_manage_roles/README.md
index de7d9bb45..cd5c392d0 100644
--- a/roles/oradb_manage_roles/README.md
+++ b/roles/oradb_manage_roles/README.md
@@ -23,7 +23,6 @@ Manage roles in Oracle
 
 **_users_**
 
-
 ## Dependencies
 
 - orasw_meta
diff --git a/roles/oradb_manage_services/.ansibledoctor.yml b/roles/oradb_manage_services/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/oradb_manage_services/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/oradb_manage_statspack/.ansibledoctor.yml b/roles/oradb_manage_statspack/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/oradb_manage_statspack/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/oradb_manage_statspack/README.md b/roles/oradb_manage_statspack/README.md
index 68eb539ca..e0acf2ff3 100644
--- a/roles/oradb_manage_statspack/README.md
+++ b/roles/oradb_manage_statspack/README.md
@@ -87,7 +87,6 @@ snaplevel: 7
 **_statspack_**\
  Do all Tasks for Statspack
 
-
 ## Dependencies
 
 - orasw_meta
diff --git a/roles/oradb_manage_tablespace/.ansibledoctor.yml b/roles/oradb_manage_tablespace/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/oradb_manage_tablespace/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/oradb_manage_tablespace/README.md b/roles/oradb_manage_tablespace/README.md
index 095fcbb75..3f7038150 100644
--- a/roles/oradb_manage_tablespace/README.md
+++ b/roles/oradb_manage_tablespace/README.md
@@ -21,7 +21,6 @@ Manage Tablespaces in Oracle
 
 **_tablespace_**
 
-
 ## Dependencies
 
 - orasw_meta
diff --git a/roles/oradb_manage_users/.ansibledoctor.yml b/roles/oradb_manage_users/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/oradb_manage_users/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/oradb_manage_users/README.md b/roles/oradb_manage_users/README.md
index e958f80fe..c5764abc4 100644
--- a/roles/oradb_manage_users/README.md
+++ b/roles/oradb_manage_users/README.md
@@ -21,7 +21,6 @@ Manage Users in Oracle
 
 **_users_**
 
-
 ## Dependencies
 
 - orasw_meta
diff --git a/roles/oradb_manage_wallet/.ansibledoctor.yml b/roles/oradb_manage_wallet/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/oradb_manage_wallet/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/oradb_manage_wallet/README.md b/roles/oradb_manage_wallet/README.md
index 64731291a..ab3834174 100644
--- a/roles/oradb_manage_wallet/README.md
+++ b/roles/oradb_manage_wallet/README.md
@@ -78,7 +78,6 @@ oracle_wallet_show_password: false
 
 **_always_**
 
-
 ## Dependencies
 
 - orasw_meta
diff --git a/roles/oradb_rman/.ansibledoctor.yml b/roles/oradb_rman/.ansibledoctor.yml
deleted file mode 100644
index 9957edc01..000000000
--- a/roles/oradb_rman/.ansibledoctor.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
-role_detection: true
diff --git a/roles/oradb_rman/README.md b/roles/oradb_rman/README.md
index 8c25a9ef5..c9bf71f50 100644
--- a/roles/oradb_rman/README.md
+++ b/roles/oradb_rman/README.md
@@ -211,7 +211,6 @@ oradb_rman_wallet_password: "{{ rman_wallet_password | default('oracleWallet1')
 
 **_wallet_contents_**
 
-
 ## Dependencies
 
 - orasw_meta
diff --git a/roles/oradb_tzupgrade/.ansibledoctor.yml b/roles/oradb_tzupgrade/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/oradb_tzupgrade/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/oradb_tzupgrade/README.md b/roles/oradb_tzupgrade/README.md
index 68a5eccef..84345b9ff 100644
--- a/roles/oradb_tzupgrade/README.md
+++ b/roles/oradb_tzupgrade/README.md
@@ -16,8 +16,6 @@ Manage timezone upgrades for an Oracle Database
 - Minimum Ansible version: `2.14.0`
 
 
-
-
 ## Dependencies
 
 - orahost_meta
diff --git a/roles/oradb_tzupgrade/tasks/cdb.yml b/roles/oradb_tzupgrade/tasks/cdb.yml
index 9fbabcb80..a84a37da0 100644
--- a/roles/oradb_tzupgrade/tasks/cdb.yml
+++ b/roles/oradb_tzupgrade/tasks/cdb.yml
@@ -1,5 +1,5 @@
 ---
-- name: oradb_tzupgrade | Perform timezone checks for CDB$ROOT and PDB$SEED first
+- name: cdb | Perform timezone checks for CDB$ROOT and PDB$SEED first
   opitzconsulting.ansible_oracle.oracle_sqldba:
     catcon_pl: "{{ _oracle_home_db }}/rdbms/admin/utltz_upg_check.sql"
     creates_sql: "{{ _oradb_tzupgrade_tz_check_query }}"
@@ -10,7 +10,7 @@
   become_user: "{{ oracle_user }}"
   become: true
 
-- name: oradb_tzupgrade | Upgrade timezone for CDB$ROOT and PDB$SEED
+- name: cdb | Upgrade timezone for CDB$ROOT and PDB$SEED
   opitzconsulting.ansible_oracle.oracle_sqldba:
     catcon_pl: "{{ _oracle_home_db }}/rdbms/admin/utltz_upg_apply.sql"
     creates_sql: "{{ _oradb_tzupgrade_tz_check_query }}"
@@ -21,10 +21,10 @@
   become_user: "{{ oracle_user }}"
   become: true
 
-- name: oradb_tzupgrade | Get all open PDBs
+- name: cdb | Get all open PDBs
   opitzconsulting.ansible_oracle.oracle_sqldba:
     sqlselect: >-
-      select listagg(name, ' ') within group (order by name) pdb_list
+      select name pdb_list
       from v$pdbs
       where open_mode in ('READ WRITE', 'MIGRATE')
     oracle_home: "{{ _oracle_home_db }}"
@@ -33,19 +33,19 @@
   become: true
   register: pdbs_info
 
-- name: oradb_tzupgrade | Set facts for pdbs_info
+- name: cdb | Set facts for pdbs_info
   ansible.builtin.set_fact:
-    _oradb_tzupgrade_candidate_pdbs: "{{ pdbs_info.state.ROW[0].PDB_LIST | default('') }}"
+    _oradb_tzupgrade_candidate_pdbs: "{{ pdbs_info.state.ROW | map(attribute='PDB_LIST') | list | join(' ') }}"
 
-- name: oradb_tzupgrade | Show facts for pdbs_info
+- name: cdb | Show facts for pdbs_info
   ansible.builtin.debug:
     msg: "Candidate PDBs: {{ _oradb_tzupgrade_candidate_pdbs }}"
 
-- name: oradb_tzupgrade | Upgrade timezone
+- name: cdb | Upgrade timezone
   when: _oradb_tzupgrade_candidate_pdbs != ""
   block:
 
-    - name: oradb_tzupgrade | Perform timezone checks for the candidate PDBs
+    - name: cdb | Perform timezone checks for the candidate PDBs
       opitzconsulting.ansible_oracle.oracle_sqldba:
         catcon_pl: "{{ _oracle_home_db }}/rdbms/admin/utltz_upg_check.sql"
         creates_sql: "{{ _oradb_tzupgrade_tz_check_query }}"
@@ -56,7 +56,7 @@
       become_user: "{{ oracle_user }}"
       become: true
 
-    - name: oradb_tzupgrade | Upgrade timezone for the candidate PDBs
+    - name: cdb | Upgrade timezone for the candidate PDBs
       opitzconsulting.ansible_oracle.oracle_sqldba:
         catcon_pl: "{{ _oracle_home_db }}/rdbms/admin/utltz_upg_apply.sql"
         creates_sql: "{{ _oradb_tzupgrade_tz_check_query }}"
@@ -67,7 +67,7 @@
       become_user: "{{ oracle_user }}"
       become: true
 
-- name: oradb_tzupgrade | Get post upgrade timezone status info
+- name: cdb | Get post upgrade timezone status info
   opitzconsulting.ansible_oracle.oracle_sqldba:
     sql: |
       set tab off
@@ -91,6 +91,6 @@
   changed_when: false
   register: post_status_info
 
-- name: oradb_tzupgrade | Show post upgrade timezone status info
+- name: cdb | Show post upgrade timezone status info
   ansible.builtin.debug:
     msg: "{{ post_status_info.msg | split('\n') }}"
diff --git a/roles/oradb_tzupgrade/tasks/main.yml b/roles/oradb_tzupgrade/tasks/main.yml
index f9eb21f44..aee133263 100644
--- a/roles/oradb_tzupgrade/tasks/main.yml
+++ b/roles/oradb_tzupgrade/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-- name: oradb_tzupgrade | Loop over oracle_databases
+- name: Loop over oracle_databases
   ansible.builtin.include_tasks: >-
     {{ odb.is_container | default(false) | ternary('cdb', 'non_cdb') }}.yml
   with_items:
diff --git a/roles/oradb_tzupgrade/tasks/non_cdb.yml b/roles/oradb_tzupgrade/tasks/non_cdb.yml
index 569b57a5d..a540e2cc3 100644
--- a/roles/oradb_tzupgrade/tasks/non_cdb.yml
+++ b/roles/oradb_tzupgrade/tasks/non_cdb.yml
@@ -1,5 +1,5 @@
 ---
-- name: oradb_tzupgrade | Perform timezone checks for a non-CDB database
+- name: non_cdb | Perform timezone checks for a non-CDB database
   opitzconsulting.ansible_oracle.oracle_sqldba:
     sql: "@?/rdbms/admin/utltz_upg_check.sql"
     creates_sql: "{{ _oradb_tzupgrade_tz_check_query }}"
@@ -8,7 +8,7 @@
   become: true
   become_user: "{{ oracle_user }}"
 
-- name: oradb_tzupgrade | Apply the timezone upgrade for the non-CDB database
+- name: non_cdb | Apply the timezone upgrade for the non-CDB database
   opitzconsulting.ansible_oracle.oracle_sqldba:
     sql: "@?/rdbms/admin/utltz_upg_apply.sql"
     creates_sql: "{{ _oradb_tzupgrade_tz_check_query }}"
@@ -17,7 +17,7 @@
   become: true
   become_user: "{{ oracle_user }}"
 
-- name: oradb_tzupgrade | Get post upgrade timezone status info
+- name: non_cdb | Get post upgrade timezone status info
   opitzconsulting.ansible_oracle.oracle_sqldba:
     sql: |
       set lines 200
@@ -35,6 +35,6 @@
   changed_when: false
   register: post_status_info
 
-- name: oradb_tzupgrade | Show post upgrade timezone status info
+- name: non_cdb | Show post upgrade timezone status info
   ansible.builtin.debug:
     msg: "{{ post_status_info.msg | split('\n') }}"
diff --git a/roles/orahost/.ansibledoctor.yml b/roles/orahost/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/orahost/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/orahost_cron/.ansibledoctor.yml b/roles/orahost_cron/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/orahost_cron/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/orahost_cron/README.md b/roles/orahost_cron/README.md
index 13896aa44..c0ea71332 100644
--- a/roles/orahost_cron/README.md
+++ b/roles/orahost_cron/README.md
@@ -36,7 +36,6 @@ cron_config:
 
 **_cron_**
 
-
 ## Dependencies
 
 None.
diff --git a/roles/orahost_logrotate/.ansibledoctor.yml b/roles/orahost_logrotate/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/orahost_logrotate/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/orahost_logrotate/README.md b/roles/orahost_logrotate/README.md
index d7e33ec39..93697c2ba 100644
--- a/roles/orahost_logrotate/README.md
+++ b/roles/orahost_logrotate/README.md
@@ -118,7 +118,6 @@ Setup of logrotate/cleanup is optional
 orahost_logrotate_setup_logrotate: true
 ```
 
-
 ## Open Tasks
 
 - (bug): oracle_home_gi variables require a central meta role
diff --git a/roles/orahost_meta/.ansibledoctor.yml b/roles/orahost_meta/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/orahost_meta/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/orahost_meta/README.md b/roles/orahost_meta/README.md
index b8df26f3a..fc8053471 100644
--- a/roles/orahost_meta/README.md
+++ b/roles/orahost_meta/README.md
@@ -411,7 +411,6 @@ sysctl_kernel_sem_force: false
 
 **_molecule-notest_**
 
-
 ## Dependencies
 
 - oraswgi_meta
diff --git a/roles/orahost_ssh/.ansibledoctor.yml b/roles/orahost_ssh/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/orahost_ssh/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/orahost_ssh/README.md b/roles/orahost_ssh/README.md
index c4c3b0239..ea76d93e7 100644
--- a/roles/orahost_ssh/README.md
+++ b/roles/orahost_ssh/README.md
@@ -33,8 +33,6 @@ Example for oracle:
 orahost_ssh_keyname: id_ed25519
 ```
 
-
-
 ## Dependencies
 
 - orahost_meta
diff --git a/roles/orahost_storage/.ansibledoctor.yml b/roles/orahost_storage/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/orahost_storage/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/oraords/.ansibledoctor.yml b/roles/oraords/.ansibledoctor.yml
deleted file mode 100644
index 2c499bf65..000000000
--- a/roles/oraords/.ansibledoctor.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
-exclude_tags:
-  - always
-  - never
diff --git a/roles/oraords/README.md b/roles/oraords/README.md
index 49d0357c8..dcb966e82 100644
--- a/roles/oraords/README.md
+++ b/roles/oraords/README.md
@@ -135,8 +135,9 @@ APEX context path for Images.
 
 ## Discovered Tags
 
-**_ords_config_**
+**_always_**
 
+**_ords_config_**
 
 ## Dependencies
 
diff --git a/roles/orasw_download_patches/.ansibledoctor.yml b/roles/orasw_download_patches/.ansibledoctor.yml
deleted file mode 100644
index 2c499bf65..000000000
--- a/roles/orasw_download_patches/.ansibledoctor.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
-exclude_tags:
-  - always
-  - never
diff --git a/roles/orasw_download_patches/README.md b/roles/orasw_download_patches/README.md
index 98ba22b75..fe71b9466 100644
--- a/roles/orasw_download_patches/README.md
+++ b/roles/orasw_download_patches/README.md
@@ -133,8 +133,6 @@ Enable Proxy for Download
 use_proxy: false
 ```
 
-
-
 ## Dependencies
 
 - orasw_meta
diff --git a/roles/orasw_meta/.ansibledoctor.yml b/roles/orasw_meta/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/orasw_meta/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/orasw_meta_internal/.ansibledoctor.yml b/roles/orasw_meta_internal/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/orasw_meta_internal/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/orasw_meta_internal/README.md b/roles/orasw_meta_internal/README.md
index 7ee6fdbc5..e4afac0ba 100644
--- a/roles/orasw_meta_internal/README.md
+++ b/roles/orasw_meta_internal/README.md
@@ -541,8 +541,6 @@ oracle_sw_extract_path: "{%- if '18' in db_version -%}{{ oracle_home_db }}{%- el
 oracle_sw_unpack: '{% if install_from_nfs %}false{% else %}true{% endif %}'
 ```
 
-
-
 ## Dependencies
 
 None.
diff --git a/roles/oraswahf_install/.ansibledoctor.yml b/roles/oraswahf_install/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/oraswahf_install/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/oraswahf_install/README.md b/roles/oraswahf_install/README.md
index 7806d2198..128cd126f 100644
--- a/roles/oraswahf_install/README.md
+++ b/roles/oraswahf_install/README.md
@@ -16,8 +16,6 @@ Install Oracle Autonomous Health Framework
 - Minimum Ansible version: `2.14.0`
 
 
-
-
 ## Dependencies
 
 - orasw_meta
diff --git a/roles/oraswdb_golden_image/.ansibledoctor.yml b/roles/oraswdb_golden_image/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/oraswdb_golden_image/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/oraswdb_golden_image/README.md b/roles/oraswdb_golden_image/README.md
index 1e60199bd..5dff3f70a 100644
--- a/roles/oraswdb_golden_image/README.md
+++ b/roles/oraswdb_golden_image/README.md
@@ -43,7 +43,6 @@ oraswdb_golden_image_create: false
 
 **_golden_image_db_**
 
-
 ## Dependencies
 
 - orasw_meta
diff --git a/roles/oraswdb_install/.ansibledoctor.yml b/roles/oraswdb_install/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/oraswdb_install/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/oraswdb_manage_patches/.ansibledoctor.yml b/roles/oraswdb_manage_patches/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/oraswdb_manage_patches/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/oraswdb_manage_patches/README.md b/roles/oraswdb_manage_patches/README.md
index ab9517af2..0505ae389 100644
--- a/roles/oraswdb_manage_patches/README.md
+++ b/roles/oraswdb_manage_patches/README.md
@@ -64,7 +64,6 @@ oraswdb_manage_patches_force_opatch_upgrade: false
 
 **_ocmconfig_**
 
-
 ## Dependencies
 
 - orasw_meta
diff --git a/roles/oraswgi_golden_image/.ansibledoctor.yml b/roles/oraswgi_golden_image/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/oraswgi_golden_image/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/oraswgi_golden_image/README.md b/roles/oraswgi_golden_image/README.md
index c69761206..5bb33ec19 100644
--- a/roles/oraswgi_golden_image/README.md
+++ b/roles/oraswgi_golden_image/README.md
@@ -57,7 +57,6 @@ oraswgi_golden_image_filename: >-
 
 **_golden_image_gi_**
 
-
 ## Dependencies
 
 - orasw_meta
diff --git a/roles/oraswgi_install/.ansibledoctor.yml b/roles/oraswgi_install/.ansibledoctor.yml
deleted file mode 100644
index 2c499bf65..000000000
--- a/roles/oraswgi_install/.ansibledoctor.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
-exclude_tags:
-  - always
-  - never
diff --git a/roles/oraswgi_manage_patches/.ansibledoctor.yml b/roles/oraswgi_manage_patches/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/oraswgi_manage_patches/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/oraswgi_manage_patches/README.md b/roles/oraswgi_manage_patches/README.md
index a1df85d3a..de5d9f311 100644
--- a/roles/oraswgi_manage_patches/README.md
+++ b/roles/oraswgi_manage_patches/README.md
@@ -25,7 +25,6 @@ Install/Remove Patches from Oracle Database Homes
 
 **_current_opatch_version_**
 
-
 ## Dependencies
 
 - orahost_meta
diff --git a/roles/oraswgi_meta/.ansibledoctor.yml b/roles/oraswgi_meta/.ansibledoctor.yml
deleted file mode 100644
index 30b441754..000000000
--- a/roles/oraswgi_meta/.ansibledoctor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-logging:
-  level: warning
-template: readme
-force_overwrite: true
diff --git a/roles/oraswgi_meta/README.md b/roles/oraswgi_meta/README.md
index 1137db2b2..3af303704 100644
--- a/roles/oraswgi_meta/README.md
+++ b/roles/oraswgi_meta/README.md
@@ -146,7 +146,6 @@ sysasmpassword: '{{ default_gipass }}'
 
 **_assert_ansible_oracle_**
 
-
 ## Dependencies
 
 None.
diff --git a/shell.nix b/shell.nix
new file mode 100644
index 000000000..f20945979
--- /dev/null
+++ b/shell.nix
@@ -0,0 +1,35 @@
+{ pkgs ? import <nixpkgs> {} }:
+
+pkgs.mkShell {
+  buildInputs = [
+    pkgs.python313
+    pkgs.shellcheck
+    pkgs.tig
+    pkgs.ncdu
+  ];
+
+  shellHook = ''
+    venv_dir=.venv/ansible-doctor
+    if [ ! -d $venv_dir ]; then
+      python -m venv $venv_dir
+      $venv_dir/bin/pip install --upgrade pip
+      $venv_dir/bin/pip --require-virtualenv  install -r tools/dev/requirements_doctor.txt
+    fi
+
+    venv_dir=.venv/antsibull
+    if [ ! -d $venv_dir ]; then
+      python -m venv $venv_dir
+      $venv_dir/bin/pip install --upgrade pip
+      $venv_dir/bin/pip --require-virtualenv  install -r tools/dev/requirements_antsibull.txt
+    fi
+
+    # 1st .venv dir for ansible-navigator etc.
+    venv_dir=.venv/ansible-oracle
+    if [ ! -d $venv_dir ]; then
+      python -m venv $venv_dir
+      $venv_dir/bin/pip install --upgrade pip
+      $venv_dir/bin/pip --require-virtualenv  install -r tools/dev/requirements_dev.txt
+    fi
+    . $venv_dir/bin/activate
+  '';
+}
diff --git a/tools/dev/requirements_antsibull.txt b/tools/dev/requirements_antsibull.txt
index 7db30ccc9..ddaddedac 100644
--- a/tools/dev/requirements_antsibull.txt
+++ b/tools/dev/requirements_antsibull.txt
@@ -14,5 +14,5 @@
 # older version of ansible is needed for ansible-oracle
 # otherwise the ansible-doc gets errors due to problems with ansible-oracle-modules
 # They need some refactoring...
-ansible-core==2.15.9
+ansible-core<2.18
 antsibull-changelog==0.29.0
diff --git a/tools/dev/requirements_dev.txt b/tools/dev/requirements_dev.txt
index ab655e7c3..9f710b529 100644
--- a/tools/dev/requirements_dev.txt
+++ b/tools/dev/requirements_dev.txt
@@ -12,10 +12,10 @@
 # . ~/venv/ansible-oracle/bin/activate
 # pip --require-virtualenv -v install -r tools/dev/requirements_dev.txt
 #
-ansible-core<2.17
+ansible-core==2.17.7
 ansible-builder==3.1.0
-ansible-lint==24.7.0
-ansible-navigator==24.8.0
+ansible-lint==25.2.1
+ansible-navigator==25.4.0
 pre-commit==3.4.0
 
 # docker is needed by molecule
diff --git a/tools/dev/requirements_doctor.txt b/tools/dev/requirements_doctor.txt
index da8c8a339..43428a012 100644
--- a/tools/dev/requirements_doctor.txt
+++ b/tools/dev/requirements_doctor.txt
@@ -15,4 +15,5 @@
 # execute ansible-doctor:
 # ~/venv/ansible-doctor/bin/ansible-doctor
 #
-ansible-doctor==4.0.1
+ansible-doctor==7.0.5
+ansible-core==2.18.5