diff --git a/.github/workflows/ans-int-test-activation.yaml b/.github/workflows/ans-int-test-activation.yaml
index b56dd2793..8a21296eb 100644
--- a/.github/workflows/ans-int-test-activation.yaml
+++ b/.github/workflows/ans-int-test-activation.yaml
@@ -76,14 +76,14 @@ jobs:
           CMK_SITE_ID: "old_cme"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cre:
-        image: checkmk/check-mk-raw:2.4.0p15
+        image: checkmk/check-mk-raw:2.4.0p16
         ports:
           - 5024:5000
         env:
           CMK_SITE_ID: "stable_cre"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cme:
-        image: checkmk/check-mk-managed:2.4.0p15
+        image: checkmk/check-mk-managed:2.4.0p16
         ports:
           - 5324:5000
         env:
@@ -92,7 +92,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
diff --git a/.github/workflows/ans-int-test-bakery.yaml b/.github/workflows/ans-int-test-bakery.yaml
index 15faa3fb4..7764bc767 100644
--- a/.github/workflows/ans-int-test-bakery.yaml
+++ b/.github/workflows/ans-int-test-bakery.yaml
@@ -69,14 +69,14 @@ jobs:
           CMK_SITE_ID: "old_cme"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cre:
-        image: checkmk/check-mk-raw:2.4.0p15
+        image: checkmk/check-mk-raw:2.4.0p16
         ports:
           - 5024:5000
         env:
           CMK_SITE_ID: "stable_cre"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cme:
-        image: checkmk/check-mk-managed:2.4.0p15
+        image: checkmk/check-mk-managed:2.4.0p16
         ports:
           - 5324:5000
         env:
@@ -85,7 +85,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
diff --git a/.github/workflows/ans-int-test-contact_group.yaml b/.github/workflows/ans-int-test-contact_group.yaml
index 77a452e6b..2992c5ad7 100644
--- a/.github/workflows/ans-int-test-contact_group.yaml
+++ b/.github/workflows/ans-int-test-contact_group.yaml
@@ -76,14 +76,14 @@ jobs:
           CMK_SITE_ID: "old_cme"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cre:
-        image: checkmk/check-mk-raw:2.4.0p15
+        image: checkmk/check-mk-raw:2.4.0p16
         ports:
           - 5024:5000
         env:
           CMK_SITE_ID: "stable_cre"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cme:
-        image: checkmk/check-mk-managed:2.4.0p15
+        image: checkmk/check-mk-managed:2.4.0p16
         ports:
           - 5324:5000
         env:
@@ -92,7 +92,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
diff --git a/.github/workflows/ans-int-test-dcd.yaml b/.github/workflows/ans-int-test-dcd.yaml
index 560603c4c..73732ea57 100644
--- a/.github/workflows/ans-int-test-dcd.yaml
+++ b/.github/workflows/ans-int-test-dcd.yaml
@@ -62,7 +62,7 @@ jobs:
           CMK_SITE_ID: "old_cme"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cme:
-        image: checkmk/check-mk-managed:2.4.0p15
+        image: checkmk/check-mk-managed:2.4.0p16
         ports:
           - 5324:5000
         env:
@@ -71,7 +71,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
diff --git a/.github/workflows/ans-int-test-discovery.yaml b/.github/workflows/ans-int-test-discovery.yaml
index 892add061..549ffef25 100644
--- a/.github/workflows/ans-int-test-discovery.yaml
+++ b/.github/workflows/ans-int-test-discovery.yaml
@@ -76,14 +76,14 @@ jobs:
           CMK_SITE_ID: "old_cme"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cre:
-        image: checkmk/check-mk-raw:2.4.0p15
+        image: checkmk/check-mk-raw:2.4.0p16
         ports:
           - 5024:5000
         env:
           CMK_SITE_ID: "stable_cre"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cme:
-        image: checkmk/check-mk-managed:2.4.0p15
+        image: checkmk/check-mk-managed:2.4.0p16
         ports:
           - 5324:5000
         env:
@@ -92,7 +92,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
diff --git a/.github/workflows/ans-int-test-downtime.yaml b/.github/workflows/ans-int-test-downtime.yaml
index 825fe45cb..29f49b208 100644
--- a/.github/workflows/ans-int-test-downtime.yaml
+++ b/.github/workflows/ans-int-test-downtime.yaml
@@ -76,14 +76,14 @@ jobs:
           CMK_SITE_ID: "old_cme"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cre:
-        image: checkmk/check-mk-raw:2.4.0p15
+        image: checkmk/check-mk-raw:2.4.0p16
         ports:
           - 5024:5000
         env:
           CMK_SITE_ID: "stable_cre"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cme:
-        image: checkmk/check-mk-managed:2.4.0p15
+        image: checkmk/check-mk-managed:2.4.0p16
         ports:
           - 5324:5000
         env:
@@ -92,7 +92,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
diff --git a/.github/workflows/ans-int-test-folder.yaml b/.github/workflows/ans-int-test-folder.yaml
index 4b89d4e14..89a7708fe 100644
--- a/.github/workflows/ans-int-test-folder.yaml
+++ b/.github/workflows/ans-int-test-folder.yaml
@@ -76,14 +76,14 @@ jobs:
           CMK_SITE_ID: "old_cme"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cre:
-        image: checkmk/check-mk-raw:2.4.0p15
+        image: checkmk/check-mk-raw:2.4.0p16
         ports:
           - 5024:5000
         env:
           CMK_SITE_ID: "stable_cre"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cme:
-        image: checkmk/check-mk-managed:2.4.0p15
+        image: checkmk/check-mk-managed:2.4.0p16
         ports:
           - 5324:5000
         env:
@@ -92,7 +92,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
diff --git a/.github/workflows/ans-int-test-host.yaml b/.github/workflows/ans-int-test-host.yaml
index 05e09b4f2..eb3de2273 100644
--- a/.github/workflows/ans-int-test-host.yaml
+++ b/.github/workflows/ans-int-test-host.yaml
@@ -76,14 +76,14 @@ jobs:
           CMK_SITE_ID: "old_cme"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cre:
-        image: checkmk/check-mk-raw:2.4.0p15
+        image: checkmk/check-mk-raw:2.4.0p16
         ports:
           - 5024:5000
         env:
           CMK_SITE_ID: "stable_cre"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cme:
-        image: checkmk/check-mk-managed:2.4.0p15
+        image: checkmk/check-mk-managed:2.4.0p16
         ports:
           - 5324:5000
         env:
@@ -92,7 +92,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
diff --git a/.github/workflows/ans-int-test-host_group.yaml b/.github/workflows/ans-int-test-host_group.yaml
index bd15f155a..c3ac21d34 100644
--- a/.github/workflows/ans-int-test-host_group.yaml
+++ b/.github/workflows/ans-int-test-host_group.yaml
@@ -76,14 +76,14 @@ jobs:
           CMK_SITE_ID: "old_cme"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cre:
-        image: checkmk/check-mk-raw:2.4.0p15
+        image: checkmk/check-mk-raw:2.4.0p16
         ports:
           - 5024:5000
         env:
           CMK_SITE_ID: "stable_cre"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cme:
-        image: checkmk/check-mk-managed:2.4.0p15
+        image: checkmk/check-mk-managed:2.4.0p16
         ports:
           - 5324:5000
         env:
@@ -92,7 +92,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
diff --git a/.github/workflows/ans-int-test-lkp-bakery.yaml b/.github/workflows/ans-int-test-lkp-bakery.yaml
index c92ad41da..eb7fdff8e 100644
--- a/.github/workflows/ans-int-test-lkp-bakery.yaml
+++ b/.github/workflows/ans-int-test-lkp-bakery.yaml
@@ -69,14 +69,14 @@ jobs:
           CMK_SITE_ID: "old_cme"
           CMK_PASSWORD: "Sup3rSec4et!"
       old_cre:
-        image: checkmk/check-mk-raw:2.4.0p15
+        image: checkmk/check-mk-raw:2.4.0p16
         ports:
           - 5024:5000
         env:
           CMK_SITE_ID: "old_cre"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cme:
-        image: checkmk/check-mk-managed:2.4.0p15
+        image: checkmk/check-mk-managed:2.4.0p16
         ports:
           - 5324:5000
         env:
@@ -85,7 +85,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
diff --git a/.github/workflows/ans-int-test-lkp-folder.yaml b/.github/workflows/ans-int-test-lkp-folder.yaml
index b18f9972a..5b7aa6c70 100644
--- a/.github/workflows/ans-int-test-lkp-folder.yaml
+++ b/.github/workflows/ans-int-test-lkp-folder.yaml
@@ -74,14 +74,14 @@ jobs:
           CMK_SITE_ID: "old_cme"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cre:
-        image: checkmk/check-mk-raw:2.4.0p15
+        image: checkmk/check-mk-raw:2.4.0p16
         ports:
           - 5024:5000
         env:
           CMK_SITE_ID: "stable_cre"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cme:
-        image: checkmk/check-mk-managed:2.4.0p15
+        image: checkmk/check-mk-managed:2.4.0p16
         ports:
           - 5324:5000
         env:
@@ -90,7 +90,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
diff --git a/.github/workflows/ans-int-test-lkp-folders.yaml b/.github/workflows/ans-int-test-lkp-folders.yaml
index 18c4e213f..c93750d0f 100644
--- a/.github/workflows/ans-int-test-lkp-folders.yaml
+++ b/.github/workflows/ans-int-test-lkp-folders.yaml
@@ -74,14 +74,14 @@ jobs:
           CMK_SITE_ID: "old_cme"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cre:
-        image: checkmk/check-mk-raw:2.4.0p15
+        image: checkmk/check-mk-raw:2.4.0p16
         ports:
           - 5024:5000
         env:
           CMK_SITE_ID: "stable_cre"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cme:
-        image: checkmk/check-mk-managed:2.4.0p15
+        image: checkmk/check-mk-managed:2.4.0p16
         ports:
           - 5324:5000
         env:
@@ -90,7 +90,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
diff --git a/.github/workflows/ans-int-test-lkp-host.yaml b/.github/workflows/ans-int-test-lkp-host.yaml
index d9d8c7b48..736c8add3 100644
--- a/.github/workflows/ans-int-test-lkp-host.yaml
+++ b/.github/workflows/ans-int-test-lkp-host.yaml
@@ -74,14 +74,14 @@ jobs:
           CMK_SITE_ID: "old_cme"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cre:
-        image: checkmk/check-mk-raw:2.4.0p15
+        image: checkmk/check-mk-raw:2.4.0p16
         ports:
           - 5024:5000
         env:
           CMK_SITE_ID: "stable_cre"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cme:
-        image: checkmk/check-mk-managed:2.4.0p15
+        image: checkmk/check-mk-managed:2.4.0p16
         ports:
           - 5324:5000
         env:
@@ -90,7 +90,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
diff --git a/.github/workflows/ans-int-test-lkp-hosts.yaml b/.github/workflows/ans-int-test-lkp-hosts.yaml
index b61a702f2..42e4e88c7 100644
--- a/.github/workflows/ans-int-test-lkp-hosts.yaml
+++ b/.github/workflows/ans-int-test-lkp-hosts.yaml
@@ -74,14 +74,14 @@ jobs:
           CMK_SITE_ID: "old_cme"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cre:
-        image: checkmk/check-mk-raw:2.4.0p15
+        image: checkmk/check-mk-raw:2.4.0p16
         ports:
           - 5024:5000
         env:
           CMK_SITE_ID: "stable_cre"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cme:
-        image: checkmk/check-mk-managed:2.4.0p15
+        image: checkmk/check-mk-managed:2.4.0p16
         ports:
           - 5324:5000
         env:
@@ -90,7 +90,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
diff --git a/.github/workflows/ans-int-test-lkp-rules.yaml b/.github/workflows/ans-int-test-lkp-rules.yaml
index a52c2df41..7cae4a972 100644
--- a/.github/workflows/ans-int-test-lkp-rules.yaml
+++ b/.github/workflows/ans-int-test-lkp-rules.yaml
@@ -76,14 +76,14 @@ jobs:
           CMK_SITE_ID: "old_cme"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cre:
-        image: checkmk/check-mk-raw:2.4.0p15
+        image: checkmk/check-mk-raw:2.4.0p16
         ports:
           - 5024:5000
         env:
           CMK_SITE_ID: "stable_cre"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cme:
-        image: checkmk/check-mk-managed:2.4.0p15
+        image: checkmk/check-mk-managed:2.4.0p16
         ports:
           - 5324:5000
         env:
@@ -92,7 +92,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
diff --git a/.github/workflows/ans-int-test-lkp-rulesets.yaml b/.github/workflows/ans-int-test-lkp-rulesets.yaml
index 8c24d54f2..907252df3 100644
--- a/.github/workflows/ans-int-test-lkp-rulesets.yaml
+++ b/.github/workflows/ans-int-test-lkp-rulesets.yaml
@@ -76,14 +76,14 @@ jobs:
           CMK_SITE_ID: "old_cme"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cre:
-        image: checkmk/check-mk-raw:2.4.0p15
+        image: checkmk/check-mk-raw:2.4.0p16
         ports:
           - 5024:5000
         env:
           CMK_SITE_ID: "stable_cre"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cme:
-        image: checkmk/check-mk-managed:2.4.0p15
+        image: checkmk/check-mk-managed:2.4.0p16
         ports:
           - 5324:5000
         env:
@@ -92,7 +92,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
diff --git a/.github/workflows/ans-int-test-lkp-site.yaml b/.github/workflows/ans-int-test-lkp-site.yaml
index afe0fe64d..8769c802e 100644
--- a/.github/workflows/ans-int-test-lkp-site.yaml
+++ b/.github/workflows/ans-int-test-lkp-site.yaml
@@ -76,14 +76,14 @@ jobs:
           CMK_SITE_ID: "old_cme"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cre:
-        image: checkmk/check-mk-raw:2.4.0p15
+        image: checkmk/check-mk-raw:2.4.0p16
         ports:
           - 5024:5000
         env:
           CMK_SITE_ID: "stable_cre"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cme:
-        image: checkmk/check-mk-managed:2.4.0p15
+        image: checkmk/check-mk-managed:2.4.0p16
         ports:
           - 5324:5000
         env:
@@ -92,7 +92,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
diff --git a/.github/workflows/ans-int-test-lkp-sites.yaml b/.github/workflows/ans-int-test-lkp-sites.yaml
index 205923d1c..d7d39e2ed 100644
--- a/.github/workflows/ans-int-test-lkp-sites.yaml
+++ b/.github/workflows/ans-int-test-lkp-sites.yaml
@@ -76,14 +76,14 @@ jobs:
           CMK_SITE_ID: "old_cme"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cre:
-        image: checkmk/check-mk-raw:2.4.0p15
+        image: checkmk/check-mk-raw:2.4.0p16
         ports:
           - 5024:5000
         env:
           CMK_SITE_ID: "stable_cre"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cme:
-        image: checkmk/check-mk-managed:2.4.0p15
+        image: checkmk/check-mk-managed:2.4.0p16
         ports:
           - 5324:5000
         env:
@@ -92,7 +92,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
diff --git a/.github/workflows/ans-int-test-lkp-version.yaml b/.github/workflows/ans-int-test-lkp-version.yaml
index 08f60266f..4904f5e7f 100644
--- a/.github/workflows/ans-int-test-lkp-version.yaml
+++ b/.github/workflows/ans-int-test-lkp-version.yaml
@@ -76,14 +76,14 @@ jobs:
           CMK_SITE_ID: "old_cme"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cre:
-        image: checkmk/check-mk-raw:2.4.0p15
+        image: checkmk/check-mk-raw:2.4.0p16
         ports:
           - 5024:5000
         env:
           CMK_SITE_ID: "stable_cre"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cme:
-        image: checkmk/check-mk-managed:2.4.0p15
+        image: checkmk/check-mk-managed:2.4.0p16
         ports:
           - 5324:5000
         env:
@@ -92,7 +92,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
diff --git a/.github/workflows/ans-int-test-password.yaml b/.github/workflows/ans-int-test-password.yaml
index 2a9852258..262fa1987 100644
--- a/.github/workflows/ans-int-test-password.yaml
+++ b/.github/workflows/ans-int-test-password.yaml
@@ -76,14 +76,14 @@ jobs:
           CMK_SITE_ID: "old_cme"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cre:
-        image: checkmk/check-mk-raw:2.4.0p15
+        image: checkmk/check-mk-raw:2.4.0p16
         ports:
           - 5024:5000
         env:
           CMK_SITE_ID: "stable_cre"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cme:
-        image: checkmk/check-mk-managed:2.4.0p15
+        image: checkmk/check-mk-managed:2.4.0p16
         ports:
           - 5324:5000
         env:
@@ -92,7 +92,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
diff --git a/.github/workflows/ans-int-test-rule.yaml b/.github/workflows/ans-int-test-rule.yaml
index bc7e8bf4c..b77511fd5 100644
--- a/.github/workflows/ans-int-test-rule.yaml
+++ b/.github/workflows/ans-int-test-rule.yaml
@@ -76,14 +76,14 @@ jobs:
           CMK_SITE_ID: "old_cme"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cre:
-        image: checkmk/check-mk-raw:2.4.0p15
+        image: checkmk/check-mk-raw:2.4.0p16
         ports:
           - 5024:5000
         env:
           CMK_SITE_ID: "stable_cre"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cme:
-        image: checkmk/check-mk-managed:2.4.0p15
+        image: checkmk/check-mk-managed:2.4.0p16
         ports:
           - 5324:5000
         env:
@@ -92,7 +92,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
diff --git a/.github/workflows/ans-int-test-service_group.yaml b/.github/workflows/ans-int-test-service_group.yaml
index aa4f16e39..9af524cad 100644
--- a/.github/workflows/ans-int-test-service_group.yaml
+++ b/.github/workflows/ans-int-test-service_group.yaml
@@ -76,14 +76,14 @@ jobs:
           CMK_SITE_ID: "old_cme"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cre:
-        image: checkmk/check-mk-raw:2.4.0p15
+        image: checkmk/check-mk-raw:2.4.0p16
         ports:
           - 5024:5000
         env:
           CMK_SITE_ID: "stable_cre"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cme:
-        image: checkmk/check-mk-managed:2.4.0p15
+        image: checkmk/check-mk-managed:2.4.0p16
         ports:
           - 5324:5000
         env:
@@ -92,7 +92,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
diff --git a/.github/workflows/ans-int-test-site.yaml b/.github/workflows/ans-int-test-site.yaml
index ada529718..f50cac6de 100644
--- a/.github/workflows/ans-int-test-site.yaml
+++ b/.github/workflows/ans-int-test-site.yaml
@@ -72,14 +72,14 @@ jobs:
           CMK_PASSWORD: "Sup3rSec4et!"
           CMK_LIVESTATUS_TCP: "on"
       stable_cre:
-        image: checkmk/check-mk-raw:2.4.0p15
+        image: checkmk/check-mk-raw:2.4.0p16
         ports:
           - 5024:5000
         env:
           CMK_SITE_ID: "stable_cre"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable-cre-r1:
-        image: checkmk/check-mk-raw:2.4.0p15
+        image: checkmk/check-mk-raw:2.4.0p16
         ports:
           - 5124:5000
           - 6568:6557
@@ -90,14 +90,14 @@ jobs:
           CMK_LIVESTATUS_TCP: "on"
           CMK_RABBITMQ_PORT: 5671
       stable_cme:
-        image: checkmk/check-mk-managed:2.4.0p15
+        image: checkmk/check-mk-managed:2.4.0p16
         ports:
           - 5323:5000
         env:
           CMK_SITE_ID: "stable_cme"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable-cme-r1:
-        image: checkmk/check-mk-managed:2.4.0p15
+        image: checkmk/check-mk-managed:2.4.0p16
         ports:
           - 7323:5000
           - 6562:6557
@@ -111,7 +111,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
diff --git a/.github/workflows/ans-int-test-tag_group.yaml b/.github/workflows/ans-int-test-tag_group.yaml
index 961461c57..4832baddf 100644
--- a/.github/workflows/ans-int-test-tag_group.yaml
+++ b/.github/workflows/ans-int-test-tag_group.yaml
@@ -76,14 +76,14 @@ jobs:
           CMK_SITE_ID: "old_cme"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cre:
-        image: checkmk/check-mk-raw:2.4.0p15
+        image: checkmk/check-mk-raw:2.4.0p16
         ports:
           - 5024:5000
         env:
           CMK_SITE_ID: "stable_cre"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cme:
-        image: checkmk/check-mk-managed:2.4.0p15
+        image: checkmk/check-mk-managed:2.4.0p16
         ports:
           - 5324:5000
         env:
@@ -92,7 +92,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
diff --git a/.github/workflows/ans-int-test-timeperiod.yaml b/.github/workflows/ans-int-test-timeperiod.yaml
index e2cf2fc88..ca7a124fc 100644
--- a/.github/workflows/ans-int-test-timeperiod.yaml
+++ b/.github/workflows/ans-int-test-timeperiod.yaml
@@ -76,14 +76,14 @@ jobs:
           CMK_SITE_ID: "old_cme"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cre:
-        image: checkmk/check-mk-raw:2.4.0p15
+        image: checkmk/check-mk-raw:2.4.0p16
         ports:
           - 5024:5000
         env:
           CMK_SITE_ID: "stable_cre"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cme:
-        image: checkmk/check-mk-managed:2.4.0p15
+        image: checkmk/check-mk-managed:2.4.0p16
         ports:
           - 5324:5000
         env:
@@ -92,7 +92,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
diff --git a/.github/workflows/ans-int-test-user.yaml b/.github/workflows/ans-int-test-user.yaml
index 7cc628d60..5df76b0b6 100644
--- a/.github/workflows/ans-int-test-user.yaml
+++ b/.github/workflows/ans-int-test-user.yaml
@@ -76,14 +76,14 @@ jobs:
           CMK_SITE_ID: "old_cme"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cre:
-        image: checkmk/check-mk-raw:2.4.0p15
+        image: checkmk/check-mk-raw:2.4.0p16
         ports:
           - 5024:5000
         env:
           CMK_SITE_ID: "stable_cre"
           CMK_PASSWORD: "Sup3rSec4et!"
       stable_cme:
-        image: checkmk/check-mk-managed:2.4.0p15
+        image: checkmk/check-mk-managed:2.4.0p16
         ports:
           - 5324:5000
         env:
@@ -92,7 +92,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
diff --git a/.github/workflows/ans-unit-test-inventory.yaml b/.github/workflows/ans-unit-test-inventory.yaml
index b31772c10..80359803c 100644
--- a/.github/workflows/ans-unit-test-inventory.yaml
+++ b/.github/workflows/ans-unit-test-inventory.yaml
@@ -50,7 +50,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
diff --git a/.github/workflows/ansible-lint.yaml b/.github/workflows/ansible-lint.yaml
index 85f5b43bc..96dc16256 100644
--- a/.github/workflows/ansible-lint.yaml
+++ b/.github/workflows/ansible-lint.yaml
@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
diff --git a/.github/workflows/ansible-sanity-tests.yaml b/.github/workflows/ansible-sanity-tests.yaml
index b1c26702d..bfa32ccd8 100644
--- a/.github/workflows/ansible-sanity-tests.yaml
+++ b/.github/workflows/ansible-sanity-tests.yaml
@@ -44,7 +44,7 @@ jobs:
     steps:
 
       - name: Check out code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
index 64f7e5f7b..2787ce781 100644
--- a/.github/workflows/codeql.yaml
+++ b/.github/workflows/codeql.yaml
@@ -22,7 +22,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/molecule-role-agent.yaml b/.github/workflows/molecule-role-agent.yaml
index a089d99a5..b92d3e67b 100644
--- a/.github/workflows/molecule-role-agent.yaml
+++ b/.github/workflows/molecule-role-agent.yaml
@@ -42,12 +42,13 @@ jobs:
 
       # This was necessary at some point to avoid random failure.
       # Disabling on 20250826 to check, if it is still necessary.
-      # - name: "Free Disk Space."
-      #   uses: jlumbroso/free-disk-space@main
-      #   with:
-      #     # this might remove tools that are actually needed,
-      #     # if set to "true" but frees about 6 GB
-      #     tool-cache: false
+      # Re-enabling on 20251124 as it still seems necessary.
+      - name: "Free Disk Space."
+        uses: jlumbroso/free-disk-space@main
+        with:
+          # this might remove tools that are actually needed,
+          # if set to "true" but frees about 6 GB
+          tool-cache: false
 
       - name: "Add swap file to avoid memory shortage."
         run: |
@@ -59,7 +60,7 @@ jobs:
           swapon --show
 
       - name: "Check out code."
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
diff --git a/.github/workflows/molecule-role-server.yaml b/.github/workflows/molecule-role-server.yaml
index 6cc7dc06c..a26b9a4d8 100644
--- a/.github/workflows/molecule-role-server.yaml
+++ b/.github/workflows/molecule-role-server.yaml
@@ -41,12 +41,13 @@ jobs:
 
       # This was necessary at some point to avoid random failure.
       # Disabling on 20250826 to check, if it is still necessary.
-      # - name: "Free Disk Space."
-      #   uses: jlumbroso/free-disk-space@main
-      #   with:
-      #     # this might remove tools that are actually needed,
-      #     # if set to "true" but frees about 6 GB
-      #     tool-cache: false
+      # Re-enabling on 20251124 as it still seems necessary.
+      - name: "Free Disk Space."
+        uses: jlumbroso/free-disk-space@main
+        with:
+          # this might remove tools that are actually needed,
+          # if set to "true" but frees about 6 GB
+          tool-cache: false
 
       - name: "Add swap file to avoid memory shortage."
         run: |
@@ -58,7 +59,7 @@ jobs:
           swapon --show
 
       - name: "Check out code."
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
diff --git a/.github/workflows/python-qa.yaml b/.github/workflows/python-qa.yaml
index f9a8cd857..c3a98ae9b 100644
--- a/.github/workflows/python-qa.yaml
+++ b/.github/workflows/python-qa.yaml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: "Check out code."
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: "Install uv."
         uses: astral-sh/setup-uv@v7
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 674f452a9..35c42b777 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -31,7 +31,7 @@ jobs:
     steps:
 
       - name: Check out code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
 
@@ -64,7 +64,7 @@ jobs:
       #
 
       - name: "Checkout Code"
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: "Get current Version"
         id: current_version
diff --git a/SUPPORT.md b/SUPPORT.md
index 7417cdf42..eca949d69 100644
--- a/SUPPORT.md
+++ b/SUPPORT.md
@@ -78,3 +78,4 @@ Collection Version | Checkmk Versions | Ansible Versions | Remarks
 6.2.3 | 2.2.0p46, 2.3.0p38, 2.4.0p13 | 2.17, 2.18, 2.19 | None
 6.3.0 | 2.2.0p47, 2.3.0p40, 2.4.0p15 | 2.17, 2.18, 2.19 | None
 6.3.1 | 2.2.0p47, 2.3.0p40, 2.4.0p15 | 2.17, 2.18, 2.19 | None
+6.4.0 | 2.2.0p47, 2.3.0p40, 2.4.0p16 | 2.17, 2.18, 2.19 | None
diff --git a/Vagrantfile b/Vagrantfile
index d1cd519ef..a5a0c1b7c 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -30,7 +30,7 @@ Vagrant.configure("2") do |config|
     apt-get -y update --quiet
     apt-get -y purge postfix --quiet  # Necessary, as it breaks the upgrade process
     apt-get -y dist-upgrade --quiet
-    apt-get -y install ca-certificates curl direnv gnupg lsb-release qemu-guest-agent podman htop
+    apt-get -y install ca-certificates curl direnv gnupg lsb-release qemu-guest-agent podman htop make
     sudo -u vagrant bash -c "curl -LsSf https://astral.sh/uv/install.sh | sh"
     sudo -u vagrant bash -c "cd /home/vagrant/ansible_collections/checkmk/general/ && /home/vagrant/.local/bin/uv sync"
     sudo -u vagrant bash -c "cd /home/vagrant/ansible_collections/checkmk/general/ && /home/vagrant/.local/bin/uv run ansible-galaxy collection install -f -r /home/vagrant/ansible_collections/checkmk/general/requirements.yml"
@@ -48,6 +48,7 @@ Vagrant.configure("2") do |config|
   # If we want to move to Ubuntu 24, this could be an option: cloud-image/ubuntu-24.04
   config.vm.define "ansibuntu", autostart: false , primary: false do |srv|
     srv.vm.box = "generic/ubuntu2204"
+    # srv.vm.box = "boxen/ubuntu-24.04"  # ToDo: Fix issue with local Vagrant
     srv.vm.network :private_network,
     :ip                         => "192.168.124.61",
     :libvirt__netmask           => "255.255.255.0",
@@ -70,6 +71,7 @@ Vagrant.configure("2") do |config|
   # Debian
   config.vm.define "debsible", autostart: false , primary: false do |srv|
     srv.vm.box = "generic/debian12"
+    # srv.vm.box = "boxen/debian-13"  # ToDo: Fix issue with local Vagrant
     srv.vm.network :private_network,
     :ip                         => "192.168.124.62",
     :libvirt__netmask           => "255.255.255.0",
@@ -133,6 +135,28 @@ Vagrant.configure("2") do |config|
       inline: "zypper --quiet up -y"
   end
 
+  # Rocky
+  config.vm.define "rocksible", autostart: false , primary: false do |srv|
+    srv.vm.box = "generic/rocky9"
+    srv.vm.network :private_network,
+    :ip                         => "192.168.124.65",
+    :libvirt__netmask           => "255.255.255.0",
+    :libvirt__network_name      => "ansible_collection",
+    :libvirt__network_address   => "192.168.124.0"
+    srv.ssh.insert_key = false
+    srv.vm.provider "libvirt" do |libvirt|
+      libvirt.default_prefix = "ansible_"
+      libvirt.description = 'This box is used to test roles against.'
+      libvirt.memory = 2048
+      libvirt.cpus = 2
+      libvirt.title = "rocksible"
+      libvirt.memorybacking :access, :mode => 'shared'
+      libvirt.memorybacking :source, :type => 'memfd'
+    end
+    srv.vm.provision "shell",
+      inline: "dnf --quiet check-update ; dnf -y install vim curl wget git"
+  end
+
   # Oracle Linux
   config.vm.define "ansoracle", autostart: false , primary: false do |srv|
     srv.vm.box = "generic/oracle8"
diff --git a/changelogs/fragments/download_delegation.yml b/changelogs/fragments/download_delegation.yml
new file mode 100644
index 000000000..1645cf060
--- /dev/null
+++ b/changelogs/fragments/download_delegation.yml
@@ -0,0 +1,2 @@
+minor_changes:
+  - Server role - Add support for delegation of downloading the Checkmk Server Setup and GPG Key.
diff --git a/changelogs/fragments/release_summary.yml b/changelogs/fragments/release_summary.yml
new file mode 100644
index 000000000..8cc02aef8
--- /dev/null
+++ b/changelogs/fragments/release_summary.yml
@@ -0,0 +1 @@
+release_summary: "Update Operating System support for ``agent`` and ``server`` role: Debian 13 and RedHat 10 are here!"
diff --git a/changelogs/fragments/roles.yml b/changelogs/fragments/roles.yml
new file mode 100644
index 000000000..00ccc280f
--- /dev/null
+++ b/changelogs/fragments/roles.yml
@@ -0,0 +1,6 @@
+minor_changes:
+  - Agent role - Add support for Debian 13 and RedHat 10.
+  - Server role - Add support for Debian 13 and RedHat 10. Server setups are available from Checkmk 2.4.0p16 onwards.
+
+bugfixes:
+  - Agent role - Replace misplaced ``checkmk_server_version`` variable with correct ``checkmk_agent_version``.
diff --git a/galaxy.yml b/galaxy.yml
index 39d3554cc..c2536fc0e 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -10,7 +10,7 @@ name: general
 
 # The version of the collection. Must be compatible with semantic versioning
 
-version: 6.3.1
+version: 6.4.0
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md
diff --git a/playbooks/inventory/hosts.ini b/playbooks/inventory/hosts.ini
index 3e766b8e7..6839e76ab 100644
--- a/playbooks/inventory/hosts.ini
+++ b/playbooks/inventory/hosts.ini
@@ -10,7 +10,7 @@ ansibuntu ansible_host=192.168.124.61 checkmk_var_folder_path="/test"
 debsible ansible_host=192.168.124.62 checkmk_var_folder_path="/foo"
 anstream ansible_host=192.168.124.63 checkmk_var_folder_path="foo/bar"
 ansuse ansible_host=192.168.124.64 checkmk_var_folder_path="/bar"
-ansles ansible_host=192.168.124.65 checkmk_var_folder_path="/bar/foo"
+rocksible ansible_host=192.168.124.65 checkmk_var_folder_path="/bar/foo"
 ansoracle ansible_host=192.168.124.66 checkmk_var_folder_path="/foo"
 
 [linux:vars]
diff --git a/playbooks/vars/auth.yml b/playbooks/vars/auth.yml
index 41bd1457f..ce0f1db9f 100644
--- a/playbooks/vars/auth.yml
+++ b/playbooks/vars/auth.yml
@@ -7,7 +7,7 @@ checkmk_var_automation_secret: "mysecret"
 checkmk_agent_user: "{{ checkmk_var_automation_user }}"
 checkmk_agent_pass: "{{ checkmk_var_automation_secret }}"
 
-checkmk_var_version: "2.4.0p15"
+checkmk_var_version: "2.4.0p16"
 checkmk_var_edition: "cre"
 #############################################################
 
diff --git a/pyproject.toml b/pyproject.toml
index 9def72928..ec2a410d3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,14 +1,14 @@
 [project]
 name = "checkmk_ansible_collection"
-version = "6.3.1"
+version = "6.4.0"
 requires-python = ">=3.11"
 dependencies = [
     "ansible-core==2.19.4",
     "antsibull-changelog==0.34.0",
-    "antsibull-docs==2.22.0",
-    "ansible-lint==25.9.2",
+    "antsibull-docs==2.23.0",
+    "ansible-lint==25.11.0",
     "jinja2==3.1.6",
-    "molecule==25.9.0",
+    "molecule==25.11.0",
     "molecule-plugins[podman]==25.8.12",
     "pywinrm==0.5.0",
     "yamllint==1.37.1",
@@ -17,7 +17,7 @@ dependencies = [
 [dependency-groups]
 dev = [
     "black==25.11.0",
-    "click==8.3.0",
+    "click==8.3.1",
     "isort==7.0.0",
     "mypy-extensions==1.1.0",
     "pathspec==0.12.1",
diff --git a/roles/agent/README.md b/roles/agent/README.md
index ec7523966..ef491291c 100644
--- a/roles/agent/README.md
+++ b/roles/agent/README.md
@@ -18,7 +18,7 @@ Please make sure it is installed on your system and available for Ansible.
 
 ### Basic Configuration
 
-    checkmk_agent_version: "2.4.0p15"
+    checkmk_agent_version: "2.4.0p16"
 
 The Checkmk version of the site your agents will talk to.
 
diff --git a/roles/agent/defaults/main.yml b/roles/agent/defaults/main.yml
index 25a150513..cfe022388 100644
--- a/roles/agent/defaults/main.yml
+++ b/roles/agent/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 ## Basic Configuration
-checkmk_agent_version: "2.4.0p15"
+checkmk_agent_version: "2.4.0p16"
 checkmk_agent_edition: 'cre'
 checkmk_agent_server_protocol: 'http'
 checkmk_agent_server: 'localhost'
diff --git a/roles/agent/molecule/2.4.0/converge.yml b/roles/agent/molecule/2.4.0/converge.yml
index 14991db98..1926a3d15 100644
--- a/roles/agent/molecule/2.4.0/converge.yml
+++ b/roles/agent/molecule/2.4.0/converge.yml
@@ -38,9 +38,9 @@
       when: ansible_distribution == 'Ubuntu'
 
     # See https://github.com/geerlingguy/docker-rockylinux9-ansible/issues/6
-    - name: "Fix permissions on /etc/shadow for Rocky 9."  # noqa no-changed-when
+    - name: "Fix permissions on /etc/shadow for Rocky 9 and 10."  # noqa no-changed-when
       ansible.builtin.command: chmod 0400 /etc/shadow
-      when: ansible_distribution == 'Rocky' and ansible_distribution_major_version == '9'
+      when: ansible_distribution == 'Rocky' and (ansible_distribution_major_version == '9' or ansible_distribution_major_version == '10')
 
   tasks:
 
diff --git a/roles/agent/molecule/2.4.0/group_vars/all.yml b/roles/agent/molecule/2.4.0/group_vars/all.yml
index 8d2f44f50..39e4fa03e 100644
--- a/roles/agent/molecule/2.4.0/group_vars/all.yml
+++ b/roles/agent/molecule/2.4.0/group_vars/all.yml
@@ -1,6 +1,6 @@
 ---
 # General
-checkmk_var_version: "2.4.0p15"
+checkmk_var_version: "2.4.0p16"
 checkmk_var_edition: "cre"
 checkmk_var_checkmk_site: "mysite"
 checkmk_var_automation_user: "cmkadmin"
diff --git a/roles/agent/molecule/2.4.0/molecule.yml b/roles/agent/molecule/2.4.0/molecule.yml
index a93de0202..e614fe454 100644
--- a/roles/agent/molecule/2.4.0/molecule.yml
+++ b/roles/agent/molecule/2.4.0/molecule.yml
@@ -16,14 +16,14 @@ platforms:
     pre_build_image: true
     privileged: true
     systemd: always
-  - name: debian11
-    image: docker.io/geerlingguy/docker-debian11-ansible
+  - name: debian12
+    image: docker.io/geerlingguy/docker-debian12-ansible
     command: ${MOLECULE_DOCKER_COMMAND:-""}
     pre_build_image: true
     privileged: true
     systemd: always
-  - name: debian12
-    image: docker.io/geerlingguy/docker-debian12-ansible
+  - name: debian13
+    image: docker.io/geerlingguy/docker-debian13-ansible
     command: ${MOLECULE_DOCKER_COMMAND:-""}
     pre_build_image: true
     privileged: true
@@ -34,6 +34,12 @@ platforms:
     pre_build_image: true
     privileged: true
     systemd: always
+  - name: rockylinux10
+    image: docker.io/geerlingguy/docker-rockylinux10-ansible
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    pre_build_image: true
+    privileged: true
+    systemd: always
 provisioner:
   name: ansible
   config_options:
diff --git a/roles/agent/vars/main.yml b/roles/agent/vars/main.yml
index 58898243f..f2fce7846 100644
--- a/roles/agent/vars/main.yml
+++ b/roles/agent/vars/main.yml
@@ -24,7 +24,7 @@ __checkmk_var_modern_edition_mapping:
 # Bringing the above two mappings back together.
 __checkmk_agent_edition_mapping: >-
   {{
-    ( (checkmk_server_version | regex_replace('p.*', '')) is version('2.5.0', '<') )
+    ( (checkmk_agent_version | regex_replace('p.*', '')) is version('2.5.0', '<') )
     | ternary(__checkmk_var_legacy_edition_mapping, __checkmk_var_modern_edition_mapping)
   }}
 
diff --git a/roles/server/README.md b/roles/server/README.md
index 40851b6bb..75699f2d6 100644
--- a/roles/server/README.md
+++ b/roles/server/README.md
@@ -27,7 +27,7 @@ To learn about the distributions used in automated tests, inspect the correspond
 
 ### Basic Configuration
 
-    checkmk_server_version: "2.4.0p15"
+    checkmk_server_version: "2.4.0p16"
 
 The global Checkmk version. This is used for installing Checkmk.
 To manage sites and their version, see `checkmk_server_sites`.
@@ -166,6 +166,16 @@ Backup options to use. By default no historic data is backed up, in order to cre
 Whether to allow downgrading a site's version.
 Note: this is not a recommended procedure, and will not be supported for enterprise customers.
 
+### Delegation
+
+    checkmk_server_delegate_download: "{{ inventory_hostname }}"
+
+Configure the host to which Checkmk Server Setup downloads are delegated to. After download the files are transferred to the remote node, when the remote node didn't do the download itself.
+
+    checkmk_server_gpg_delegate_download: "{{ checkmk_server_delegate_download }}"
+
+Configure the host to which Checkmk GPG Key downloads are delegated to. After download the files are transferred to the remote node, when the remote node didn't do the download itself.
+
 ## Tags
 
 Tasks are tagged with the following tags:
diff --git a/roles/server/defaults/main.yml b/roles/server/defaults/main.yml
index dbf530c42..909d68be9 100644
--- a/roles/server/defaults/main.yml
+++ b/roles/server/defaults/main.yml
@@ -8,25 +8,32 @@
 checkmk_server_server_stable_os:
   - AlmaLinux-8
   - AlmaLinux-9
+  - AlmaLinux-10
   - CentOS-7
   - CentOS-8
   - CentOS-9
+  - CentOS-10
   - Debian-10
   - Debian-11
   - Debian-12
+  - Debian-13
   - RedHat-7
   - RedHat-8
   - RedHat-9
+  - RedHat-10
   - OracleLinux-8
+  - OracleLinux-9
+  - OracleLinux-10
   - Rocky-8
   - Rocky-9
+  - Rocky-10
   - Ubuntu-18
   - Ubuntu-20
   - Ubuntu-22
   - Ubuntu-24
 
 ## Basic Configuration
-checkmk_server_version: "2.4.0p15"
+checkmk_server_version: "2.4.0p16"
 checkmk_server_edition: 'cre'
 checkmk_server_verify_setup: true
 checkmk_server_epel_gpg_check: true
@@ -76,6 +83,10 @@ checkmk_server_backup_dir: '/tmp'
 checkmk_server_backup_opts: '--no-past'
 checkmk_server_allow_downgrades: 'false'
 
+## Delegation
+checkmk_server_delegate_download: "{{ inventory_hostname }}"
+checkmk_server_gpg_delegate_download: "{{ checkmk_server_delegate_download }}"
+
 ## HTTP Proxy
 checkmk_server_download_proxy: ''
 checkmk_server_gpg_download_proxy: "{{ checkmk_server_download_proxy }}"
diff --git a/roles/server/molecule/2.4.0/converge.yml b/roles/server/molecule/2.4.0/converge.yml
index 856abdbf2..08996977d 100644
--- a/roles/server/molecule/2.4.0/converge.yml
+++ b/roles/server/molecule/2.4.0/converge.yml
@@ -29,9 +29,9 @@
       when: ansible_distribution == 'Ubuntu'
 
     # See https://github.com/geerlingguy/docker-rockylinux9-ansible/issues/6
-    - name: "Fix permissions on /etc/shadow for Rocky 9."  # noqa no-changed-when
+    - name: "Fix permissions on /etc/shadow for Rocky 9 and 10."  # noqa no-changed-when
       ansible.builtin.command: chmod 0400 /etc/shadow
-      when: ansible_distribution == 'Rocky' and ansible_distribution_major_version == '9'
+      when: ansible_distribution == 'Rocky' and (ansible_distribution_major_version == '9' or ansible_distribution_major_version == '10')
 
     - name: "Download MKP."
       ansible.builtin.get_url:
diff --git a/roles/server/molecule/2.4.0/group_vars/all.yml b/roles/server/molecule/2.4.0/group_vars/all.yml
index e0c8cd57a..906797c36 100644
--- a/roles/server/molecule/2.4.0/group_vars/all.yml
+++ b/roles/server/molecule/2.4.0/group_vars/all.yml
@@ -1,6 +1,6 @@
 ---
 # General
-checkmk_var_version: "2.4.0p15"
+checkmk_var_version: "2.4.0p16"
 checkmk_var_edition: "cre"
 checkmk_server_verify_setup: true
 checkmk_var_server_url: "http://127.0.0.1/"
diff --git a/roles/server/molecule/2.4.0/molecule.yml b/roles/server/molecule/2.4.0/molecule.yml
index a93de0202..6bbdad9aa 100644
--- a/roles/server/molecule/2.4.0/molecule.yml
+++ b/roles/server/molecule/2.4.0/molecule.yml
@@ -28,12 +28,24 @@ platforms:
     pre_build_image: true
     privileged: true
     systemd: always
+  - name: debian13
+    image: docker.io/geerlingguy/docker-debian13-ansible
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    pre_build_image: true
+    privileged: true
+    systemd: always
   - name: rockylinux9
     image: docker.io/geerlingguy/docker-rockylinux9-ansible
     command: ${MOLECULE_DOCKER_COMMAND:-""}
     pre_build_image: true
     privileged: true
     systemd: always
+  - name: rockylinux10
+    image: docker.io/geerlingguy/docker-rockylinux10-ansible
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    pre_build_image: true
+    privileged: true
+    systemd: always
 provisioner:
   name: ansible
   config_options:
diff --git a/roles/server/tasks/main.yml b/roles/server/tasks/main.yml
index fb570fa9d..770f4158d 100644
--- a/roles/server/tasks/main.yml
+++ b/roles/server/tasks/main.yml
@@ -72,6 +72,7 @@
         url_password: "{{ checkmk_server_download_pass | default(omit) }}"
       environment: "{{ __proxy_env | default(omit) }}"
       retries: 3
+      delegate_to: "{{ checkmk_server_delegate_download }}"
       tags:
         - download-package
 
@@ -85,6 +86,25 @@
         url_password: "{{ checkmk_server_gpg_download_pass | default(omit) }}"
       environment: "{{ __proxy_env | default(omit) }}"
       retries: 3
+      delegate_to: "{{ checkmk_server_gpg_delegate_download }}"
+      tags:
+        - download-gpg-key
+
+    - name: "Transfer Checkmk Server Setup."
+      ansible.builtin.copy:
+        src: "{{ __checkmk_server_tmp_dir }}/{{ __checkmk_server_setup_file }}"
+        dest: "{{ __checkmk_server_tmp_dir }}/{{ __checkmk_server_setup_file }}"
+        mode: "0644"
+      when: checkmk_server_delegate_download != inventory_hostname
+      tags:
+        - download-package
+
+    - name: "Transfer Checkmk GPG Key."
+      ansible.builtin.copy:
+        src: "{{ __checkmk_server_tmp_dir }}/Check_MK-pubkey.gpg"
+        dest: "{{ __checkmk_server_tmp_dir }}/Check_MK-pubkey.gpg"
+        mode: "0644"
+      when: checkmk_server_gpg_delegate_download != inventory_hostname
       tags:
         - download-gpg-key
 
diff --git a/tests/integration/files/includes/vars/global.yml b/tests/integration/files/includes/vars/global.yml
index ad2fd13d7..200190e2e 100644
--- a/tests/integration/files/includes/vars/global.yml
+++ b/tests/integration/files/includes/vars/global.yml
@@ -48,7 +48,7 @@ __checkmk_var_testing_environment:
 
 # Use this to override the test-specific sites for local testing:
 # checkmk_var_test_sites:
-#   - version: "2.4.0p15"
+#   - version: "2.4.0p16"
 #     edition: "cme"
 #     site: "stable_cme"
 #     port: "5324"
diff --git a/tests/integration/targets/activation/vars/main.yml b/tests/integration/targets/activation/vars/main.yml
index af6b67dfa..db38b09b7 100644
--- a/tests/integration/targets/activation/vars/main.yml
+++ b/tests/integration/targets/activation/vars/main.yml
@@ -12,11 +12,11 @@ checkmk_var_test_sites:
     edition: "cme"
     site: "old_cme"
     port: "5323"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cre"
     site: "stable_cre"
     port: "5024"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cme"
     site: "stable_cme"
     port: "5324"
diff --git a/tests/integration/targets/bakery/vars/main.yml b/tests/integration/targets/bakery/vars/main.yml
index 4091e5987..afaff87d1 100644
--- a/tests/integration/targets/bakery/vars/main.yml
+++ b/tests/integration/targets/bakery/vars/main.yml
@@ -8,7 +8,7 @@ checkmk_var_test_sites:
     edition: "cme"
     site: "old_cme"
     port: "5323"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cme"
     site: "stable_cme"
     port: "5324"
diff --git a/tests/integration/targets/contact_group/vars/main.yml b/tests/integration/targets/contact_group/vars/main.yml
index f04a1da24..0cd449a6d 100644
--- a/tests/integration/targets/contact_group/vars/main.yml
+++ b/tests/integration/targets/contact_group/vars/main.yml
@@ -12,11 +12,11 @@ checkmk_var_test_sites:
     edition: "cme"
     site: "old_cme"
     port: "5323"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cre"
     site: "stable_cre"
     port: "5024"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cme"
     site: "stable_cme"
     port: "5324"
diff --git a/tests/integration/targets/dcd/vars/main.yml b/tests/integration/targets/dcd/vars/main.yml
index 20387dd36..e2da82851 100644
--- a/tests/integration/targets/dcd/vars/main.yml
+++ b/tests/integration/targets/dcd/vars/main.yml
@@ -4,7 +4,7 @@ checkmk_var_test_sites:
     edition: "cme"
     site: "old_cme"
     port: "5323"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cme"
     site: "stable_cme"
     port: "5324"
diff --git a/tests/integration/targets/discovery/vars/main.yml b/tests/integration/targets/discovery/vars/main.yml
index 2e61ca760..c3326252c 100644
--- a/tests/integration/targets/discovery/vars/main.yml
+++ b/tests/integration/targets/discovery/vars/main.yml
@@ -12,11 +12,11 @@ checkmk_var_test_sites:
     edition: "cme"
     site: "old_cme"
     port: "5323"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cre"
     site: "stable_cre"
     port: "5024"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cme"
     site: "stable_cme"
     port: "5324"
diff --git a/tests/integration/targets/downtime/vars/main.yml b/tests/integration/targets/downtime/vars/main.yml
index af6b67dfa..db38b09b7 100644
--- a/tests/integration/targets/downtime/vars/main.yml
+++ b/tests/integration/targets/downtime/vars/main.yml
@@ -12,11 +12,11 @@ checkmk_var_test_sites:
     edition: "cme"
     site: "old_cme"
     port: "5323"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cre"
     site: "stable_cre"
     port: "5024"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cme"
     site: "stable_cme"
     port: "5324"
diff --git a/tests/integration/targets/folder/vars/main.yml b/tests/integration/targets/folder/vars/main.yml
index ecb73907c..21113b0b5 100644
--- a/tests/integration/targets/folder/vars/main.yml
+++ b/tests/integration/targets/folder/vars/main.yml
@@ -12,11 +12,11 @@ checkmk_var_test_sites:
     edition: "cme"
     site: "old_cme"
     port: "5323"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cre"
     site: "stable_cre"
     port: "5024"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cme"
     site: "stable_cme"
     port: "5324"
diff --git a/tests/integration/targets/host/vars/main.yml b/tests/integration/targets/host/vars/main.yml
index 8c7791997..772d17730 100644
--- a/tests/integration/targets/host/vars/main.yml
+++ b/tests/integration/targets/host/vars/main.yml
@@ -12,11 +12,11 @@ checkmk_var_test_sites:
     edition: "cme"
     site: "old_cme"
     port: "5323"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cre"
     site: "stable_cre"
     port: "5024"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cme"
     site: "stable_cme"
     port: "5324"
diff --git a/tests/integration/targets/host_group/vars/main.yml b/tests/integration/targets/host_group/vars/main.yml
index 61ca154b8..3dc069130 100644
--- a/tests/integration/targets/host_group/vars/main.yml
+++ b/tests/integration/targets/host_group/vars/main.yml
@@ -12,11 +12,11 @@ checkmk_var_test_sites:
     edition: "cme"
     site: "old_cme"
     port: "5323"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cre"
     site: "stable_cre"
     port: "5024"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cme"
     site: "stable_cme"
     port: "5324"
diff --git a/tests/integration/targets/lookup_bakery/vars/main.yml b/tests/integration/targets/lookup_bakery/vars/main.yml
index fb06e9a81..28a45486f 100644
--- a/tests/integration/targets/lookup_bakery/vars/main.yml
+++ b/tests/integration/targets/lookup_bakery/vars/main.yml
@@ -8,7 +8,7 @@ checkmk_var_test_sites:
     edition: "cme"
     site: "old_cme"
     port: "5323"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cme"
     site: "stable_cme"
     port: "5324"
diff --git a/tests/integration/targets/lookup_folder/vars/main.yml b/tests/integration/targets/lookup_folder/vars/main.yml
index 463c35129..8b0a269a5 100644
--- a/tests/integration/targets/lookup_folder/vars/main.yml
+++ b/tests/integration/targets/lookup_folder/vars/main.yml
@@ -12,11 +12,11 @@ checkmk_var_test_sites:
     edition: "cme"
     site: "old_cme"
     port: "5323"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cre"
     site: "stable_cre"
     port: "5024"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cme"
     site: "stable_cme"
     port: "5324"
diff --git a/tests/integration/targets/lookup_folders/vars/main.yml b/tests/integration/targets/lookup_folders/vars/main.yml
index 8943e029d..7226c33bd 100644
--- a/tests/integration/targets/lookup_folders/vars/main.yml
+++ b/tests/integration/targets/lookup_folders/vars/main.yml
@@ -12,11 +12,11 @@ checkmk_var_test_sites:
     edition: "cme"
     site: "old_cme"
     port: "5323"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cre"
     site: "stable_cre"
     port: "5024"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cme"
     site: "stable_cme"
     port: "5324"
diff --git a/tests/integration/targets/lookup_host/vars/main.yml b/tests/integration/targets/lookup_host/vars/main.yml
index 98f6bfd0c..2fdcd47bd 100644
--- a/tests/integration/targets/lookup_host/vars/main.yml
+++ b/tests/integration/targets/lookup_host/vars/main.yml
@@ -12,11 +12,11 @@ checkmk_var_test_sites:
     edition: "cme"
     site: "old_cme"
     port: "5323"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cre"
     site: "stable_cre"
     port: "5024"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cme"
     site: "stable_cme"
     port: "5324"
diff --git a/tests/integration/targets/lookup_hosts/vars/main.yml b/tests/integration/targets/lookup_hosts/vars/main.yml
index 098222c92..4bda64fc9 100644
--- a/tests/integration/targets/lookup_hosts/vars/main.yml
+++ b/tests/integration/targets/lookup_hosts/vars/main.yml
@@ -12,11 +12,11 @@ checkmk_var_test_sites:
     edition: "cme"
     site: "old_cme"
     port: "5323"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cre"
     site: "stable_cre"
     port: "5024"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cme"
     site: "stable_cme"
     port: "5324"
diff --git a/tests/integration/targets/lookup_rules/vars/main.yml b/tests/integration/targets/lookup_rules/vars/main.yml
index 08e27e912..9b0e1ce77 100644
--- a/tests/integration/targets/lookup_rules/vars/main.yml
+++ b/tests/integration/targets/lookup_rules/vars/main.yml
@@ -12,11 +12,11 @@ checkmk_var_test_sites:
     edition: "cme"
     site: "old_cme"
     port: "5323"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cre"
     site: "stable_cre"
     port: "5024"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cme"
     site: "stable_cme"
     port: "5324"
diff --git a/tests/integration/targets/lookup_rulesets/vars/main.yml b/tests/integration/targets/lookup_rulesets/vars/main.yml
index 533f808ed..a13064ce2 100644
--- a/tests/integration/targets/lookup_rulesets/vars/main.yml
+++ b/tests/integration/targets/lookup_rulesets/vars/main.yml
@@ -12,11 +12,11 @@ checkmk_var_test_sites:
     edition: "cme"
     site: "old_cme"
     port: "5323"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cre"
     site: "stable_cre"
     port: "5024"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cme"
     site: "stable_cme"
     port: "5324"
diff --git a/tests/integration/targets/lookup_site/vars/main.yml b/tests/integration/targets/lookup_site/vars/main.yml
index 014cde424..e20bea8c2 100644
--- a/tests/integration/targets/lookup_site/vars/main.yml
+++ b/tests/integration/targets/lookup_site/vars/main.yml
@@ -12,11 +12,11 @@ checkmk_var_test_sites:
     edition: "cme"
     site: "old_cme"
     port: "5323"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cre"
     site: "stable_cre"
     port: "5024"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cme"
     site: "stable_cme"
     port: "5324"
diff --git a/tests/integration/targets/lookup_sites/vars/main.yml b/tests/integration/targets/lookup_sites/vars/main.yml
index 014cde424..e20bea8c2 100644
--- a/tests/integration/targets/lookup_sites/vars/main.yml
+++ b/tests/integration/targets/lookup_sites/vars/main.yml
@@ -12,11 +12,11 @@ checkmk_var_test_sites:
     edition: "cme"
     site: "old_cme"
     port: "5323"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cre"
     site: "stable_cre"
     port: "5024"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cme"
     site: "stable_cme"
     port: "5324"
diff --git a/tests/integration/targets/lookup_version/vars/main.yml b/tests/integration/targets/lookup_version/vars/main.yml
index 014cde424..e20bea8c2 100644
--- a/tests/integration/targets/lookup_version/vars/main.yml
+++ b/tests/integration/targets/lookup_version/vars/main.yml
@@ -12,11 +12,11 @@ checkmk_var_test_sites:
     edition: "cme"
     site: "old_cme"
     port: "5323"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cre"
     site: "stable_cre"
     port: "5024"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cme"
     site: "stable_cme"
     port: "5324"
diff --git a/tests/integration/targets/password/vars/main.yml b/tests/integration/targets/password/vars/main.yml
index ca05fa2bd..7a813d209 100644
--- a/tests/integration/targets/password/vars/main.yml
+++ b/tests/integration/targets/password/vars/main.yml
@@ -12,11 +12,11 @@ checkmk_var_test_sites:
     edition: "cme"
     site: "old_cme"
     port: "5323"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cre"
     site: "stable_cre"
     port: "5024"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cme"
     site: "stable_cme"
     port: "5324"
diff --git a/tests/integration/targets/rule/vars/main.yml b/tests/integration/targets/rule/vars/main.yml
index 014cde424..e20bea8c2 100644
--- a/tests/integration/targets/rule/vars/main.yml
+++ b/tests/integration/targets/rule/vars/main.yml
@@ -12,11 +12,11 @@ checkmk_var_test_sites:
     edition: "cme"
     site: "old_cme"
     port: "5323"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cre"
     site: "stable_cre"
     port: "5024"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cme"
     site: "stable_cme"
     port: "5324"
diff --git a/tests/integration/targets/service_group/vars/main.yml b/tests/integration/targets/service_group/vars/main.yml
index 3a58ffff6..2eb5ff537 100644
--- a/tests/integration/targets/service_group/vars/main.yml
+++ b/tests/integration/targets/service_group/vars/main.yml
@@ -12,11 +12,11 @@ checkmk_var_test_sites:
     edition: "cme"
     site: "old_cme"
     port: "5323"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cre"
     site: "stable_cre"
     port: "5024"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cme"
     site: "stable_cme"
     port: "5324"
diff --git a/tests/integration/targets/site/vars/main.yml b/tests/integration/targets/site/vars/main.yml
index c50496377..872346fa0 100644
--- a/tests/integration/targets/site/vars/main.yml
+++ b/tests/integration/targets/site/vars/main.yml
@@ -48,7 +48,7 @@ checkmk_var_test_sites:
         authentication:
           username: "{{ checkmk_var_automation_user }}"
           password: "{{ checkmk_var_automation_secret }}"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cre"
     site: "stable_cre"
     port: "5024"
@@ -78,7 +78,7 @@ checkmk_var_test_sites:
         authentication:
           username: "{{ checkmk_var_automation_user }}"
           password: "{{ checkmk_var_automation_secret }}"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cme"
     site: "stable_cme"
     port: "5323"
diff --git a/tests/integration/targets/tag_group/vars/main.yml b/tests/integration/targets/tag_group/vars/main.yml
index 8ca3e671f..354ea77eb 100644
--- a/tests/integration/targets/tag_group/vars/main.yml
+++ b/tests/integration/targets/tag_group/vars/main.yml
@@ -12,11 +12,11 @@ checkmk_var_test_sites:
     edition: "cme"
     site: "old_cme"
     port: "5323"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cre"
     site: "stable_cre"
     port: "5024"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cme"
     site: "stable_cme"
     port: "5324"
diff --git a/tests/integration/targets/timeperiod/vars/main.yml b/tests/integration/targets/timeperiod/vars/main.yml
index 47e06df83..0e00e67bf 100644
--- a/tests/integration/targets/timeperiod/vars/main.yml
+++ b/tests/integration/targets/timeperiod/vars/main.yml
@@ -12,11 +12,11 @@ checkmk_var_test_sites:
     edition: "cme"
     site: "old_cme"
     port: "5323"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cre"
     site: "stable_cre"
     port: "5024"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cme"
     site: "stable_cme"
     port: "5324"
diff --git a/tests/integration/targets/user/vars/main.yml b/tests/integration/targets/user/vars/main.yml
index ae21d783a..7e0cd8ee3 100644
--- a/tests/integration/targets/user/vars/main.yml
+++ b/tests/integration/targets/user/vars/main.yml
@@ -12,11 +12,11 @@ checkmk_var_test_sites:
     edition: "cme"
     site: "old_cme"
     port: "5323"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cre"
     site: "stable_cre"
     port: "5024"
-  - version: "2.4.0p15"
+  - version: "2.4.0p16"
     edition: "cme"
     site: "stable_cme"
     port: "5324"