diff --git a/.gitignore b/.gitignore
index b0cb459d1..2effe2425 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,9 +10,4 @@ build/
 tests/output
 playbooks/vars/config.yml
 playbooks/test*.yml
-playbooks/hosts
-playbooks/hosts.bak
-venv/
-Vagrantfile
-Vagrantfile.bak
-venv
\ No newline at end of file
+venv/
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 173026ad6..69669c829 100644
--- a/Makefile
+++ b/Makefile
@@ -12,17 +12,11 @@ CONTAINER_NAME="ansible-checkmk-test"
 help:
 	@echo "setup           			- Run all setup target at once."
 	@echo ""
-	@echo "setup-python    			- Prepare the system for development with Python."
+	@echo "python	    			- Prepare the system for development with Python."
 	@echo ""
-	@echo "setup-kvm       			- Install and enable KVM and prepare Vagrant."
+	@echo "kvm			       		- Install and enable KVM."
 	@echo ""
-	@echo "kvm             			- Only copy the correct Vagrantfile for use with KVM."
-	@echo ""
-	@echo "setup-vbox 	     		- Copy the correct Vagrantfile for use with VirtualBox."
-	@echo ""
-	@echo "vbox 	           		- Copy the correct Vagrantfile for use with VirtualBox."
-	@echo ""
-	@echo "setup-vagrant   			- Install and enable Vagrant."
+	@echo "vagrant   				- Install and enable Vagrant."
 	@echo ""
 	@echo "venv		       			- Install Python Virtual Environment. You need to activate it yourself though!"
 	@echo ""
@@ -61,9 +55,9 @@ version:
 	@newversion=$$(dialog --stdout --inputbox "New Version:" 0 0 "$(VERSION)") ; \
 	if [ -n "$$newversion" ] ; then ./scripts/release.sh -s "$(VERSION)" -t $$newversion ; fi
 
-setup: setup-python setup-kvm
+setup: setup-python kvm vagrant
 
-setup-python:
+python:
 	@sudo apt-get -y update --quiet
 	@sudo apt-get -y install -y \
 		python3-pip \
@@ -76,36 +70,21 @@ setup-python:
 	@python3 -m pip install -r requirements.txt
 
 kvm:
-	if [ -f Vagrantfile ] ; then cp Vagrantfile Vagrantfile.bak ; fi
-	cp Vagrantfile.kvm Vagrantfile
-	if [ -f playbooks/hosts ] ; then cp playbooks/hosts playbooks/hosts.bak ; fi
-	cp playbooks/hosts.kvm playbooks/hosts
-
-setup-kvm: kvm
 	@sudo apt update -y
 	@sudo apt install -y \
 		virt-manager \
 		qemu-kvm \
 		libvirt-clients \
 		libvirt-daemon-system \
-		bridge-utils \--build-arg DL_PW=$$(cat .secret)
+		bridge-utils \
 		libvirt-daemon\
 		libvirt-dev \
 		libxslt-dev \
 		libxml2-dev \
 		zlib1g-dev
 	@sudo systemctl enable --now libvirtd
-	@vagrant plugin install vagrant-libvirt
 
-vbox:
-	if [ -f Vagrantfile ] ; then cp Vagrantfile Vagrantfile.bak ; fi
-	cp Vagrantfile.vbox Vagrantfile
-	if [ -f playbooks/hosts ] ; then cp playbooks/hosts playbooks/hosts.bak ; fi
-	cp playbooks/hosts.vbox playbooks/hosts
-
-setup-vbox: vbox
-
-setup-vagrant:
+vagrant:
 	@sudo apt update -y
 	@sudo apt install -y \
 		apt-transport-https \
@@ -121,15 +100,16 @@ setup-vagrant:
 
 venv:
 	@python3 -m venv venv
+	@(. venv/bin/activate && python3 -m pip install pip --upgrade && python3 -m pip install -r requirements.txt)
 	@echo
 	@echo "Run the following command to actually activate the venv!"
 	@echo ". venv/bin/activate"
 	@echo
-	@(. venv/bin/activate && python3 -m pip install pip --upgrade && python3 -m pip install -r requirements.txt)
 
 clean:
 	@rm -rf .tox/
-	@rm -rf venv/
+	@rm -rf ./venv/
+	@rm -rf ./tests/output/*
 	@vagrant destroy --force
 
 vm:
diff --git a/README.md b/README.md
index a30917f75..891e52658 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,7 @@ This is an open source endeavour, on which we want to collaborate with the commu
 ## Dependencies
 
  - [ansible.posix](https://github.com/ansible-collections/ansible.posix)
+ - [ansible.utils](https://github.com/ansible-collections/ansible.utils)
  - [community.general](https://github.com/ansible-collections/community.general)
 
 Although the Ansible project notes, that collections should have no or very little dependencies, we want to make sure the  collection works for you out-of-the-box. Currently we only depend on very basic collections, which are most likely already installed in your environment. For version constraints, see [galaxy.yml](galaxy.yml).
diff --git a/SUPPORT.md b/SUPPORT.md
index deae1ffb1..39385e581 100644
--- a/SUPPORT.md
+++ b/SUPPORT.md
@@ -55,3 +55,4 @@ Collection Version | Checkmk Versions | Ansible Versions | Remarks
 4.4.1 | 2.0.0p39, 2.1.0p41, 2.2.0p24 | 2.14, 2.15, 2.16 | None
 5.0.0 | 2.1.0p44, 2.2.0p27, 2.3.0p5 | 2.15, 2.16, 2.17 | Breaking changes to the following modules: `lookup_folder`, `rule` and role: `agent`.
 5.1.0 | 2.1.0p44, 2.2.0p27, 2.3.0p6 | 2.15, 2.16, 2.17 | None
+5.2.0 | 2.1.0p46, 2.2.0p31, 2.3.0p11 | 2.15, 2.16, 2.17 | None
diff --git a/Vagrantfile.kvm b/Vagrantfile
similarity index 100%
rename from Vagrantfile.kvm
rename to Vagrantfile
diff --git a/Vagrantfile.vbox b/Vagrantfile.vbox
deleted file mode 100644
index 2adc51dae..000000000
--- a/Vagrantfile.vbox
+++ /dev/null
@@ -1,145 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-# All Vagrant configuration is done below. The "2" in Vagrant.configure
-# configures the configuration version (we support older styles for
-# backwards compatibility). Please don't change it unless you know what
-# you're doing.
-Vagrant.configure("2") do |config|
-
-  # We are using boxes from here: https://app.vagrantup.com/generic
-
-  # Main Box
-  config.vm.define "collection", primary: true do |srv|
-    srv.vm.box = "ubuntu/jammy64"
-    srv.vm.network "private_network", ip: "192.168.56.42"
-    srv.ssh.insert_key = false
-    srv.vm.provider "virtualbox" do |v|
-      v.name = 'collection'
-      v.memory = 8096
-      v.cpus = 4
-    end
-    $script = <<-SCRIPT
-    apt-get -y update --quiet
-    apt-get -y install python3-pip ca-certificates curl gnupg lsb-release qemu-guest-agent
-    sudo -u vagrant python3 -m pip install pip --upgrade
-    sudo -u vagrant python3 -m pip install -r /home/vagrant/ansible_collections/checkmk/general/requirements.txt
-    sudo -u vagrant python3 -m pip install -r /home/vagrant/ansible_collections/checkmk/general/requirements-qa.txt
-    sudo -u vagrant ansible-galaxy collection install -f -r /home/vagrant/ansible_collections/checkmk/general/requirements.yml
-    mkdir -p /home/vagrant/ansible_collections/checkmk/general
-    mkdir -p /etc/apt/keyrings
-    curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
-    echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
-    apt-get update
-    apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
-    usermod -aG docker vagrant
-    grep "alias ic=" /home/vagrant/.bashrc || echo "alias ic='ansible-galaxy collection build --force ~/ansible_collections/checkmk/general && ansible-galaxy collection install -f ./checkmk-general-*.tar.gz && rm ./checkmk-general-*.tar.gz'" >> /home/vagrant/.bashrc
-    grep "alias ap=" /home/vagrant/.bashrc || echo "alias ap='ansible-playbook -i vagrant, '" >> /home/vagrant/.bashrc
-    hostnamectl set-hostname collection
-    SCRIPT
-    srv.vm.provision "shell", inline: $script
-    srv.vm.synced_folder "./", "/home/vagrant/ansible_collections/checkmk/general/"
-  end
-
-  # Ubuntu
-  config.vm.define "ansibuntu", autostart: false , primary: false do |srv|
-    srv.vm.box = "ubuntu/jammy64"
-    srv.vm.network "private_network", ip: "192.168.56.61"
-    srv.ssh.insert_key = false
-    srv.vm.provider "virtualbox" do |v|
-      v.name = 'ansibuntu'
-      v.memory = 2048
-      v.cpus = 2
-    end
-    srv.vm.provision "shell",
-          inline: "apt-get -y update --quiet && apt-get -y install vim htop curl wget git"
-  end
-
-  # Debian
-  config.vm.define "debsible", autostart: false , primary: false do |srv|
-    srv.vm.box = "debian/bookworm64"
-    srv.vm.network "private_network", ip: "192.168.56.62"
-    srv.ssh.insert_key = false
-    srv.vm.provider "virtualbox" do |v|
-      v.name = 'debsible'
-      v.memory = 2048
-      v.cpus = 2
-    end
-    srv.vm.provision "shell",
-      inline: "apt-get -y update --quiet && apt-get -y install vim htop curl wget git"
-  end
-
-  # CentOS Stream
-  config.vm.define "anstream", autostart: false , primary: false do |srv|
-    srv.vm.box = "generic/centos9s"
-    srv.vm.network "private_network", ip: "192.168.56.63"
-    srv.ssh.insert_key = false
-    srv.vm.provider "virtualbox" do |v|
-      v.name = 'anstream'
-      v.memory = 2048
-      v.cpus = 2
-    end
-    srv.vm.provision "shell",
-      inline: "dnf --quiet check-update ; dnf -y install vim curl wget git"
-  end
-
-  # openSUSE
-  config.vm.define "ansuse", autostart: false , primary: false do |srv|
-    srv.vm.box = "opensuse/Tumbleweed.x86_64"
-    srv.vm.network "private_network", ip: "192.168.56.64"
-    srv.ssh.insert_key = false
-    srv.vm.provider "virtualbox" do |v|
-      v.name = 'ansuse'
-      v.memory = 2048
-      v.cpus = 2
-    end
-    srv.vm.provision "shell",
-      inline: "zypper --quiet up -y"
-  end
-
-  # SLES15
-  config.vm.define "ansles", autostart: false , primary: false do |srv|
-    srv.vm.box = "saltstack/cicd-sles15"
-    srv.vm.network "private_network", ip: "192.168.56.65"
-    srv.ssh.insert_key = false
-    srv.vm.provider "virtualbox" do |v|
-      v.name = 'ansles'
-      v.memory = 2048
-      v.cpus = 2
-    end
-    srv.vm.provision "shell",
-      inline: "zypper --quiet up -y"
-  end
-
-
-  # Oracle Linux
-  config.vm.define "ansoracle", autostart: false , primary: false do |srv|
-    srv.vm.box = "generic/oracle8"
-    srv.vm.network "private_network", ip: "192.168.56.66"
-    srv.ssh.insert_key = false
-    srv.vm.provider "virtualbox" do |v|
-      v.name = 'ansoracle'
-      v.memory = 2048
-      v.cpus = 2
-    end
-    srv.vm.provision "shell",
-      inline: "dnf --quiet check-update ; dnf -y install vim curl wget git"
-  end
-
-  # Windows
-  config.vm.define "ansidows", autostart: false , primary: false do |srv|
-    srv.vm.box = "gusztavvargadr/windows-server-2019-standard"
-    srv.vm.network "private_network", ip: "192.168.56.67"
-    srv.vm.communicator = "winrm"
-    srv.vm.hostname = "ansidows"
-    srv.vm.provider "virtualbox" do |srv|
-      srv.name = 'ansidows'
-      srv.memory = 4096
-      srv.cpus = 2
-      srv.gui = false
-    end
-    srv.vm.provision "shell",
-      inline: "powershell Set-NetFirewallRule -name 'FPS-ICMP4-ERQ-In*' -Enabled true"
-  end
-
-end
diff --git a/changelogs/fragments/agent.yaml b/changelogs/fragments/agent.yaml
new file mode 100644
index 000000000..20632980a
--- /dev/null
+++ b/changelogs/fragments/agent.yaml
@@ -0,0 +1,6 @@
+minor_changes:
+  - Agent role - Allow registration on mixed protocol environments.
+    This means the central and remote site do not both have to use either HTTP or HTTPS.
+
+bugfixes:
+  - Agent role - Fix registration in cases where a prior registration failed.
diff --git a/changelogs/fragments/build.yaml b/changelogs/fragments/build.yaml
new file mode 100644
index 000000000..892db6496
--- /dev/null
+++ b/changelogs/fragments/build.yaml
@@ -0,0 +1,5 @@
+minor_changes:
+  - The local development environment was cleaned up. We removed all traces of
+    VirtualBox and now exclusively use KVM/QEMU virtualization. This has no
+    effect on using the collection. It only affects you, if you develop for this
+    collection and used the `Vagrantfile` or `Makefile`.
diff --git a/changelogs/fragments/downtime.yaml b/changelogs/fragments/downtime.yaml
new file mode 100644
index 000000000..98dd9ab9e
--- /dev/null
+++ b/changelogs/fragments/downtime.yaml
@@ -0,0 +1,2 @@
+bugfixes:
+  - Downtime module - Downtimes are now correctly removed when only specifying a single service.
diff --git a/changelogs/fragments/release_summary.yaml b/changelogs/fragments/release_summary.yaml
new file mode 100644
index 000000000..76a0cceb2
--- /dev/null
+++ b/changelogs/fragments/release_summary.yaml
@@ -0,0 +1 @@
+release_summary: "Some bug fixing and a module update."
diff --git a/changelogs/fragments/tag_group.yaml b/changelogs/fragments/tag_group.yaml
new file mode 100644
index 000000000..294018027
--- /dev/null
+++ b/changelogs/fragments/tag_group.yaml
@@ -0,0 +1,5 @@
+minor_changes:
+  - Tag_group module - Enable module for Checkmk 2.4.0 by using
+    `id` instead of `ident` to identify tag groups and their tags.
+    See https://checkmk.com/werk/16364 for background information.
+  - Tag_group module - Migrate module to new collection API.
diff --git a/galaxy.yml b/galaxy.yml
index e9b440a07..0e90ffb39 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: 5.1.0
+version: 5.2.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/hosts.kvm b/playbooks/hosts
similarity index 100%
rename from playbooks/hosts.kvm
rename to playbooks/hosts
diff --git a/playbooks/hosts.vbox b/playbooks/hosts.vbox
deleted file mode 100644
index 8c0bee301..000000000
--- a/playbooks/hosts.vbox
+++ /dev/null
@@ -1,30 +0,0 @@
-[test]
-test1.tld checkmk_var_folder_path="/test"
-test2.tld checkmk_var_folder_path="/foo"
-test3.tld checkmk_var_folder_path="/bar"
-test4.tld checkmk_var_folder_path="/"
-test5.tld checkmk_var_folder_path="/foo/bar"
-
-[linux]
-ansibuntu ansible_host=192.168.56.61 checkmk_var_folder_path="/test"
-debsible ansible_host=192.168.56.62 checkmk_var_folder_path="/foo"
-anstream ansible_host=192.168.56.63 checkmk_var_folder_path="foo/bar"
-ansuse ansible_host=192.168.56.64 checkmk_var_folder_path="/bar"
-ansles ansible_host=192.168.56.65 checkmk_var_folder_path="/bar/foo"
-ansoracle ansible_host=192.168.56.66 checkmk_var_folder_path="/foo"
-
-[windows]
-ansidows ansible_host=192.168.56.67 checkmk_var_folder_path="/"
-
-[windows:vars]
-ansible_shell_type = cmd
-ansible_winrm_scheme = http
-ansible_winrm_transport = basic
-ansible_winrm_server_cert_validation = ignore
-
-[vagrant:children]
-linux
-windows
-
-[vagrant:vars]
-ansible_user=vagrant
diff --git a/playbooks/roles.yml b/playbooks/roles.yml
index 77928c8c0..161d5a2b4 100644
--- a/playbooks/roles.yml
+++ b/playbooks/roles.yml
@@ -8,6 +8,11 @@
 
   tasks:
 
+    - name: "Run server role."
+      tags: [server]
+      ansible.builtin.import_role:
+        name: server
+
     - name: "Create folders."
       tags: [agent]
       checkmk.general.folder:
@@ -23,11 +28,6 @@
       run_once: true  # noqa run-once[task]
       loop: "{{ checkmk_var_folders }}"
 
-    - name: "Run server role."
-      tags: [server]
-      ansible.builtin.import_role:
-        name: server
-
     - name: "Run agent role."
       tags: [agent]
       ansible.builtin.import_role:
diff --git a/playbooks/vars/rules.yml b/playbooks/vars/rules.yml
index 0f596b25b..f177a1404 100644
--- a/playbooks/vars/rules.yml
+++ b/playbooks/vars/rules.yml
@@ -18,81 +18,3 @@ checkmk_var_rules:
         "disabled": false
       }
       value_raw: "{'magic': 0.8}"
-
-  - name: "CPU - Load."
-    ruleset: "checkgroup_parameters:cpu_load"
-    rule:
-      location:
-        folder: "/"
-        position: "bottom"
-      conditions: {
-        "host_labels": [],
-        "host_tags": [],
-        "service_labels": []
-      }
-      properties: {
-        "comment": "{{ ansible_date_time.iso8601 }} - Ansible managed",
-        "description": "",
-        "disabled": false
-      }
-      value_raw: "{'levels': (1.0, 2.0)}"
-
-  - name: "CPU - Utilization."
-    ruleset: "checkgroup_parameters:cpu_iowait"
-    rule:
-      location:
-        folder: "/"
-        position: "bottom"
-      conditions: {
-        "host_labels": [],
-        "host_tags": [],
-        "service_labels": []
-      }
-      properties: {
-        "comment": "{{ ansible_date_time.iso8601 }} - Ansible managed",
-        "description": "",
-        "disabled": false
-      }
-      value_raw: "{'core_util_time': (100.0, 300, 900), 'core_util_time_total': (100.0, 300, 900)}"
-
-  - name: "Logwatch - Event Console Forwarding."
-    ruleset: "checkgroup_parameters:logwatch_ec"
-    rule:
-      location:
-        folder: "/"
-        position: "bottom"
-      conditions: {
-        "host_labels": [],
-        "host_tags": [],
-        "service_labels": []
-      }
-      properties: {
-        "comment": "{{ ansible_date_time.iso8601 }} - Ansible managed",
-        "description": "",
-        "disabled": false
-      }
-      value_raw: "{'facility': 17, 'method': '', 'monitor_logfilelist': False}"
-
-  - name: "Disable irrelevant Services."
-    ruleset: "ignored_services"
-    rule:
-      location:
-        folder: "/"
-        position: "bottom"
-      conditions: {
-        "host_labels": [],
-        "host_tags": [],
-        "service_labels": [],
-        "service_description": {
-          "match_on": [
-            "VBox Guest Additions"
-          ],
-          "operator": "one_of"
-        }
-      }
-      properties: {
-        "comment": "{{ ansible_date_time.iso8601 }} - Ansible managed",
-        "description": "",
-        "disabled": false
-      }
-      value_raw: "True"
diff --git a/plugins/modules/downtime.py b/plugins/modules/downtime.py
index 8ceb21c79..728fc0cf6 100644
--- a/plugins/modules/downtime.py
+++ b/plugins/modules/downtime.py
@@ -221,7 +221,10 @@ def _get_current_downtimes(module, base_url, headers):
                 )
             ]
         else:
-            filters = ['{"op": "~", "left": "service_description", "right": "%s"}']
+            filters = [
+                '{"op": "~", "left": "service_description", "right": "%s"}'
+                % service_descriptions[0]
+            ]
         filters.append('{"op": "=", "left": "is_service", "right": "1"}')
     else:
         filters.append('{"op": "=", "left": "is_service", "right": "0"}')
@@ -356,6 +359,7 @@ def remove_downtime(module, base_url, headers):
         else:
             query_filters.append(
                 '{"op": "~", "left": "service_description", "right": "%s"}'
+                % service_descriptions[0]
             )
 
     if len(current_downtimes) == 0:  # and comment is not None:
diff --git a/plugins/modules/tag_group.py b/plugins/modules/tag_group.py
index e3e21605d..5f3215f95 100644
--- a/plugins/modules/tag_group.py
+++ b/plugins/modules/tag_group.py
@@ -130,10 +130,9 @@
 from ansible_collections.checkmk.general.plugins.module_utils.utils import (
     result_as_dict,
 )
-
-# from ansible_collections.checkmk.general.plugins.module_utils.version import (
-#     CheckmkVersion,
-# )
+from ansible_collections.checkmk.general.plugins.module_utils.version import (
+    CheckmkVersion,
+)
 
 # We count 404 not as failed, because we want to know if the taggroup exists or not.
 HTTP_CODES_GET = {
@@ -142,29 +141,43 @@
 }
 
 
-def normalize_data(raw_data):
-    data = {
-        "title": raw_data.get("title", ""),
-        "topic": raw_data.get("topic", ""),
-        "help": raw_data.get("help", ""),
-        "tags": raw_data.get("tags", ""),
-        "repair": raw_data.get("repair"),
-    }
+class TaggroupAPI(CheckmkAPI):
+    def __init__(self, module):
+        super().__init__(module)
+
+        data = {}
+        # Get current taggroup
+        self.current = self._fetch(
+            code_mapping=HTTP_CODES_GET,
+            endpoint="/objects/host_tag_group/%s" % self.params.get("name"),
+            data=data,
+            method="GET",
+        )
+
+        # Get Checkmk-version
+        self.ver = self.getversion()
 
-    # Remove all keys without value, as they would be emptied.
-    data = {key: val for key, val in data.items() if val}
+    def normalize_data(self):
+        data = {
+            "title": self.params.get("title", ""),
+            "topic": self.params.get("topic", ""),
+            "help": self.params.get("help", ""),
+            "tags": self.params.get("tags", ""),
+            "repair": self.params.get("repair"),
+        }
 
-    # The API uses "ident" instead of "id" for the put & post endpoints
-    if "tags" in data:
-        for d in data["tags"]:
-            if "id" in d:
-                d["ident"] = d.pop("id")
+        # Remove all keys without value, as they would be emptied.
+        data = {key: val for key, val in data.items() if val}
 
-    return data
+        # The API uses "ident" instead of "id" for the put & post endpoints
+        if "tags" in data:
+            for d in data["tags"]:
+                if "id" in d and self.ver < CheckmkVersion("2.4.0"):
+                    d["ident"] = d.pop("id")
 
+        return data
 
-class TaggroupCreateAPI(CheckmkAPI):
-    def post(self):
+    def post(self):  # Create taggroup
         if not self.params.get("title") or not self.params.get("tags"):
             result = RESULT(
                 http_code=0,
@@ -177,8 +190,11 @@ def post(self):
             return result
 
         else:
-            data = normalize_data(self.params)
-            data["ident"] = self.params.get("name")
+            data = self.normalize_data()
+            if self.ver < CheckmkVersion("2.4.0"):
+                data["ident"] = self.params.get("name")
+            else:
+                data["id"] = self.params.get("name")
 
             return self._fetch(
                 endpoint="/domain-types/host_tag_group/collections/all",
@@ -186,10 +202,9 @@ def post(self):
                 method="POST",
             )
 
-
-class TaggroupUpdateAPI(CheckmkAPI):
-    def put(self):
-        data = normalize_data(self.params)
+    def put(self):  # Update taggroup
+        self.headers["If-Match"] = self.current.etag
+        data = self.normalize_data()
 
         return self._fetch(
             endpoint="/objects/host_tag_group/%s" % self.params.get("name"),
@@ -197,31 +212,14 @@ def put(self):
             method="PUT",
         )
 
-
-class TaggroupDeleteAPI(CheckmkAPI):
-    def delete(self):
-        data = {}
-
+    def delete(self):  # Remove taggroup
         return self._fetch(
             endpoint="/objects/host_tag_group/%s?repair=%s"
             % (self.params.get("name"), self.params.get("repair")),
-            # data=data,
             method="DELETE",
         )
 
 
-class TaggroupGetAPI(CheckmkAPI):
-    def get(self):
-        data = {}
-
-        return self._fetch(
-            code_mapping=HTTP_CODES_GET,
-            endpoint="/objects/host_tag_group/%s" % self.params.get("name"),
-            data=data,
-            method="GET",
-        )
-
-
 def changes_detected(module, current):
     if module.params.get("title") != current.get("title"):
         # The title has changed
@@ -286,38 +284,35 @@ def run_module():
         changed=False,
     )
 
-    taggroupget = TaggroupGetAPI(module)
-    current = taggroupget.get()
+    taggroup = TaggroupAPI(module)
 
     if module.params.get("state") == "present":
-        if current.http_code == 200:
+        if taggroup.current.http_code == 200:
             # If tag group has changed then update it.
-            if changes_detected(module, json.loads(current.content.decode("utf-8"))):
-                taggroupupdate = TaggroupUpdateAPI(module)
-                taggroupupdate.headers["If-Match"] = current.etag
-                result = taggroupupdate.put()
+            if changes_detected(
+                module, json.loads(taggroup.current.content.decode("utf-8"))
+            ):
+                result = taggroup.put()
 
                 time.sleep(3)
 
-        elif current.http_code == 404:
+        elif taggroup.current.http_code == 404:
             # Tag group is not there. Create it.
-            taggroupcreate = TaggroupCreateAPI(module)
 
-            result = taggroupcreate.post()
+            result = taggroup.post()
 
             time.sleep(3)
 
     if module.params.get("state") == "absent":
         # Only delete if the Taggroup exists
-        if current.http_code == 200:
-            taggroupdelete = TaggroupDeleteAPI(module)
-            result = taggroupdelete.delete()
+        if taggroup.current.http_code == 200:
+            result = taggroup.delete()
 
             time.sleep(3)
-        elif current.http_code == 404:
+        elif taggroup.current.http_code == 404:
             result = RESULT(
                 http_code=0,
-                msg="Taggroup doesn't exist.",
+                msg="Taggroup already absent.",
                 content="",
                 etag="",
                 failed=False,
diff --git a/roles/agent/README.md b/roles/agent/README.md
index bd968e348..046f73ccf 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.0p6"
+    checkmk_agent_version: "2.3.0p11"
 
 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 f9f349d4c..eee1ee160 100644
--- a/roles/agent/defaults/main.yml
+++ b/roles/agent/defaults/main.yml
@@ -1,9 +1,10 @@
 ---
-checkmk_agent_version: "2.3.0p6"
+checkmk_agent_version: "2.3.0p11"
 checkmk_agent_edition: cre
 checkmk_agent_server_protocol: http
 checkmk_agent_server: localhost
 checkmk_agent_site: mysite
+checkmk_agent_registration_server_protocol: "{{ checkmk_agent_server_protocol }}"
 checkmk_agent_registration_server: "{{ checkmk_agent_server }}"
 checkmk_agent_registration_site: "{{ checkmk_agent_site }}"
 checkmk_agent_server_validate_certs: 'true'
@@ -19,6 +20,7 @@ checkmk_agent_auto_activate: 'false'
 checkmk_agent_add_host: 'false'
 checkmk_agent_discover: 'false'
 checkmk_agent_discover_max_parallel_tasks: 0
+checkmk_agent_force_foreign_changes: 'false'
 checkmk_agent_update: 'false'
 checkmk_agent_tls: 'false'
 checkmk_agent_configure_firewall: 'true'
@@ -30,7 +32,6 @@ checkmk_agent_delegate_api_calls: localhost
 checkmk_agent_delegate_download: "{{ inventory_hostname }}"
 checkmk_agent_host_name: "{{ inventory_hostname }}"
 checkmk_agent_folder: "{{ checkmk_var_folder_path | default('/') }}"
-checkmk_agent_force_foreign_changes: 'false'
 checkmk_agent_host_attributes:
   ipaddress: "{{ checkmk_agent_host_ip | default(omit) }}"
 checkmk_agent_mode: pull
diff --git a/roles/agent/molecule/2.1.0/group_vars/all.yml b/roles/agent/molecule/2.1.0/group_vars/all.yml
index b7436414d..fde0ebf8e 100644
--- a/roles/agent/molecule/2.1.0/group_vars/all.yml
+++ b/roles/agent/molecule/2.1.0/group_vars/all.yml
@@ -1,6 +1,6 @@
 ---
 # General
-checkmk_var_version: "2.1.0p44"
+checkmk_var_version: "2.1.0p46"
 checkmk_var_edition: "cre"
 checkmk_var_checkmk_site: "mysite"
 checkmk_var_automation_user: "cmkadmin"
@@ -12,6 +12,7 @@ checkmk_agent_edition: "{{ checkmk_var_edition }}"
 checkmk_agent_server_protocol: http
 checkmk_agent_server: 127.0.0.1
 checkmk_agent_site: "{{ checkmk_var_checkmk_site }}"
+checkmk_agent_registration_server_protocol: "{{ checkmk_agent_server_protocol }}"
 checkmk_agent_registration_server: "{{ checkmk_agent_server }}"
 checkmk_agent_registration_site: "{{ checkmk_agent_site }}"
 checkmk_agent_server_validate_certs: 'false'
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 d6c2cb9b2..6024116f8 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.0p27"
+checkmk_var_version: "2.2.0p31"
 checkmk_var_edition: "cre"
 checkmk_var_checkmk_site: "mysite"
 checkmk_var_automation_user: "cmkadmin"
@@ -12,6 +12,7 @@ checkmk_agent_edition: "{{ checkmk_var_edition }}"
 checkmk_agent_server_protocol: http
 checkmk_agent_server: 127.0.0.1
 checkmk_agent_site: "{{ checkmk_var_checkmk_site }}"
+checkmk_agent_registration_server_protocol: "{{ checkmk_agent_server_protocol }}"
 checkmk_agent_registration_server: "{{ checkmk_agent_server }}"
 checkmk_agent_registration_site: "{{ checkmk_agent_site }}"
 checkmk_agent_server_validate_certs: 'false'
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 41080d2f3..f6e4ccda5 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.0p6"
+checkmk_var_version: "2.3.0p11"
 checkmk_var_edition: "cre"
 checkmk_var_checkmk_site: "mysite"
 checkmk_var_automation_user: "cmkadmin"
@@ -12,6 +12,7 @@ checkmk_agent_edition: "{{ checkmk_var_edition }}"
 checkmk_agent_server_protocol: http
 checkmk_agent_server: 127.0.0.1
 checkmk_agent_site: "{{ checkmk_var_checkmk_site }}"
+checkmk_agent_registration_server_protocol: "{{ checkmk_agent_server_protocol }}"
 checkmk_agent_registration_server: "{{ checkmk_agent_server }}"
 checkmk_agent_registration_site: "{{ checkmk_agent_site }}"
 checkmk_agent_server_validate_certs: 'false'
diff --git a/roles/agent/tasks/Linux.yml b/roles/agent/tasks/Linux.yml
index 6ddc18fd9..baea93395 100644
--- a/roles/agent/tasks/Linux.yml
+++ b/roles/agent/tasks/Linux.yml
@@ -87,12 +87,6 @@
     path: /usr/bin/cmk-agent-ctl
   register: __checkmk_agent_controller_binary
 
-- name: "{{ ansible_system }}: Read Agent Controller State."
-  become: true
-  ansible.builtin.command: cat /var/lib/cmk-agent/registered_connections.json
-  register: __checkmk_agent_registered_connections
-  changed_when: false
-
 - name: "{{ ansible_system }}: Read Updater State."
   become: true
   ansible.builtin.command: cat /var/lib/check_mk_agent/cache/plugins_cmk-update-agent.cache
@@ -102,11 +96,20 @@
     not __checkmk_agent_updater_state.rc == 0
     and not __checkmk_agent_updater_state.rc == 1
 
-- name: "{{ ansible_system }}: Register Agent for automatic Updates using User Password."  # noqa no-changed-when
+- name: "{{ ansible_system }}: Read Agent Controller State."
+  become: true
+  ansible.builtin.command: cat /var/lib/cmk-agent/registered_connections.json
+  register: __checkmk_agent_registered_connections
+  changed_when: false
+  failed_when: |
+    not __checkmk_agent_registered_connections.rc == 0
+    and not __checkmk_agent_registered_connections.rc == 1
+
+- name: "{{ ansible_system }}: Register Agent for automatic Updates using User Password."
   become: true
   ansible.builtin.shell: |
     cmk-update-agent register -H {{ checkmk_agent_host_name }} \
-    -s {{ checkmk_agent_registration_server }} -i {{ checkmk_agent_registration_site }} -p {{ checkmk_agent_server_protocol }} \
+    -s {{ checkmk_agent_registration_server }} -i {{ checkmk_agent_registration_site }} -p {{ checkmk_agent_registration_server_protocol }} \
     -U {{ checkmk_agent_user }} -P {{ __checkmk_agent_auth }}
   no_log: "{{ checkmk_agent_no_log | bool }}"
   register: __checkmk_agent_update_state
@@ -116,13 +119,15 @@
     and checkmk_agent_update | bool
     and (checkmk_agent_pass is defined and checkmk_agent_pass | length)
     and (checkmk_agent_secret is not defined)
-    and not checkmk_agent_registration_server + '/' + checkmk_agent_registration_site in __checkmk_agent_updater_state.stdout
+    and not ((checkmk_agent_registration_server + '/' + checkmk_agent_registration_site in __checkmk_agent_updater_state.stdout)
+    and ('"error": null' in __checkmk_agent_updater_state.stdout) )
+  changed_when: "'Successfully registered agent of host' in __checkmk_agent_update_state.stderr"
 
-- name: "{{ ansible_system }}: Register Agent for automatic Updates using Automation Secret."  # noqa no-changed-when
+- name: "{{ ansible_system }}: Register Agent for automatic Updates using Automation Secret."
   become: true
   ansible.builtin.shell: |
     cmk-update-agent register -H {{ checkmk_agent_host_name }} \
-    -s {{ checkmk_agent_registration_server }} -i {{ checkmk_agent_registration_site }} -p {{ checkmk_agent_server_protocol }} \
+    -s {{ checkmk_agent_registration_server }} -i {{ checkmk_agent_registration_site }} -p {{ checkmk_agent_registration_server_protocol }} \
     -U {{ checkmk_agent_user }} -S {{ __checkmk_agent_auth }}
   no_log: "{{ checkmk_agent_no_log | bool }}"
   register: __checkmk_agent_update_state
@@ -131,9 +136,11 @@
     and __checkmk_agent_updater_binary.stat.exists | bool
     and checkmk_agent_update | bool
     and (checkmk_agent_secret is defined and checkmk_agent_secret | length)
-    and not checkmk_agent_registration_server + '/' + checkmk_agent_registration_site in __checkmk_agent_updater_state.stdout
+    and not ((checkmk_agent_registration_server + '/' + checkmk_agent_registration_site in __checkmk_agent_updater_state.stdout)
+    and ('"error": null' in __checkmk_agent_updater_state.stdout) )
+  changed_when: "'Successfully registered agent of host' in __checkmk_agent_update_state.stderr"
 
-- name: "{{ ansible_system }}: Register Agent for TLS."  # noqa no-changed-when
+- name: "{{ ansible_system }}: Register Agent for TLS."
   become: true
   ansible.builtin.shell: |
     cmk-agent-ctl register -H {{ checkmk_agent_host_name }} \
@@ -146,6 +153,7 @@
     and checkmk_agent_tls | bool
     and (__checkmk_agent_auth is defined and __checkmk_agent_auth | length)
     and not checkmk_agent_registration_server + '/' + checkmk_agent_registration_site in __checkmk_agent_registered_connections.stdout
+  changed_when: "'Registration complete' in __checkmk_agent_tls_state.stdout"
 
 - name: "{{ ansible_system }}: Verify Checkmk Agent Port is open."
   ansible.builtin.wait_for:
diff --git a/roles/agent/tasks/Win32NT.yml b/roles/agent/tasks/Win32NT.yml
index 5cbe3eb95..47ec175ef 100644
--- a/roles/agent/tasks/Win32NT.yml
+++ b/roles/agent/tasks/Win32NT.yml
@@ -40,21 +40,21 @@
     path: "{{ __checkmk_agent_binary_path }}"
   register: __checkmk_agent_binary
 
-- name: "{{ ansible_system }}: Read Agent Controller State."
+- name: "{{ ansible_system }}: Read Updater State."
   ansible.windows.win_command: powershell.exe -
   args:
-    stdin: Get-Content -ErrorAction Ignore -LiteralPath C:\ProgramData\checkmk\agent\registered_connections.json ; Exit 0
-  register: __checkmk_agent_registered_connections
+    stdin: Get-Content -ErrorAction Ignore -LiteralPath C:\ProgramData\checkmk\agent\config\cmk-update-agent.state ; Exit 0
+  register: __checkmk_agent_updater_state
   changed_when: false
 
-- name: "{{ ansible_system }}: Read Updater State."
+- name: "{{ ansible_system }}: Read Agent Controller State."
   ansible.windows.win_command: powershell.exe -
   args:
-    stdin: Get-Content -ErrorAction Ignore -LiteralPath C:\ProgramData\checkmk\agent\config\cmk-update-agent.state ; Exit 0
-  register: __checkmk_agent_updater_state
+    stdin: Get-Content -ErrorAction Ignore -LiteralPath C:\ProgramData\checkmk\agent\registered_connections.json ; Exit 0
+  register: __checkmk_agent_registered_connections
   changed_when: false
 
-- name: "{{ ansible_system }}: Register Agent for automatic Updates using User Password."  # noqa no-changed-when
+- name: "{{ ansible_system }}: Register Agent for automatic Updates using User Password."
   ansible.windows.win_command: |
     check_mk_agent.exe updater register -H {{ checkmk_agent_host_name }} \
     -s {{ checkmk_agent_registration_server }} -i {{ checkmk_agent_registration_site }} -p {{ checkmk_agent_server_protocol }} \
@@ -69,12 +69,14 @@
     and checkmk_agent_update | bool
     and (checkmk_agent_pass is defined and checkmk_agent_pass | length)
     and (checkmk_agent_secret is not defined)
-    and not '\'server\': \'' + checkmk_agent_registration_server + '\', \'site\': \'' + checkmk_agent_registration_site + '\'' in __checkmk_agent_updater_state.stdout
+    and not (('\'server\': \'' + checkmk_agent_registration_server + '\', \'site\': \'' + checkmk_agent_registration_site + '\'' in __checkmk_agent_updater_state.stdout)
+    and ('\'last_error\': None' in __checkmk_agent_updater_state.stdout))
+  changed_when: "'Successfully registered agent of host' in __checkmk_agent_update_state.stderr"
 
-- name: "{{ ansible_system }}: Register Agent for automatic Updates using Automation Secret."  # noqa no-changed-when
+- name: "{{ ansible_system }}: Register Agent for automatic Updates using Automation Secret."
   ansible.windows.win_command: |
     check_mk_agent.exe updater register -H {{ checkmk_agent_host_name }} \
-    -s {{ checkmk_agent_registration_server }} -i {{ checkmk_agent_registration_site }} -p {{ checkmk_agent_server_protocol }} \
+    -s {{ checkmk_agent_registration_server }} -i {{ checkmk_agent_registration_site }} -p {{ checkmk_agent_registration_server_protocol }} \
     -U {{ checkmk_agent_user }} -S {{ __checkmk_agent_auth }}
   no_log: "{{ checkmk_agent_no_log | bool }}"
   register: __checkmk_agent_update_state
@@ -85,13 +87,11 @@
     and __checkmk_agent_binary.stat.exists | bool
     and checkmk_agent_update | bool
     and (checkmk_agent_secret is defined and checkmk_agent_secret | length)
-    and not '\'server\': \'' + checkmk_agent_registration_server + '\', \'site\': \'' + checkmk_agent_registration_site + '\'' in __checkmk_agent_updater_state.stdout
-
-- name: "Trigger Activate Changes to enable TLS registration."
-  ansible.builtin.meta:
-    flush_handlers
+    and not (('\'server\': \'' + checkmk_agent_registration_server + '\', \'site\': \'' + checkmk_agent_registration_site + '\'' in __checkmk_agent_updater_state.stdout)
+    and ('\'last_error\': None' in __checkmk_agent_updater_state.stdout))
+  changed_when: "'Successfully registered agent of host' in __checkmk_agent_update_state.stderr"
 
-- name: "{{ ansible_system }}: Register Agent for TLS."  # noqa no-changed-when
+- name: "{{ ansible_system }}: Register Agent for TLS."
   ansible.windows.win_command: |
     cmk-agent-ctl.exe register -H {{ checkmk_agent_host_name }} \
     -s {{ checkmk_agent_registration_server }} -i {{ checkmk_agent_registration_site }} \
@@ -105,6 +105,7 @@
     and checkmk_agent_tls | bool
     and (__checkmk_agent_auth is defined and __checkmk_agent_auth | length)
     and not checkmk_agent_registration_server + '/' + checkmk_agent_registration_site in __checkmk_agent_registered_connections.stdout
+  changed_when: "'Registration complete' in __checkmk_agent_tls_state.stdout"
 
 - name: "{{ ansible_system }}: Verify Checkmk Agent Port is open."
   ansible.windows.win_wait_for:
diff --git a/roles/agent/tasks/main.yml b/roles/agent/tasks/main.yml
index 594f8bd7f..faab82ad8 100644
--- a/roles/agent/tasks/main.yml
+++ b/roles/agent/tasks/main.yml
@@ -4,7 +4,7 @@
     msg: "The provided Checkmk Edition '{{ checkmk_agent_edition }}' does  not exist or is not supported by this role."
   when: checkmk_agent_edition | lower not in __checkmk_agent_edition_mapping
 
-- name: "Include OS family specific variables."
+- name: "{{ ansible_os_family }}: Include OS family specific variables."
   ansible.builtin.include_vars: "{{ ansible_os_family }}.yml"
   tags:
     - include-os-family-vars
diff --git a/roles/server/README.md b/roles/server/README.md
index 91d963a6f..51b8303ca 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.0p6"
+    checkmk_server_version: "2.3.0p11"
 
 The global Checkmk version. This is used for installing Checkmk.
 To manage sites and their version, see `checkmk_server_sites`.
@@ -111,7 +111,7 @@ Whether to back up sites when updating between versions. Only disable this if yo
 Directory to backup sites to when updating between versions.
 Of course `/tmp/` is not a sane backup location, so change it!
 
-    checkmk_agent_no_log: 'true'
+    checkmk_server_no_log: 'true'
 
 Whether to log sensitive information like passwords. Ansible output will be censored for enhanced security by default.
 Set to `false` for easier troubleshooting. Be careful when changing this value in production, passwords may be leaked in operating system logs.
diff --git a/roles/server/defaults/main.yml b/roles/server/defaults/main.yml
index 8e8dd4694..3731fc730 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.0p6"
+checkmk_server_version: "2.3.0p11"
 checkmk_server_edition: cre
 checkmk_server_verify_setup: 'true'
 
diff --git a/roles/server/molecule/2.1.0/group_vars/all.yml b/roles/server/molecule/2.1.0/group_vars/all.yml
index 270a99ac5..3bbc9d767 100644
--- a/roles/server/molecule/2.1.0/group_vars/all.yml
+++ b/roles/server/molecule/2.1.0/group_vars/all.yml
@@ -1,6 +1,6 @@
 ---
 # General
-checkmk_var_version: "2.1.0p44"
+checkmk_var_version: "2.1.0p46"
 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.2.0/group_vars/all.yml b/roles/server/molecule/2.2.0/group_vars/all.yml
index 82122833d..8ea5afac0 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.0p27"
+checkmk_var_version: "2.2.0p31"
 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 6e1d82d7c..30fb2b777 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.0p6"
+checkmk_var_version: "2.3.0p11"
 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 a24a26981..2310e2497 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -15,9 +15,9 @@ script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 collection_dir="${script_dir%/*}"
 
 # Update these as necessary:
-checkmk_ancient="2.1.0p44"
-checkmk_oldstable="2.2.0p27"
-checkmk_stable="2.3.0p6"
+checkmk_ancient="2.1.0p46"
+checkmk_oldstable="2.2.0p31"
+checkmk_stable="2.3.0p11"
 
 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 29b679947..68f3527dc 100644
--- a/tests/integration/targets/activation/vars/main.yml
+++ b/tests/integration/targets/activation/vars/main.yml
@@ -1,15 +1,15 @@
 ---
 test_sites:
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.2.0p27"
+  - version: "2.2.0p31"
     edition: "cre"
     site: "old_cre"
-  # - version: "2.1.0p44"
+  # - version: "2.1.0p46"
   #   edition: "cre"
   #   site: "ancient_cre"
 
diff --git a/tests/integration/targets/bakery/vars/main.yml b/tests/integration/targets/bakery/vars/main.yml
index 7a5134e76..fa834455a 100644
--- a/tests/integration/targets/bakery/vars/main.yml
+++ b/tests/integration/targets/bakery/vars/main.yml
@@ -1,12 +1,12 @@
 ---
 test_sites:
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.2.0p27"
+  - version: "2.2.0p31"
     edition: "cee"
     site: "old_cee"
-  # - version: "2.1.0p44"
+  # - version: "2.1.0p46"
   #   edition: "cee"
   #   site: "ancient_cee"
 
diff --git a/tests/integration/targets/contact_group/vars/main.yml b/tests/integration/targets/contact_group/vars/main.yml
index 88c89f580..66ec1d624 100644
--- a/tests/integration/targets/contact_group/vars/main.yml
+++ b/tests/integration/targets/contact_group/vars/main.yml
@@ -1,18 +1,18 @@
 ---
 test_sites:
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cme"
     site: "stable_cme"
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p27"
+  - version: "2.2.0p31"
     edition: "cre"
     site: "old_cre"
-  # - version: "2.1.0p44"
+  # - version: "2.1.0p46"
   #   edition: "cre"
   #   site: "ancient_cre"
 
diff --git a/tests/integration/targets/discovery/vars/main.yml b/tests/integration/targets/discovery/vars/main.yml
index ae77e6b40..f2e0ea5d5 100644
--- a/tests/integration/targets/discovery/vars/main.yml
+++ b/tests/integration/targets/discovery/vars/main.yml
@@ -1,15 +1,15 @@
 ---
 test_sites:
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p27"
+  - version: "2.2.0p31"
     edition: "cre"
     site: "old_cre"
-  # - version: "2.1.0p44"
+  # - version: "2.1.0p46"
   #   edition: "cre"
   #   site: "ancient_cre"
 
diff --git a/tests/integration/targets/downtime/tasks/test.yml b/tests/integration/targets/downtime/tasks/test.yml
index cebd3d240..4d23579db 100644
--- a/tests/integration/targets/downtime/tasks/test.yml
+++ b/tests/integration/targets/downtime/tasks/test.yml
@@ -280,6 +280,35 @@
     state: absent
   loop: "{{ checkmk_hosts }}"
 
+- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Schedule downtime on single service."
+  downtime:
+    server_url: "{{ checkmk_var_server_url }}"
+    site: "{{ outer_item.site }}"
+    automation_user: "{{ checkmk_var_automation_user }}"
+    automation_secret: "{{ checkmk_var_automation_secret }}"
+    host_name: "{{ item.name }}"
+    comment: Schedule downtime on single service
+    end_after:
+      minutes: 30
+    service_descriptions:
+      - "Check_MK"
+  loop: "{{ checkmk_hosts }}"
+
+- name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Delete downtime on single service."
+  downtime:
+    server_url: "{{ checkmk_var_server_url }}"
+    site: "{{ outer_item.site }}"
+    automation_user: "{{ checkmk_var_automation_user }}"
+    automation_secret: "{{ checkmk_var_automation_secret }}"
+    host_name: "{{ item.name }}"
+    comment: Schedule downtime on single service
+    service_descriptions:
+      - "Check_MK"
+    state: absent
+  register: result
+  failed_when: result.changed == False
+  loop: "{{ checkmk_hosts }}"
+
 - name: "{{ outer_item.version }} - {{ outer_item.edition | upper }} - Delete hosts."
   host:
     server_url: "{{ checkmk_var_server_url }}"
diff --git a/tests/integration/targets/downtime/vars/main.yml b/tests/integration/targets/downtime/vars/main.yml
index c330700fe..0690fc13b 100644
--- a/tests/integration/targets/downtime/vars/main.yml
+++ b/tests/integration/targets/downtime/vars/main.yml
@@ -1,15 +1,15 @@
 ---
 test_sites:
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p27"
+  - version: "2.2.0p31"
     edition: "cre"
     site: "old_cre"
-  # - version: "2.1.0p44"
+  # - version: "2.1.0p46"
   #   edition: "cre"
   #   site: "ancient_cre"
 
diff --git a/tests/integration/targets/folder/vars/main.yml b/tests/integration/targets/folder/vars/main.yml
index dbcf54d20..55bf19ed1 100644
--- a/tests/integration/targets/folder/vars/main.yml
+++ b/tests/integration/targets/folder/vars/main.yml
@@ -1,15 +1,15 @@
 ---
 test_sites:
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p27"
+  - version: "2.2.0p31"
     edition: "cre"
     site: "old_cre"
-  # - version: "2.1.0p44"
+  # - version: "2.1.0p46"
   #   edition: "cre"
   #   site: "ancient_cre"
 
diff --git a/tests/integration/targets/host/vars/main.yml b/tests/integration/targets/host/vars/main.yml
index 09b9540c6..a177038c1 100644
--- a/tests/integration/targets/host/vars/main.yml
+++ b/tests/integration/targets/host/vars/main.yml
@@ -1,15 +1,15 @@
 ---
 test_sites:
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.2.0p27"
+  - version: "2.2.0p31"
     edition: "cre"
     site: "old_cre"
-  # - version: "2.1.0p44"
+  # - version: "2.1.0p46"
   #   edition: "cre"
   #   site: "ancient_cre"
 
diff --git a/tests/integration/targets/host_group/vars/main.yml b/tests/integration/targets/host_group/vars/main.yml
index 95b148a57..81a07d4b3 100644
--- a/tests/integration/targets/host_group/vars/main.yml
+++ b/tests/integration/targets/host_group/vars/main.yml
@@ -1,18 +1,18 @@
 ---
 test_sites:
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cme"
     site: "stable_cme"
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p27"
+  - version: "2.2.0p31"
     edition: "cre"
     site: "old_cre"
-  # - version: "2.1.0p44"
+  # - version: "2.1.0p46"
   #   edition: "cre"
   #   site: "ancient_cre"
 
diff --git a/tests/integration/targets/lookup_bakery/vars/main.yml b/tests/integration/targets/lookup_bakery/vars/main.yml
index 2a38841d5..a04ed7252 100644
--- a/tests/integration/targets/lookup_bakery/vars/main.yml
+++ b/tests/integration/targets/lookup_bakery/vars/main.yml
@@ -1,11 +1,11 @@
 ---
 test_sites:
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.2.0p27"
+  - version: "2.2.0p31"
     edition: "cee"
     site: "old_cee"
-  # - version: "2.1.0p44"
+  # - version: "2.1.0p46"
   #   edition: "cee"
   #   site: "ancient_cee"
diff --git a/tests/integration/targets/lookup_folder/vars/main.yml b/tests/integration/targets/lookup_folder/vars/main.yml
index 380a1a7cb..b75be1905 100644
--- a/tests/integration/targets/lookup_folder/vars/main.yml
+++ b/tests/integration/targets/lookup_folder/vars/main.yml
@@ -1,15 +1,15 @@
 ---
 test_sites:
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p27"
+  - version: "2.2.0p31"
     edition: "cre"
     site: "old_cre"
-  # - version: "2.1.0p44"
+  # - version: "2.1.0p46"
   #   edition: "cre"
   #   site: "ancient_cre"
 
diff --git a/tests/integration/targets/lookup_folders/vars/main.yml b/tests/integration/targets/lookup_folders/vars/main.yml
index 788aa6eea..7d9f6d02c 100644
--- a/tests/integration/targets/lookup_folders/vars/main.yml
+++ b/tests/integration/targets/lookup_folders/vars/main.yml
@@ -1,15 +1,15 @@
 ---
 test_sites:
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p27"
+  - version: "2.2.0p31"
     edition: "cre"
     site: "old_cre"
-  # - version: "2.1.0p44"
+  # - version: "2.1.0p46"
   #   edition: "cre"
   #   site: "ancient_cre"
 
diff --git a/tests/integration/targets/lookup_host/vars/main.yml b/tests/integration/targets/lookup_host/vars/main.yml
index 3b9a8db3a..a29f4e24a 100644
--- a/tests/integration/targets/lookup_host/vars/main.yml
+++ b/tests/integration/targets/lookup_host/vars/main.yml
@@ -1,15 +1,15 @@
 ---
 test_sites:
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p27"
+  - version: "2.2.0p31"
     edition: "cre"
     site: "old_cre"
-  # - version: "2.1.0p44"
+  # - version: "2.1.0p46"
   #   edition: "cre"
   #   site: "ancient_cre"
 
diff --git a/tests/integration/targets/lookup_hosts/vars/main.yml b/tests/integration/targets/lookup_hosts/vars/main.yml
index 9c859c5fa..dd04c74c6 100644
--- a/tests/integration/targets/lookup_hosts/vars/main.yml
+++ b/tests/integration/targets/lookup_hosts/vars/main.yml
@@ -1,15 +1,15 @@
 ---
 test_sites:
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p27"
+  - version: "2.2.0p31"
     edition: "cre"
     site: "old_cre"
-  # - version: "2.1.0p44"
+  # - version: "2.1.0p46"
   #   edition: "cre"
   #   site: "ancient_cre"
 
diff --git a/tests/integration/targets/lookup_rules/vars/main.yml b/tests/integration/targets/lookup_rules/vars/main.yml
index 564eda6bc..259849651 100644
--- a/tests/integration/targets/lookup_rules/vars/main.yml
+++ b/tests/integration/targets/lookup_rules/vars/main.yml
@@ -1,15 +1,15 @@
 ---
 test_sites:
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p27"
+  - version: "2.2.0p31"
     edition: "cre"
     site: "old_cre"
-  # - version: "2.1.0p44"
+  # - version: "2.1.0p46"
   #   edition: "cre"
   #   site: "ancient_cre"
 
diff --git a/tests/integration/targets/lookup_rulesets/vars/main.yml b/tests/integration/targets/lookup_rulesets/vars/main.yml
index 0b769156b..f55f77a81 100644
--- a/tests/integration/targets/lookup_rulesets/vars/main.yml
+++ b/tests/integration/targets/lookup_rulesets/vars/main.yml
@@ -1,15 +1,15 @@
 ---
 test_sites:
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p27"
+  - version: "2.2.0p31"
     edition: "cre"
     site: "old_cre"
-  # - version: "2.1.0p44"
+  # - version: "2.1.0p46"
   #   edition: "cre"
   #   site: "ancient_cre"
 
diff --git a/tests/integration/targets/lookup_version/vars/main.yml b/tests/integration/targets/lookup_version/vars/main.yml
index 27dae0a2f..1d5b1b7a1 100644
--- a/tests/integration/targets/lookup_version/vars/main.yml
+++ b/tests/integration/targets/lookup_version/vars/main.yml
@@ -1,14 +1,14 @@
 ---
 test_sites:
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p27"
+  - version: "2.2.0p31"
     edition: "cre"
     site: "old_cre"
-  # - version: "2.1.0p44"
+  # - version: "2.1.0p46"
   #   edition: "cre"
   #   site: "ancient_cre"
diff --git a/tests/integration/targets/password/vars/main.yml b/tests/integration/targets/password/vars/main.yml
index c12b45baf..803adad38 100644
--- a/tests/integration/targets/password/vars/main.yml
+++ b/tests/integration/targets/password/vars/main.yml
@@ -1,18 +1,18 @@
 ---
 test_sites:
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cme"
     site: "stable_cme"
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p27"
+  - version: "2.2.0p31"
     edition: "cre"
     site: "old_cre"
-  # - version: "2.1.0p44"
+  # - version: "2.1.0p46"
   #   edition: "cre"
   #   site: "ancient_cre"
 
diff --git a/tests/integration/targets/rule/vars/main.yml b/tests/integration/targets/rule/vars/main.yml
index 27dae0a2f..1d5b1b7a1 100644
--- a/tests/integration/targets/rule/vars/main.yml
+++ b/tests/integration/targets/rule/vars/main.yml
@@ -1,14 +1,14 @@
 ---
 test_sites:
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p27"
+  - version: "2.2.0p31"
     edition: "cre"
     site: "old_cre"
-  # - version: "2.1.0p44"
+  # - version: "2.1.0p46"
   #   edition: "cre"
   #   site: "ancient_cre"
diff --git a/tests/integration/targets/service_group/vars/main.yml b/tests/integration/targets/service_group/vars/main.yml
index 50b072c65..757a489fb 100644
--- a/tests/integration/targets/service_group/vars/main.yml
+++ b/tests/integration/targets/service_group/vars/main.yml
@@ -1,18 +1,18 @@
 ---
 test_sites:
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cme"
     site: "stable_cme"
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p27"
+  - version: "2.2.0p31"
     edition: "cre"
     site: "old_cre"
-  # - version: "2.1.0p44"
+  # - version: "2.1.0p46"
   #   edition: "cre"
   #   site: "ancient_cre"
 
diff --git a/tests/integration/targets/tag_group/vars/main.yml b/tests/integration/targets/tag_group/vars/main.yml
index bfc6b4669..fb1ed4578 100644
--- a/tests/integration/targets/tag_group/vars/main.yml
+++ b/tests/integration/targets/tag_group/vars/main.yml
@@ -1,18 +1,18 @@
 ---
 test_sites:
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cme"
     site: "stable_cme"
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p27"
+  - version: "2.2.0p31"
     edition: "cre"
     site: "old_cre"
-  # - version: "2.1.0p44"
+  # - version: "2.1.0p46"
   #   edition: "cre"
   #   site: "ancient_cre"
 
diff --git a/tests/integration/targets/timeperiod/vars/main.yml b/tests/integration/targets/timeperiod/vars/main.yml
index cad47a10c..8e8f7d0a3 100644
--- a/tests/integration/targets/timeperiod/vars/main.yml
+++ b/tests/integration/targets/timeperiod/vars/main.yml
@@ -1,15 +1,15 @@
 ---
 test_sites:
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p27"
+  - version: "2.2.0p31"
     edition: "cre"
     site: "old_cre"
-  # - version: "2.1.0p44"
+  # - version: "2.1.0p46"
   #   edition: "cre"
   #   site: "ancient_cre"
 
diff --git a/tests/integration/targets/user/vars/main.yml b/tests/integration/targets/user/vars/main.yml
index 103b1e162..93c0b0b93 100644
--- a/tests/integration/targets/user/vars/main.yml
+++ b/tests/integration/targets/user/vars/main.yml
@@ -1,18 +1,18 @@
 ---
 test_sites:
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cme"
     site: "stable_cme"
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cee"
     site: "stable_cee"
-  - version: "2.3.0p6"
+  - version: "2.3.0p11"
     edition: "cre"
     site: "stable_cre"
-  - version: "2.2.0p27"
+  - version: "2.2.0p31"
     edition: "cre"
     site: "old_cre"
-  # - version: "2.1.0p44"
+  # - version: "2.1.0p46"
   #   edition: "cre"
   #   site: "ancient_cre"