diff --git a/roles/agent/README.md b/roles/agent/README.md
index 0224316fe..9b115a839 100644
--- a/roles/agent/README.md
+++ b/roles/agent/README.md
@@ -16,7 +16,7 @@ Please make sure it is installed on your system and available for Ansible.
 
 ## Role Variables
 
-    checkmk_agent_version: "2.3.0p13"
+    checkmk_agent_version: "2.3.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 37822dbb3..3b0eb0720 100644
--- a/roles/agent/defaults/main.yml
+++ b/roles/agent/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-checkmk_agent_version: "2.3.0p13"
+checkmk_agent_version: "2.3.0p16"
 checkmk_agent_edition: 'cre'
 checkmk_agent_server_protocol: 'http'
 checkmk_agent_server: 'localhost'
diff --git a/roles/agent/molecule/2.2.0/group_vars/all.yml b/roles/agent/molecule/2.2.0/group_vars/all.yml
index 7f4c94d44..6392a4b1c 100644
--- a/roles/agent/molecule/2.2.0/group_vars/all.yml
+++ b/roles/agent/molecule/2.2.0/group_vars/all.yml
@@ -1,6 +1,6 @@
 ---
 # General
-checkmk_var_version: "2.2.0p32"
+checkmk_var_version: "2.2.0p33"
 checkmk_var_edition: "cre"
 checkmk_var_checkmk_site: "mysite"
 checkmk_var_automation_user: "cmkadmin"
diff --git a/roles/agent/molecule/2.3.0/group_vars/all.yml b/roles/agent/molecule/2.3.0/group_vars/all.yml
index 1c8b0ee95..bba9efc67 100644
--- a/roles/agent/molecule/2.3.0/group_vars/all.yml
+++ b/roles/agent/molecule/2.3.0/group_vars/all.yml
@@ -1,6 +1,6 @@
 ---
 # General
-checkmk_var_version: "2.3.0p13"
+checkmk_var_version: "2.3.0p16"
 checkmk_var_edition: "cre"
 checkmk_var_checkmk_site: "mysite"
 checkmk_var_automation_user: "cmkadmin"
diff --git a/roles/server/README.md b/roles/server/README.md
index 9dbf12eda..a3ac83e38 100644
--- a/roles/server/README.md
+++ b/roles/server/README.md
@@ -25,7 +25,7 @@ To learn about the distributions used in automated tests, inspect the correspond
 
 ## Role Variables
 
-    checkmk_server_version: "2.3.0p13"
+    checkmk_server_version: "2.3.0p16"
 
 The global Checkmk version. This is used for installing Checkmk.
 To manage sites and their version, see `checkmk_server_sites`.
diff --git a/roles/server/defaults/main.yml b/roles/server/defaults/main.yml
index 43c91c41e..1f534e26e 100644
--- a/roles/server/defaults/main.yml
+++ b/roles/server/defaults/main.yml
@@ -25,7 +25,7 @@ checkmk_server_server_stable_os:
   - Ubuntu-22
   - Ubuntu-24
 
-checkmk_server_version: "2.3.0p13"
+checkmk_server_version: "2.3.0p16"
 checkmk_server_edition: 'cre'
 checkmk_server_verify_setup: 'true'
 
diff --git a/roles/server/molecule/2.2.0/group_vars/all.yml b/roles/server/molecule/2.2.0/group_vars/all.yml
index 30262e8d8..701811823 100644
--- a/roles/server/molecule/2.2.0/group_vars/all.yml
+++ b/roles/server/molecule/2.2.0/group_vars/all.yml
@@ -1,6 +1,6 @@
 ---
 # General
-checkmk_var_version: "2.2.0p32"
+checkmk_var_version: "2.2.0p33"
 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.3.0/group_vars/all.yml b/roles/server/molecule/2.3.0/group_vars/all.yml
index fa447dde0..4f9d1512a 100644
--- a/roles/server/molecule/2.3.0/group_vars/all.yml
+++ b/roles/server/molecule/2.3.0/group_vars/all.yml
@@ -1,6 +1,6 @@
 ---
 # General
-checkmk_var_version: "2.3.0p13"
+checkmk_var_version: "2.3.0p16"
 checkmk_var_edition: "cre"
 checkmk_server_verify_setup: 'true'
 checkmk_var_server_url: "http://127.0.0.1/"
diff --git a/scripts/release.sh b/scripts/release.sh
index d21860a1e..c7b3235a0 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -16,8 +16,8 @@ collection_dir="${script_dir%/*}"
 
 # Update these as necessary:
 checkmk_ancient="2.1.0p47"
-checkmk_oldstable="2.2.0p32"
-checkmk_stable="2.3.0p13"
+checkmk_oldstable="2.2.0p33"
+checkmk_stable="2.3.0p16"
 
 while getopts 's:t:' OPTION; do
   case "$OPTION" in
diff --git a/tests/integration/targets/activation/vars/main.yml b/tests/integration/targets/activation/vars/main.yml
index f158a0e52..0e75a58cf 100644
--- a/tests/integration/targets/activation/vars/main.yml
+++ b/tests/integration/targets/activation/vars/main.yml
@@ -1,12 +1,12 @@
 ---
 test_sites:
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.2.0p32"
+  - version: "2.2.0p33"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p47"
diff --git a/tests/integration/targets/bakery/vars/main.yml b/tests/integration/targets/bakery/vars/main.yml
index ac7cff7fe..b9a5c87f8 100644
--- a/tests/integration/targets/bakery/vars/main.yml
+++ b/tests/integration/targets/bakery/vars/main.yml
@@ -1,9 +1,9 @@
 ---
 test_sites:
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.2.0p32"
+  - version: "2.2.0p33"
     edition: "cee"
     site: "old_cee"
   # - version: "2.1.0p47"
diff --git a/tests/integration/targets/contact_group/vars/main.yml b/tests/integration/targets/contact_group/vars/main.yml
index 10350bf54..3e0b2007d 100644
--- a/tests/integration/targets/contact_group/vars/main.yml
+++ b/tests/integration/targets/contact_group/vars/main.yml
@@ -1,15 +1,15 @@
 ---
 test_sites:
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cme"
     site: "stable_cme"
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p32"
+  - version: "2.2.0p33"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p47"
diff --git a/tests/integration/targets/discovery/vars/main.yml b/tests/integration/targets/discovery/vars/main.yml
index b8dbfef02..358eb4ef8 100644
--- a/tests/integration/targets/discovery/vars/main.yml
+++ b/tests/integration/targets/discovery/vars/main.yml
@@ -1,12 +1,12 @@
 ---
 test_sites:
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p32"
+  - version: "2.2.0p33"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p47"
diff --git a/tests/integration/targets/downtime/vars/main.yml b/tests/integration/targets/downtime/vars/main.yml
index c4d73cd6e..91b814bab 100644
--- a/tests/integration/targets/downtime/vars/main.yml
+++ b/tests/integration/targets/downtime/vars/main.yml
@@ -1,12 +1,12 @@
 ---
 test_sites:
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p32"
+  - version: "2.2.0p33"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p47"
diff --git a/tests/integration/targets/folder/vars/main.yml b/tests/integration/targets/folder/vars/main.yml
index e95ae93f3..76e18d21d 100644
--- a/tests/integration/targets/folder/vars/main.yml
+++ b/tests/integration/targets/folder/vars/main.yml
@@ -1,12 +1,12 @@
 ---
 test_sites:
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p32"
+  - version: "2.2.0p33"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p47"
diff --git a/tests/integration/targets/host/vars/main.yml b/tests/integration/targets/host/vars/main.yml
index ae003bd9c..5e5afff87 100644
--- a/tests/integration/targets/host/vars/main.yml
+++ b/tests/integration/targets/host/vars/main.yml
@@ -1,12 +1,12 @@
 ---
 test_sites:
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.2.0p32"
+  - version: "2.2.0p33"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p47"
diff --git a/tests/integration/targets/host_group/vars/main.yml b/tests/integration/targets/host_group/vars/main.yml
index e8965f3a2..c000bb715 100644
--- a/tests/integration/targets/host_group/vars/main.yml
+++ b/tests/integration/targets/host_group/vars/main.yml
@@ -1,15 +1,15 @@
 ---
 test_sites:
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cme"
     site: "stable_cme"
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p32"
+  - version: "2.2.0p33"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p47"
diff --git a/tests/integration/targets/lookup_bakery/vars/main.yml b/tests/integration/targets/lookup_bakery/vars/main.yml
index 996a79994..04b596ee3 100644
--- a/tests/integration/targets/lookup_bakery/vars/main.yml
+++ b/tests/integration/targets/lookup_bakery/vars/main.yml
@@ -1,9 +1,9 @@
 ---
 test_sites:
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.2.0p32"
+  - version: "2.2.0p33"
     edition: "cee"
     site: "old_cee"
   # - version: "2.1.0p47"
diff --git a/tests/integration/targets/lookup_folder/vars/main.yml b/tests/integration/targets/lookup_folder/vars/main.yml
index a49337ac7..6ee3d1eba 100644
--- a/tests/integration/targets/lookup_folder/vars/main.yml
+++ b/tests/integration/targets/lookup_folder/vars/main.yml
@@ -1,12 +1,12 @@
 ---
 test_sites:
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p32"
+  - version: "2.2.0p33"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p47"
diff --git a/tests/integration/targets/lookup_folders/vars/main.yml b/tests/integration/targets/lookup_folders/vars/main.yml
index 0042d466e..c30e1aad6 100644
--- a/tests/integration/targets/lookup_folders/vars/main.yml
+++ b/tests/integration/targets/lookup_folders/vars/main.yml
@@ -1,12 +1,12 @@
 ---
 test_sites:
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p32"
+  - version: "2.2.0p33"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p47"
diff --git a/tests/integration/targets/lookup_host/vars/main.yml b/tests/integration/targets/lookup_host/vars/main.yml
index 27b310ada..c17baa766 100644
--- a/tests/integration/targets/lookup_host/vars/main.yml
+++ b/tests/integration/targets/lookup_host/vars/main.yml
@@ -1,12 +1,12 @@
 ---
 test_sites:
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p32"
+  - version: "2.2.0p33"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p47"
diff --git a/tests/integration/targets/lookup_hosts/vars/main.yml b/tests/integration/targets/lookup_hosts/vars/main.yml
index 9fb8a1860..a7b3ff603 100644
--- a/tests/integration/targets/lookup_hosts/vars/main.yml
+++ b/tests/integration/targets/lookup_hosts/vars/main.yml
@@ -1,12 +1,12 @@
 ---
 test_sites:
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p32"
+  - version: "2.2.0p33"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p47"
diff --git a/tests/integration/targets/lookup_rules/vars/main.yml b/tests/integration/targets/lookup_rules/vars/main.yml
index 7a7175ae6..9b7cb9a38 100644
--- a/tests/integration/targets/lookup_rules/vars/main.yml
+++ b/tests/integration/targets/lookup_rules/vars/main.yml
@@ -1,12 +1,12 @@
 ---
 test_sites:
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p32"
+  - version: "2.2.0p33"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p47"
diff --git a/tests/integration/targets/lookup_rulesets/vars/main.yml b/tests/integration/targets/lookup_rulesets/vars/main.yml
index 8e83b3a5c..8b036d74f 100644
--- a/tests/integration/targets/lookup_rulesets/vars/main.yml
+++ b/tests/integration/targets/lookup_rulesets/vars/main.yml
@@ -1,12 +1,12 @@
 ---
 test_sites:
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p32"
+  - version: "2.2.0p33"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p47"
diff --git a/tests/integration/targets/lookup_version/vars/main.yml b/tests/integration/targets/lookup_version/vars/main.yml
index ea6c78d46..92d296aeb 100644
--- a/tests/integration/targets/lookup_version/vars/main.yml
+++ b/tests/integration/targets/lookup_version/vars/main.yml
@@ -1,12 +1,12 @@
 ---
 test_sites:
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p32"
+  - version: "2.2.0p33"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p47"
diff --git a/tests/integration/targets/password/vars/main.yml b/tests/integration/targets/password/vars/main.yml
index d519fe7e7..abeb1e026 100644
--- a/tests/integration/targets/password/vars/main.yml
+++ b/tests/integration/targets/password/vars/main.yml
@@ -1,15 +1,15 @@
 ---
 test_sites:
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cme"
     site: "stable_cme"
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p32"
+  - version: "2.2.0p33"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p47"
diff --git a/tests/integration/targets/rule/vars/main.yml b/tests/integration/targets/rule/vars/main.yml
index ea6c78d46..92d296aeb 100644
--- a/tests/integration/targets/rule/vars/main.yml
+++ b/tests/integration/targets/rule/vars/main.yml
@@ -1,12 +1,12 @@
 ---
 test_sites:
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p32"
+  - version: "2.2.0p33"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p47"
diff --git a/tests/integration/targets/service_group/vars/main.yml b/tests/integration/targets/service_group/vars/main.yml
index d54df359f..0df9f5548 100644
--- a/tests/integration/targets/service_group/vars/main.yml
+++ b/tests/integration/targets/service_group/vars/main.yml
@@ -1,15 +1,15 @@
 ---
 test_sites:
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cme"
     site: "stable_cme"
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p32"
+  - version: "2.2.0p33"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p47"
diff --git a/tests/integration/targets/tag_group/vars/main.yml b/tests/integration/targets/tag_group/vars/main.yml
index cf9f0fefc..3ef4c9e51 100644
--- a/tests/integration/targets/tag_group/vars/main.yml
+++ b/tests/integration/targets/tag_group/vars/main.yml
@@ -1,15 +1,15 @@
 ---
 test_sites:
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cme"
     site: "stable_cme"
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p32"
+  - version: "2.2.0p33"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p47"
diff --git a/tests/integration/targets/timeperiod/vars/main.yml b/tests/integration/targets/timeperiod/vars/main.yml
index 9988f6f89..2621f5b96 100644
--- a/tests/integration/targets/timeperiod/vars/main.yml
+++ b/tests/integration/targets/timeperiod/vars/main.yml
@@ -1,12 +1,12 @@
 ---
 test_sites:
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p32"
+  - version: "2.2.0p33"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p47"
diff --git a/tests/integration/targets/user/vars/main.yml b/tests/integration/targets/user/vars/main.yml
index dc9fff609..d57f0da93 100644
--- a/tests/integration/targets/user/vars/main.yml
+++ b/tests/integration/targets/user/vars/main.yml
@@ -1,15 +1,15 @@
 ---
 test_sites:
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cme"
     site: "stable_cme"
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p13"
+  - version: "2.3.0p16"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p32"
+  - version: "2.2.0p33"
     edition: "cre"
     site: "old_cre"
   # - version: "2.1.0p47"