diff --git a/.ansible-lint b/.ansible-lint
index 21b29859..1dbba4a8 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -30,9 +30,8 @@ skip_list:
   - no-handler
   # Disable jinja formatting check
   - jinja[spacing]
-
-  # Disabled skips, because they are not not required now.
-  # - yaml[comments]
-  # - yaml[line-length]
-  # - no-tabs
+  # Removing these skips would require refactoring of most roles
+  - yaml[comments]
+  - yaml[line-length]
+  - no-tabs
   # - var-naming[no-jinja]
diff --git a/.github/workflows/ansible-lint-sap_hypervisor_node_preconfigure.yml b/.github/workflows/ansible-lint-sap_hypervisor_node_preconfigure.yml
index bafd47dc..3485dabc 100644
--- a/.github/workflows/ansible-lint-sap_hypervisor_node_preconfigure.yml
+++ b/.github/workflows/ansible-lint-sap_hypervisor_node_preconfigure.yml
@@ -18,25 +18,28 @@ on:
     paths:
       - 'roles/sap_hypervisor_node_preconfigure/**'
 
+  workflow_dispatch:
+
 jobs:
   ansible-lint:
     runs-on: ubuntu-latest
 
     steps:
       - name: Check out the code
-        uses: actions/checkout@main
+        uses: actions/checkout@v4
 
       - name: Set up Python 3
-        uses: actions/setup-python@main
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.9'
+          python-version: '3.13'
 
       - name: Install test dependencies
         run: |
-          pip3 install ansible==7.5.0
-          pip3 install ansible-compat==3.0.2
-          pip3 install ansible-core==2.14.5
-          pip3 install ansible-lint==6.8.6
+          pip3 install \
+            ansible-core~=2.18.0 \
+            ansible~=11.0.0 \
+            ansible-lint~=25.1.0 \
+            ansible-compat~=25.1.0
 
       - name: Run ansible-lint
         working-directory: /home/runner/work/community.sap_infrastructure/community.sap_infrastructure/roles/sap_hypervisor_node_preconfigure
diff --git a/.github/workflows/ansible-lint-sap_vm_preconfigure.yml b/.github/workflows/ansible-lint-sap_vm_preconfigure.yml
index 1470dd0d..73813f50 100644
--- a/.github/workflows/ansible-lint-sap_vm_preconfigure.yml
+++ b/.github/workflows/ansible-lint-sap_vm_preconfigure.yml
@@ -18,25 +18,28 @@ on:
     paths:
       - 'roles/sap_vm_preconfigure/**'
 
+  workflow_dispatch:
+
 jobs:
   ansible-lint:
     runs-on: ubuntu-latest
 
     steps:
       - name: Check out the code
-        uses: actions/checkout@main
+        uses: actions/checkout@v4
 
       - name: Set up Python 3
-        uses: actions/setup-python@main
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.12'
+          python-version: '3.13'
 
       - name: Install test dependencies
         run: |
-          pip3 install ansible==9.1.0
-          pip3 install ansible-compat==4.1.10
-          pip3 install ansible-core==2.16.2
-          pip3 install ansible-lint==6.22.1
+          pip3 install \
+            ansible-core~=2.18.0 \
+            ansible~=11.0.0 \
+            ansible-lint~=25.1.0 \
+            ansible-compat~=25.1.0
 
       - name: Run ansible-lint
         working-directory: /home/runner/work/community.sap_infrastructure/community.sap_infrastructure/roles/sap_vm_preconfigure
diff --git a/.github/workflows/ansible-lint-sap_vm_provision.yml b/.github/workflows/ansible-lint-sap_vm_provision.yml
index 10b8e85a..a3b9e9a7 100644
--- a/.github/workflows/ansible-lint-sap_vm_provision.yml
+++ b/.github/workflows/ansible-lint-sap_vm_provision.yml
@@ -31,15 +31,16 @@ jobs:
       - name: Set up Python 3
         uses: actions/setup-python@v5
         with:
-          python-version: '3.12'
+          python-version: '3.13'
 
       - name: Install test dependencies
         run: |
-          pip3 install ansible==9.1.0
-          pip3 install ansible-compat==4.1.10
-          pip3 install ansible-core==2.16.2
-          pip3 install ansible-lint==6.22.1
-          pip3 install jmespath==1.0.1
+          pip3 install \
+            ansible-core~=2.18.0 \
+            ansible~=11.0.0 \
+            ansible-lint~=25.1.0 \
+            ansible-compat~=25.1.0 \
+            jmespath~=1.0.0
 
       - name: Install dependencies for Ansible
         run: ansible-galaxy collection install -r /home/runner/work/community.sap_infrastructure/community.sap_infrastructure/requirements.yml
diff --git a/.github/workflows/ansible-lint-sap_vm_temp_vip.yml b/.github/workflows/ansible-lint-sap_vm_temp_vip.yml
index f4603f56..c1874f8f 100644
--- a/.github/workflows/ansible-lint-sap_vm_temp_vip.yml
+++ b/.github/workflows/ansible-lint-sap_vm_temp_vip.yml
@@ -31,14 +31,15 @@ jobs:
       - name: Set up Python 3
         uses: actions/setup-python@v5
         with:
-          python-version: '3.12'
+          python-version: '3.13'
 
       - name: Install test dependencies
         run: |
-          pip3 install ansible==9.1.0
-          pip3 install ansible-compat==4.1.10
-          pip3 install ansible-core==2.16.2
-          pip3 install ansible-lint==6.22.1
+          pip3 install \
+            ansible-core~=2.18.0 \
+            ansible~=11.0.0 \
+            ansible-lint~=25.1.0 \
+            ansible-compat~=25.1.0
 
       - name: Run ansible-lint
         working-directory: /home/runner/work/community.sap_infrastructure/community.sap_infrastructure/roles/sap_vm_temp_vip
diff --git a/.github/workflows/ansible-lint-sap_vm_verify.yml b/.github/workflows/ansible-lint-sap_vm_verify.yml
index 2e279dce..f1ce5ee8 100644
--- a/.github/workflows/ansible-lint-sap_vm_verify.yml
+++ b/.github/workflows/ansible-lint-sap_vm_verify.yml
@@ -31,15 +31,15 @@ jobs:
       - name: Set up Python 3
         uses: actions/setup-python@v5
         with:
-          python-version: '3.12'
+          python-version: '3.13'
 
       - name: Install test dependencies
         run: |
-          pip3 install ansible==9.1.0
-          pip3 install ansible-compat==4.1.10
-          pip3 install ansible-core==2.16.2
-          pip3 install ansible-lint==6.22.1
-          pip3 install jmespath==1.0.1
+          pip3 install \
+            ansible-core~=2.18.0 \
+            ansible~=11.0.0 \
+            ansible-lint~=25.1.0 \
+            ansible-compat~=25.1.0
 
       - name: Run ansible-lint
         working-directory: /home/runner/work/community.sap_infrastructure/community.sap_infrastructure/roles/sap_vm_verify
diff --git a/.github/workflows/ansible-lint.yml b/.github/workflows/ansible-lint.yml
index 2ac44bea..3f97686b 100644
--- a/.github/workflows/ansible-lint.yml
+++ b/.github/workflows/ansible-lint.yml
@@ -21,15 +21,16 @@ jobs:
       - name: Set up Python 3
         uses: actions/setup-python@v5
         with:
-          python-version: '3.12'
+          python-version: '3.13'
 
-      - name: Install dependencies for Python
+      - name: Install test dependencies
         run: |
-          pip3 install ansible==9.1.0
-          pip3 install ansible-compat==4.1.10
-          pip3 install ansible-core==2.16.2
-          pip3 install ansible-lint==6.22.1
-          pip3 install jmespath==1.0.1
+          pip3 install \
+            ansible-core~=2.18.0 \
+            ansible~=11.0.0 \
+            ansible-lint~=25.1.0 \
+            ansible-compat~=25.1.0 \
+            jmespath~=1.0.0
 
       - name: Install dependencies for Ansible
         run: ansible-galaxy collection install -r /home/runner/work/community.sap_infrastructure/community.sap_infrastructure/requirements.yml