diff --git a/docs/07-Release Notes/v0.22/v0.22.0.md b/docs/07-Release Notes/v0.22/v0.22.0.md
index 181ed483..9e62aaf8 100644
--- a/docs/07-Release Notes/v0.22/v0.22.0.md	
+++ b/docs/07-Release Notes/v0.22/v0.22.0.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.0
 title: v0.22.0
-sidebar_position: 25
+sidebar_position: 26
 ---
 # metal-stack v0.22.0
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.0](https://github.com/metal-stack/releases/releases/tag/v0.22.0)
diff --git a/docs/07-Release Notes/v0.22/v0.22.1.md b/docs/07-Release Notes/v0.22/v0.22.1.md
index 4f97b1fe..ca5bdba5 100644
--- a/docs/07-Release Notes/v0.22/v0.22.1.md	
+++ b/docs/07-Release Notes/v0.22/v0.22.1.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.1
 title: v0.22.1
-sidebar_position: 24
+sidebar_position: 25
 ---
 # metal-stack v0.22.1
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.1](https://github.com/metal-stack/releases/releases/tag/v0.22.1)
diff --git a/docs/07-Release Notes/v0.22/v0.22.10.md b/docs/07-Release Notes/v0.22/v0.22.10.md
index b2561cdc..a07e311b 100644
--- a/docs/07-Release Notes/v0.22/v0.22.10.md	
+++ b/docs/07-Release Notes/v0.22/v0.22.10.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.10
 title: v0.22.10
-sidebar_position: 15
+sidebar_position: 16
 ---
 # metal-stack v0.22.10
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.10](https://github.com/metal-stack/releases/releases/tag/v0.22.10)
diff --git a/docs/07-Release Notes/v0.22/v0.22.11.md b/docs/07-Release Notes/v0.22/v0.22.11.md
index 5930ee22..2333df1b 100644
--- a/docs/07-Release Notes/v0.22/v0.22.11.md	
+++ b/docs/07-Release Notes/v0.22/v0.22.11.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.11
 title: v0.22.11
-sidebar_position: 14
+sidebar_position: 15
 ---
 # metal-stack v0.22.11
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.11](https://github.com/metal-stack/releases/releases/tag/v0.22.11)
diff --git a/docs/07-Release Notes/v0.22/v0.22.12.md b/docs/07-Release Notes/v0.22/v0.22.12.md
index c9e3ab63..9f2ca13a 100644
--- a/docs/07-Release Notes/v0.22/v0.22.12.md	
+++ b/docs/07-Release Notes/v0.22/v0.22.12.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.12
 title: v0.22.12
-sidebar_position: 13
+sidebar_position: 14
 ---
 # metal-stack v0.22.12
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.12](https://github.com/metal-stack/releases/releases/tag/v0.22.12)
diff --git a/docs/07-Release Notes/v0.22/v0.22.13.md b/docs/07-Release Notes/v0.22/v0.22.13.md
index 390c9673..7e018ef8 100644
--- a/docs/07-Release Notes/v0.22/v0.22.13.md	
+++ b/docs/07-Release Notes/v0.22/v0.22.13.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.13
 title: v0.22.13
-sidebar_position: 12
+sidebar_position: 13
 ---
 # metal-stack v0.22.13
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.13](https://github.com/metal-stack/releases/releases/tag/v0.22.13)
diff --git a/docs/07-Release Notes/v0.22/v0.22.14.md b/docs/07-Release Notes/v0.22/v0.22.14.md
index 1dbd1fee..3cf50d21 100644
--- a/docs/07-Release Notes/v0.22/v0.22.14.md	
+++ b/docs/07-Release Notes/v0.22/v0.22.14.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.14
 title: v0.22.14
-sidebar_position: 11
+sidebar_position: 12
 ---
 # metal-stack v0.22.14
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.14](https://github.com/metal-stack/releases/releases/tag/v0.22.14)
diff --git a/docs/07-Release Notes/v0.22/v0.22.15.md b/docs/07-Release Notes/v0.22/v0.22.15.md
index 851888b9..2fabe276 100644
--- a/docs/07-Release Notes/v0.22/v0.22.15.md	
+++ b/docs/07-Release Notes/v0.22/v0.22.15.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.15
 title: v0.22.15
-sidebar_position: 10
+sidebar_position: 11
 ---
 # metal-stack v0.22.15
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.15](https://github.com/metal-stack/releases/releases/tag/v0.22.15)
diff --git a/docs/07-Release Notes/v0.22/v0.22.16.md b/docs/07-Release Notes/v0.22/v0.22.16.md
index cc4f185a..69df4d72 100644
--- a/docs/07-Release Notes/v0.22/v0.22.16.md	
+++ b/docs/07-Release Notes/v0.22/v0.22.16.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.16
 title: v0.22.16
-sidebar_position: 9
+sidebar_position: 10
 ---
 # metal-stack v0.22.16
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.16](https://github.com/metal-stack/releases/releases/tag/v0.22.16)
diff --git a/docs/07-Release Notes/v0.22/v0.22.17.md b/docs/07-Release Notes/v0.22/v0.22.17.md
index 13de2558..82a8d48b 100644
--- a/docs/07-Release Notes/v0.22/v0.22.17.md	
+++ b/docs/07-Release Notes/v0.22/v0.22.17.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.17
 title: v0.22.17
-sidebar_position: 8
+sidebar_position: 9
 ---
 # metal-stack v0.22.17
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.17](https://github.com/metal-stack/releases/releases/tag/v0.22.17)
diff --git a/docs/07-Release Notes/v0.22/v0.22.18.md b/docs/07-Release Notes/v0.22/v0.22.18.md
index 7b3ff28a..1f18960b 100644
--- a/docs/07-Release Notes/v0.22/v0.22.18.md	
+++ b/docs/07-Release Notes/v0.22/v0.22.18.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.18
 title: v0.22.18
-sidebar_position: 7
+sidebar_position: 8
 ---
 # metal-stack v0.22.18
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.18](https://github.com/metal-stack/releases/releases/tag/v0.22.18)
diff --git a/docs/07-Release Notes/v0.22/v0.22.19.md b/docs/07-Release Notes/v0.22/v0.22.19.md
index b3ec768d..7fb73a0f 100644
--- a/docs/07-Release Notes/v0.22/v0.22.19.md	
+++ b/docs/07-Release Notes/v0.22/v0.22.19.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.19
 title: v0.22.19
-sidebar_position: 6
+sidebar_position: 7
 ---
 # metal-stack v0.22.19
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.19](https://github.com/metal-stack/releases/releases/tag/v0.22.19)
diff --git a/docs/07-Release Notes/v0.22/v0.22.2.md b/docs/07-Release Notes/v0.22/v0.22.2.md
index ad090930..ea4753e8 100644
--- a/docs/07-Release Notes/v0.22/v0.22.2.md	
+++ b/docs/07-Release Notes/v0.22/v0.22.2.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.2
 title: v0.22.2
-sidebar_position: 23
+sidebar_position: 24
 ---
 # metal-stack v0.22.2
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.2](https://github.com/metal-stack/releases/releases/tag/v0.22.2)
diff --git a/docs/07-Release Notes/v0.22/v0.22.20.md b/docs/07-Release Notes/v0.22/v0.22.20.md
index b1247bad..1198aabf 100644
--- a/docs/07-Release Notes/v0.22/v0.22.20.md	
+++ b/docs/07-Release Notes/v0.22/v0.22.20.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.20
 title: v0.22.20
-sidebar_position: 5
+sidebar_position: 6
 ---
 # metal-stack v0.22.20
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.20](https://github.com/metal-stack/releases/releases/tag/v0.22.20)
diff --git a/docs/07-Release Notes/v0.22/v0.22.21.md b/docs/07-Release Notes/v0.22/v0.22.21.md
index f763bce1..e08c3c9f 100644
--- a/docs/07-Release Notes/v0.22/v0.22.21.md	
+++ b/docs/07-Release Notes/v0.22/v0.22.21.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.21
 title: v0.22.21
-sidebar_position: 4
+sidebar_position: 5
 ---
 # metal-stack v0.22.21
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.21](https://github.com/metal-stack/releases/releases/tag/v0.22.21)
diff --git a/docs/07-Release Notes/v0.22/v0.22.22.md b/docs/07-Release Notes/v0.22/v0.22.22.md
index 532380b6..8d995e8f 100644
--- a/docs/07-Release Notes/v0.22/v0.22.22.md	
+++ b/docs/07-Release Notes/v0.22/v0.22.22.md	
@@ -1,14 +1,14 @@
 ---
 slug: /release-notes/v0.22.22
 title: v0.22.22
-sidebar_position: 3
+sidebar_position: 4
 ---
 # metal-stack v0.22.22
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.22](https://github.com/metal-stack/releases/releases/tag/v0.22.22)
 ## General
 * [Gardener v1.141](https://github.com/gardener/gardener/releases/tag/v1.141.0)
   - ⚠️ Gardener does no longer support Garden, Seed, or Shoot clusters with Kubernetes versions <= 1.30. Make sure to upgrade all existing clusters before upgrading to this Gardener version.
-* This release was integration tested against the control plane that fully uses Gateway API and without anymore Ingress resources. We recommend to migrate to Gateway API for this release.
+* This release was integration tested against the control plane that fully uses Gateway API and without anymore Ingress resources. We recommend to migrate to Gateway API for this release. Documentation for the migration can be found [here](https://metal-stack.io/docs/migrating-to-gatewayapi).
 ## Required Actions
 * The metal-image-cache-sync is the first component to be migrated to use the V2 metal-stack API by communicating with the metal-apiserver. To deploy it, please take care of the following tasks:
   
@@ -18,7 +18,6 @@ See original release note at [https://github.com/metal-stack/releases/releases/t
 ## Breaking Changes
 * The metal-image-cache-sync has been migrated to the metal-stack V2 API. This means that it is no longer possible to connect to the metal-api, but instead to the new metal-apiserver, which was introduced in an earlier release. Please check the metal-roles release notes and adapt your deployment accordingly. (metal-stack/metal-image-cache-sync#21)
 * The `metal_apiserver_session_secret` variable is now required. Make sure that it set in your deployment and has a length >= 10 characters. (metal-stack/metal-roles#725)
-* `dhcp_relay_src_intf` and `dhcp_relay_server_vrf` are no longer set automatically when `dhcp_servers` are defined but must be set explicitly. (metal-stack/sonic-configdb-utils#50)
 ## Component Releases
 ### gardener-extension-dns-powerdns v0.8.0
 * Fix RBACs for runtime clusters. (metal-stack/gardener-extension-dns-powerdns#16) @Gerrit91
diff --git a/docs/07-Release Notes/v0.22/v0.22.23.md b/docs/07-Release Notes/v0.22/v0.22.23.md
index 3b3b08e7..133a7cc3 100644
--- a/docs/07-Release Notes/v0.22/v0.22.23.md	
+++ b/docs/07-Release Notes/v0.22/v0.22.23.md	
@@ -1,13 +1,13 @@
 ---
 slug: /release-notes/v0.22.23
 title: v0.22.23
-sidebar_position: 2
+sidebar_position: 3
 ---
 # metal-stack v0.22.23
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.23](https://github.com/metal-stack/releases/releases/tag/v0.22.23)
 ## General
 - Updates Gardener to [1.142](https://github.com/gardener/gardener/releases/tag/v1.142.0)
-* This release was integration tested against the control plane that fully uses Gateway API and without anymore Ingress resources. We recommend to migrate to Gateway API for this release.
+* This release was integration tested against the control plane that fully uses Gateway API and without anymore Ingress resources. We recommend to migrate to Gateway API already with the previous release. Documentation for the migration can be found [here](https://metal-stack.io/docs/migrating-to-gatewayapi).
 ## Breaking Changes
 * [OPERATOR] ⚠️ Gardener does no longer support Garden, Seed, or Shoot clusters with Kubernetes version `1.31`. Make sure to upgrade all existing clusters before upgrading to this Gardener version. (metal-stack/releases#321)
 * Cluster API Provider metal-stack drops support for Kubernetes `1.32`.
diff --git a/docs/07-Release Notes/v0.22/v0.22.24.md b/docs/07-Release Notes/v0.22/v0.22.24.md
index 4221770d..fea3d1ba 100644
--- a/docs/07-Release Notes/v0.22/v0.22.24.md	
+++ b/docs/07-Release Notes/v0.22/v0.22.24.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.24
 title: v0.22.24
-sidebar_position: 1
+sidebar_position: 2
 ---
 # metal-stack v0.22.24
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.24](https://github.com/metal-stack/releases/releases/tag/v0.22.24)
diff --git a/docs/07-Release Notes/v0.22/v0.22.25.md b/docs/07-Release Notes/v0.22/v0.22.25.md
new file mode 100644
index 00000000..4834e825
--- /dev/null
+++ b/docs/07-Release Notes/v0.22/v0.22.25.md	
@@ -0,0 +1,60 @@
+---
+slug: /release-notes/v0.22.25
+title: v0.22.25
+sidebar_position: 1
+---
+# metal-stack v0.22.25
+See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.25](https://github.com/metal-stack/releases/releases/tag/v0.22.25)
+## General
+* [Gardener v1.144](https://github.com/gardener/gardener/releases/v1.144.0)
+## Noteworthy
+* metal-bmc and pixiecore were migrated to V2. Backwards-compatibility was maintained such that BMC commands and machine allocations can still be run as usual through metal-api. No new role parametrization should be required. (metal-stack/metal-roles#744)
+## Required Actions
+* Pixie now offers the iPXE build variant `snponly.efi` as an alternative to `ipxe.efi` for machine booting. This variant in general supports more hardware at the cost of performance. You can set the new `--ipxe-type` for configuration. (metal-stack/pixie#48)
+* metal-bmc certs were moved to `/etc/metal-bmc`. The old folders `/certs/nsq` and `/certs/console` can be cleaned up manually. (metal-stack/metal-roles#744)
+## Component Releases
+### api v0.7.0
+* Enable auditing for infra API. (metal-stack/api#192) @Gerrit91
+* Mark SwitchNic.Mac as deprecated (metal-stack/api#191) @iljarotar
+* Update dependencies (metal-stack/api#189) @majst01
+* Add infra endpoint to issue machine tokens for metal-hammer. (metal-stack/api#194) @Gerrit91
+* Add client helper to reading infinitely from server streams. (metal-stack/api#195) @Gerrit91
+### metal-console v0.8.2
+* Fix build version not properly set. (metal-stack/metal-console#68) @Gerrit91
+### helm-charts v0.7.11
+* Disable metal-apiserver http route timeouts (metal-stack/helm-charts#180) @Gerrit91
+### metal-ansible-modules v0.3.3
+* Add machine roles and infra role to `metal_v2_admin_token` module (metal-stack/metal-ansible-modules#32) @Gerrit91
+### ansible-common v0.9.3
+* Allow to specify docker container hostname. (metal-stack/ansible-common#52) @Gerrit91
+### metal-apiserver v0.12.0
+* Implement machine token endpoint in boot service. (metal-stack/metal-apiserver#322) @Gerrit91
+* Make machine bmc commands synchronous. (metal-stack/metal-apiserver#325) @Gerrit91
+* Bump to API v0.7.0 without implementations. (metal-stack/metal-apiserver#324) @Gerrit91
+* Exclude streaming procedures from write timeouts. (metal-stack/metal-apiserver#323) @Gerrit91
+### metal-deployment-base v0.9.3
+* Update ansible-common to v0.9.1 (metal-stack/metal-deployment-base#53) @mwennrich
+### pixie v0.5.0
+* Migrate to V2 metal-apiserver with backwards compatibility. (metal-stack/pixie#51) @Gerrit91
+* add option to switch UEFI boot to snponly (metal-stack/pixie#48) @mwennrich
+* Update to actions-common and update Go to v1.27. (metal-stack/pixie#50) @Gerrit91
+* update ipxe to 2.0 (metal-stack/pixie#46) @mwennrich
+* Set console `ttyS0` for FUJITSU manufacturer (metal-stack/pixie#45) @simcod
+### metal-bmc v0.8.0
+* Migrate to V2 metal-apiserver, maintaining V1 compatibility (metal-stack/metal-bmc#100) @Gerrit91
+### metal-roles v0.36.0
+* Migrate metal-bmc and pixiecore to V2. (metal-stack/metal-roles#744) @Gerrit91
+* Increase retries for headscale container startup. (metal-stack/metal-roles#750) @Gerrit91
+* Validate rendered service configs before installing them (metal-stack/metal-roles#705) @GeertJohan
+# Merged Pull Requests
+This is a list of pull requests that were merged since the last release. The list does not contain pull requests from release-vector-repositories.
+
+The fact that these pull requests were merged does not necessarily imply that they have already become part of this metal-stack release.
+
+* Bump releases to version v0.22.24 (metal-stack/website#356) @metal-robot[bot]
+* Explicitly disable rp_filter on lan interfaces for almalinux (metal-stack/metal-images#449) @mreiger
+* Allow more client TLS config options like providing certs. (metal-stack/ontap-go#8) @Gerrit91
+* Templates and storage attachment (metal-stack/planner#15) @mwindower
+* Control plane (metal-stack/planner#16) @mwindower
+* Hand the network to systemd-networkd and systemd-resolved at install (metal-stack/bootstrap-debian#1) @muhittink
+* Next release (metal-stack/releases#325) @metal-robot[bot]
\ No newline at end of file
diff --git a/docs/07-Release Notes/v0.22/v0.22.3.md b/docs/07-Release Notes/v0.22/v0.22.3.md
index 8c9c5f98..a810b579 100644
--- a/docs/07-Release Notes/v0.22/v0.22.3.md	
+++ b/docs/07-Release Notes/v0.22/v0.22.3.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.3
 title: v0.22.3
-sidebar_position: 22
+sidebar_position: 23
 ---
 # metal-stack v0.22.3
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.3](https://github.com/metal-stack/releases/releases/tag/v0.22.3)
diff --git a/docs/07-Release Notes/v0.22/v0.22.4.md b/docs/07-Release Notes/v0.22/v0.22.4.md
index f1fa8ba1..7e5613b9 100644
--- a/docs/07-Release Notes/v0.22/v0.22.4.md	
+++ b/docs/07-Release Notes/v0.22/v0.22.4.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.4
 title: v0.22.4
-sidebar_position: 21
+sidebar_position: 22
 ---
 # metal-stack v0.22.4
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.4](https://github.com/metal-stack/releases/releases/tag/v0.22.4)
diff --git a/docs/07-Release Notes/v0.22/v0.22.5.md b/docs/07-Release Notes/v0.22/v0.22.5.md
index accc5136..c7cdbeeb 100644
--- a/docs/07-Release Notes/v0.22/v0.22.5.md	
+++ b/docs/07-Release Notes/v0.22/v0.22.5.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.5
 title: v0.22.5
-sidebar_position: 20
+sidebar_position: 21
 ---
 # metal-stack v0.22.5
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.5](https://github.com/metal-stack/releases/releases/tag/v0.22.5)
diff --git a/docs/07-Release Notes/v0.22/v0.22.6.md b/docs/07-Release Notes/v0.22/v0.22.6.md
index 06ccfa30..1a4f89bc 100644
--- a/docs/07-Release Notes/v0.22/v0.22.6.md	
+++ b/docs/07-Release Notes/v0.22/v0.22.6.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.6
 title: v0.22.6
-sidebar_position: 19
+sidebar_position: 20
 ---
 # metal-stack v0.22.6
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.6](https://github.com/metal-stack/releases/releases/tag/v0.22.6)
diff --git a/docs/07-Release Notes/v0.22/v0.22.7.md b/docs/07-Release Notes/v0.22/v0.22.7.md
index cd93f42e..17094046 100644
--- a/docs/07-Release Notes/v0.22/v0.22.7.md	
+++ b/docs/07-Release Notes/v0.22/v0.22.7.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.7
 title: v0.22.7
-sidebar_position: 18
+sidebar_position: 19
 ---
 # metal-stack v0.22.7
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.7](https://github.com/metal-stack/releases/releases/tag/v0.22.7)
diff --git a/docs/07-Release Notes/v0.22/v0.22.8.md b/docs/07-Release Notes/v0.22/v0.22.8.md
index 9dbe7a63..73b1aae1 100644
--- a/docs/07-Release Notes/v0.22/v0.22.8.md	
+++ b/docs/07-Release Notes/v0.22/v0.22.8.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.8
 title: v0.22.8
-sidebar_position: 17
+sidebar_position: 18
 ---
 # metal-stack v0.22.8
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.8](https://github.com/metal-stack/releases/releases/tag/v0.22.8)
diff --git a/docs/07-Release Notes/v0.22/v0.22.9.md b/docs/07-Release Notes/v0.22/v0.22.9.md
index 58e50335..1a8b3fba 100644
--- a/docs/07-Release Notes/v0.22/v0.22.9.md	
+++ b/docs/07-Release Notes/v0.22/v0.22.9.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.9
 title: v0.22.9
-sidebar_position: 16
+sidebar_position: 17
 ---
 # metal-stack v0.22.9
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.9](https://github.com/metal-stack/releases/releases/tag/v0.22.9)
diff --git a/docs/08-References/Partition/metal-bmc/metal-bmc.md b/docs/08-References/Partition/metal-bmc/metal-bmc.md
index 26594b6b..7f36d9c5 100644
--- a/docs/08-References/Partition/metal-bmc/metal-bmc.md
+++ b/docs/08-References/Partition/metal-bmc/metal-bmc.md
@@ -6,7 +6,7 @@ sidebar_position: 2
 
 # metal-bmc
 
-`metal-bmc` is responsible to gather data from machines via the out of band interfaces and report them back to the metal-api.
+`metal-bmc` is responsible to gather data from machines via the out of band interfaces and report them back to the metal-apiserver.
 It also passes commands to the machines like power on/off, led on/off, firmware update etc.
 Access to the console of a machine is also terminated here in conjunction with the `metal-console` running in the control-plane.
 
@@ -14,9 +14,9 @@ More details per package as follows:
 
 ## Reporter
 
-Reporter reports the ip addresses that are leased to ipmi devices together with their machine uuids to the `metal-api`.
-Therewith it is possible to have knowledge about new machines very early in the `metal-api` and also get knowledge about possibly changing ipmi ip addresses.
-`metal-bmc` parses the DHCPD lease file and reports the mapping of machine uuids to ipmi ip address to the `metal-api`.
+Reporter reports the ip addresses that are leased to ipmi devices together with their machine uuids to the `metal-apiserver`.
+Therewith it is possible to have knowledge about new machines very early in the `metal-apiserver` and also get knowledge about possibly changing ipmi ip addresses.
+`metal-bmc` parses the DHCPD lease file and reports the mapping of machine uuids to ipmi ip address to the `metal-apiserver`.
 
 ## BMC
 
@@ -24,7 +24,7 @@ The `bmc` package serves the following:
 
 ### Commands
 
-Commands from the metal-api are passed via nsq and executed either through redfish or ipmi against the out-of-band interface of a machine.
+Commands from the metal-apiserver are passed via nsq and executed either through redfish or ipmi against the out-of-band interface of a machine.
 
 ### Firmware
 
@@ -32,4 +32,4 @@ Firmware updates the firmware of the BIOS and the BMC of a machine.
 
 ### Console
 
-Console forwards the the serial console access terminated in `metal-console` to the machine.
\ No newline at end of file
+Console forwards the serial console access terminated in `metal-console` to the machine.
diff --git a/scripts/components.json b/scripts/components.json
index 9fa2efe8..06af3288 100644
--- a/scripts/components.json
+++ b/scripts/components.json
@@ -66,7 +66,7 @@
         "releasePath": "docker-images.metal-stack.control-plane.metal-apiserver.tag",
         "repo": "metal-stack/metal-apiserver",
         "branch": "main",
-        "tag": "v0.11.2",
+        "tag": "v0.12.0",
         "position": 6,
         "withDocs": false
       },
@@ -75,7 +75,7 @@
         "releasePath": "docker-images.metal-stack.control-plane.metal-console.tag",
         "repo": "metal-stack/metal-console",
         "branch": "main",
-        "tag": "v0.8.1",
+        "tag": "v0.8.2",
         "position": 7,
         "withDocs": false
       }
@@ -98,7 +98,7 @@
         "releasePath": "docker-images.metal-stack.partition.metal-bmc.tag",
         "repo": "metal-stack/metal-bmc",
         "branch": "main",
-        "tag": "v0.7.3",
+        "tag": "v0.8.0",
         "position": 2,
         "withDocs": false
       },
@@ -125,7 +125,7 @@
         "releasePath": "docker-images.metal-stack.partition.pixiecore.tag",
         "repo": "metal-stack/pixie",
         "branch": "main",
-        "tag": "v0.4.1",
+        "tag": "v0.5.0",
         "position": 5,
         "withDocs": false
       }
diff --git a/src/version.json b/src/version.json
index cdf5cdcc..43cf5958 100644
--- a/src/version.json
+++ b/src/version.json
@@ -1 +1 @@
-{"version": "v0.22.24"}
+{"version": "v0.22.25"}
diff --git a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.0.md b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.0.md
index 181ed483..9e62aaf8 100644
--- a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.0.md	
+++ b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.0.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.0
 title: v0.22.0
-sidebar_position: 25
+sidebar_position: 26
 ---
 # metal-stack v0.22.0
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.0](https://github.com/metal-stack/releases/releases/tag/v0.22.0)
diff --git a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.1.md b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.1.md
index 4f97b1fe..ca5bdba5 100644
--- a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.1.md	
+++ b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.1.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.1
 title: v0.22.1
-sidebar_position: 24
+sidebar_position: 25
 ---
 # metal-stack v0.22.1
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.1](https://github.com/metal-stack/releases/releases/tag/v0.22.1)
diff --git a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.10.md b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.10.md
index b2561cdc..a07e311b 100644
--- a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.10.md	
+++ b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.10.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.10
 title: v0.22.10
-sidebar_position: 15
+sidebar_position: 16
 ---
 # metal-stack v0.22.10
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.10](https://github.com/metal-stack/releases/releases/tag/v0.22.10)
diff --git a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.11.md b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.11.md
index 5930ee22..2333df1b 100644
--- a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.11.md	
+++ b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.11.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.11
 title: v0.22.11
-sidebar_position: 14
+sidebar_position: 15
 ---
 # metal-stack v0.22.11
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.11](https://github.com/metal-stack/releases/releases/tag/v0.22.11)
diff --git a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.12.md b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.12.md
index c9e3ab63..9f2ca13a 100644
--- a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.12.md	
+++ b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.12.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.12
 title: v0.22.12
-sidebar_position: 13
+sidebar_position: 14
 ---
 # metal-stack v0.22.12
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.12](https://github.com/metal-stack/releases/releases/tag/v0.22.12)
diff --git a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.13.md b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.13.md
index 390c9673..7e018ef8 100644
--- a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.13.md	
+++ b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.13.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.13
 title: v0.22.13
-sidebar_position: 12
+sidebar_position: 13
 ---
 # metal-stack v0.22.13
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.13](https://github.com/metal-stack/releases/releases/tag/v0.22.13)
diff --git a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.14.md b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.14.md
index 1dbd1fee..3cf50d21 100644
--- a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.14.md	
+++ b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.14.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.14
 title: v0.22.14
-sidebar_position: 11
+sidebar_position: 12
 ---
 # metal-stack v0.22.14
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.14](https://github.com/metal-stack/releases/releases/tag/v0.22.14)
diff --git a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.15.md b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.15.md
index 851888b9..2fabe276 100644
--- a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.15.md	
+++ b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.15.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.15
 title: v0.22.15
-sidebar_position: 10
+sidebar_position: 11
 ---
 # metal-stack v0.22.15
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.15](https://github.com/metal-stack/releases/releases/tag/v0.22.15)
diff --git a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.16.md b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.16.md
index cc4f185a..69df4d72 100644
--- a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.16.md	
+++ b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.16.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.16
 title: v0.22.16
-sidebar_position: 9
+sidebar_position: 10
 ---
 # metal-stack v0.22.16
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.16](https://github.com/metal-stack/releases/releases/tag/v0.22.16)
diff --git a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.17.md b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.17.md
index 13de2558..82a8d48b 100644
--- a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.17.md	
+++ b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.17.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.17
 title: v0.22.17
-sidebar_position: 8
+sidebar_position: 9
 ---
 # metal-stack v0.22.17
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.17](https://github.com/metal-stack/releases/releases/tag/v0.22.17)
diff --git a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.18.md b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.18.md
index 7b3ff28a..1f18960b 100644
--- a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.18.md	
+++ b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.18.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.18
 title: v0.22.18
-sidebar_position: 7
+sidebar_position: 8
 ---
 # metal-stack v0.22.18
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.18](https://github.com/metal-stack/releases/releases/tag/v0.22.18)
diff --git a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.19.md b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.19.md
index b3ec768d..7fb73a0f 100644
--- a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.19.md	
+++ b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.19.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.19
 title: v0.22.19
-sidebar_position: 6
+sidebar_position: 7
 ---
 # metal-stack v0.22.19
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.19](https://github.com/metal-stack/releases/releases/tag/v0.22.19)
diff --git a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.2.md b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.2.md
index ad090930..ea4753e8 100644
--- a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.2.md	
+++ b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.2.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.2
 title: v0.22.2
-sidebar_position: 23
+sidebar_position: 24
 ---
 # metal-stack v0.22.2
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.2](https://github.com/metal-stack/releases/releases/tag/v0.22.2)
diff --git a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.20.md b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.20.md
index b1247bad..1198aabf 100644
--- a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.20.md	
+++ b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.20.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.20
 title: v0.22.20
-sidebar_position: 5
+sidebar_position: 6
 ---
 # metal-stack v0.22.20
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.20](https://github.com/metal-stack/releases/releases/tag/v0.22.20)
diff --git a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.21.md b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.21.md
index f763bce1..e08c3c9f 100644
--- a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.21.md	
+++ b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.21.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.21
 title: v0.22.21
-sidebar_position: 4
+sidebar_position: 5
 ---
 # metal-stack v0.22.21
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.21](https://github.com/metal-stack/releases/releases/tag/v0.22.21)
diff --git a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.22.md b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.22.md
index 532380b6..8d995e8f 100644
--- a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.22.md	
+++ b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.22.md	
@@ -1,14 +1,14 @@
 ---
 slug: /release-notes/v0.22.22
 title: v0.22.22
-sidebar_position: 3
+sidebar_position: 4
 ---
 # metal-stack v0.22.22
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.22](https://github.com/metal-stack/releases/releases/tag/v0.22.22)
 ## General
 * [Gardener v1.141](https://github.com/gardener/gardener/releases/tag/v1.141.0)
   - ⚠️ Gardener does no longer support Garden, Seed, or Shoot clusters with Kubernetes versions <= 1.30. Make sure to upgrade all existing clusters before upgrading to this Gardener version.
-* This release was integration tested against the control plane that fully uses Gateway API and without anymore Ingress resources. We recommend to migrate to Gateway API for this release.
+* This release was integration tested against the control plane that fully uses Gateway API and without anymore Ingress resources. We recommend to migrate to Gateway API for this release. Documentation for the migration can be found [here](https://metal-stack.io/docs/migrating-to-gatewayapi).
 ## Required Actions
 * The metal-image-cache-sync is the first component to be migrated to use the V2 metal-stack API by communicating with the metal-apiserver. To deploy it, please take care of the following tasks:
   
@@ -18,7 +18,6 @@ See original release note at [https://github.com/metal-stack/releases/releases/t
 ## Breaking Changes
 * The metal-image-cache-sync has been migrated to the metal-stack V2 API. This means that it is no longer possible to connect to the metal-api, but instead to the new metal-apiserver, which was introduced in an earlier release. Please check the metal-roles release notes and adapt your deployment accordingly. (metal-stack/metal-image-cache-sync#21)
 * The `metal_apiserver_session_secret` variable is now required. Make sure that it set in your deployment and has a length >= 10 characters. (metal-stack/metal-roles#725)
-* `dhcp_relay_src_intf` and `dhcp_relay_server_vrf` are no longer set automatically when `dhcp_servers` are defined but must be set explicitly. (metal-stack/sonic-configdb-utils#50)
 ## Component Releases
 ### gardener-extension-dns-powerdns v0.8.0
 * Fix RBACs for runtime clusters. (metal-stack/gardener-extension-dns-powerdns#16) @Gerrit91
diff --git a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.23.md b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.23.md
index 3b3b08e7..133a7cc3 100644
--- a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.23.md	
+++ b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.23.md	
@@ -1,13 +1,13 @@
 ---
 slug: /release-notes/v0.22.23
 title: v0.22.23
-sidebar_position: 2
+sidebar_position: 3
 ---
 # metal-stack v0.22.23
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.23](https://github.com/metal-stack/releases/releases/tag/v0.22.23)
 ## General
 - Updates Gardener to [1.142](https://github.com/gardener/gardener/releases/tag/v1.142.0)
-* This release was integration tested against the control plane that fully uses Gateway API and without anymore Ingress resources. We recommend to migrate to Gateway API for this release.
+* This release was integration tested against the control plane that fully uses Gateway API and without anymore Ingress resources. We recommend to migrate to Gateway API already with the previous release. Documentation for the migration can be found [here](https://metal-stack.io/docs/migrating-to-gatewayapi).
 ## Breaking Changes
 * [OPERATOR] ⚠️ Gardener does no longer support Garden, Seed, or Shoot clusters with Kubernetes version `1.31`. Make sure to upgrade all existing clusters before upgrading to this Gardener version. (metal-stack/releases#321)
 * Cluster API Provider metal-stack drops support for Kubernetes `1.32`.
diff --git a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.24.md b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.24.md
index 4221770d..fea3d1ba 100644
--- a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.24.md	
+++ b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.24.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.24
 title: v0.22.24
-sidebar_position: 1
+sidebar_position: 2
 ---
 # metal-stack v0.22.24
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.24](https://github.com/metal-stack/releases/releases/tag/v0.22.24)
diff --git a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.25.md b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.25.md
new file mode 100644
index 00000000..4834e825
--- /dev/null
+++ b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.25.md	
@@ -0,0 +1,60 @@
+---
+slug: /release-notes/v0.22.25
+title: v0.22.25
+sidebar_position: 1
+---
+# metal-stack v0.22.25
+See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.25](https://github.com/metal-stack/releases/releases/tag/v0.22.25)
+## General
+* [Gardener v1.144](https://github.com/gardener/gardener/releases/v1.144.0)
+## Noteworthy
+* metal-bmc and pixiecore were migrated to V2. Backwards-compatibility was maintained such that BMC commands and machine allocations can still be run as usual through metal-api. No new role parametrization should be required. (metal-stack/metal-roles#744)
+## Required Actions
+* Pixie now offers the iPXE build variant `snponly.efi` as an alternative to `ipxe.efi` for machine booting. This variant in general supports more hardware at the cost of performance. You can set the new `--ipxe-type` for configuration. (metal-stack/pixie#48)
+* metal-bmc certs were moved to `/etc/metal-bmc`. The old folders `/certs/nsq` and `/certs/console` can be cleaned up manually. (metal-stack/metal-roles#744)
+## Component Releases
+### api v0.7.0
+* Enable auditing for infra API. (metal-stack/api#192) @Gerrit91
+* Mark SwitchNic.Mac as deprecated (metal-stack/api#191) @iljarotar
+* Update dependencies (metal-stack/api#189) @majst01
+* Add infra endpoint to issue machine tokens for metal-hammer. (metal-stack/api#194) @Gerrit91
+* Add client helper to reading infinitely from server streams. (metal-stack/api#195) @Gerrit91
+### metal-console v0.8.2
+* Fix build version not properly set. (metal-stack/metal-console#68) @Gerrit91
+### helm-charts v0.7.11
+* Disable metal-apiserver http route timeouts (metal-stack/helm-charts#180) @Gerrit91
+### metal-ansible-modules v0.3.3
+* Add machine roles and infra role to `metal_v2_admin_token` module (metal-stack/metal-ansible-modules#32) @Gerrit91
+### ansible-common v0.9.3
+* Allow to specify docker container hostname. (metal-stack/ansible-common#52) @Gerrit91
+### metal-apiserver v0.12.0
+* Implement machine token endpoint in boot service. (metal-stack/metal-apiserver#322) @Gerrit91
+* Make machine bmc commands synchronous. (metal-stack/metal-apiserver#325) @Gerrit91
+* Bump to API v0.7.0 without implementations. (metal-stack/metal-apiserver#324) @Gerrit91
+* Exclude streaming procedures from write timeouts. (metal-stack/metal-apiserver#323) @Gerrit91
+### metal-deployment-base v0.9.3
+* Update ansible-common to v0.9.1 (metal-stack/metal-deployment-base#53) @mwennrich
+### pixie v0.5.0
+* Migrate to V2 metal-apiserver with backwards compatibility. (metal-stack/pixie#51) @Gerrit91
+* add option to switch UEFI boot to snponly (metal-stack/pixie#48) @mwennrich
+* Update to actions-common and update Go to v1.27. (metal-stack/pixie#50) @Gerrit91
+* update ipxe to 2.0 (metal-stack/pixie#46) @mwennrich
+* Set console `ttyS0` for FUJITSU manufacturer (metal-stack/pixie#45) @simcod
+### metal-bmc v0.8.0
+* Migrate to V2 metal-apiserver, maintaining V1 compatibility (metal-stack/metal-bmc#100) @Gerrit91
+### metal-roles v0.36.0
+* Migrate metal-bmc and pixiecore to V2. (metal-stack/metal-roles#744) @Gerrit91
+* Increase retries for headscale container startup. (metal-stack/metal-roles#750) @Gerrit91
+* Validate rendered service configs before installing them (metal-stack/metal-roles#705) @GeertJohan
+# Merged Pull Requests
+This is a list of pull requests that were merged since the last release. The list does not contain pull requests from release-vector-repositories.
+
+The fact that these pull requests were merged does not necessarily imply that they have already become part of this metal-stack release.
+
+* Bump releases to version v0.22.24 (metal-stack/website#356) @metal-robot[bot]
+* Explicitly disable rp_filter on lan interfaces for almalinux (metal-stack/metal-images#449) @mreiger
+* Allow more client TLS config options like providing certs. (metal-stack/ontap-go#8) @Gerrit91
+* Templates and storage attachment (metal-stack/planner#15) @mwindower
+* Control plane (metal-stack/planner#16) @mwindower
+* Hand the network to systemd-networkd and systemd-resolved at install (metal-stack/bootstrap-debian#1) @muhittink
+* Next release (metal-stack/releases#325) @metal-robot[bot]
\ No newline at end of file
diff --git a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.3.md b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.3.md
index 8c9c5f98..a810b579 100644
--- a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.3.md	
+++ b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.3.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.3
 title: v0.22.3
-sidebar_position: 22
+sidebar_position: 23
 ---
 # metal-stack v0.22.3
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.3](https://github.com/metal-stack/releases/releases/tag/v0.22.3)
diff --git a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.4.md b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.4.md
index f1fa8ba1..7e5613b9 100644
--- a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.4.md	
+++ b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.4.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.4
 title: v0.22.4
-sidebar_position: 21
+sidebar_position: 22
 ---
 # metal-stack v0.22.4
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.4](https://github.com/metal-stack/releases/releases/tag/v0.22.4)
diff --git a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.5.md b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.5.md
index accc5136..c7cdbeeb 100644
--- a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.5.md	
+++ b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.5.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.5
 title: v0.22.5
-sidebar_position: 20
+sidebar_position: 21
 ---
 # metal-stack v0.22.5
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.5](https://github.com/metal-stack/releases/releases/tag/v0.22.5)
diff --git a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.6.md b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.6.md
index 06ccfa30..1a4f89bc 100644
--- a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.6.md	
+++ b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.6.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.6
 title: v0.22.6
-sidebar_position: 19
+sidebar_position: 20
 ---
 # metal-stack v0.22.6
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.6](https://github.com/metal-stack/releases/releases/tag/v0.22.6)
diff --git a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.7.md b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.7.md
index cd93f42e..17094046 100644
--- a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.7.md	
+++ b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.7.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.7
 title: v0.22.7
-sidebar_position: 18
+sidebar_position: 19
 ---
 # metal-stack v0.22.7
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.7](https://github.com/metal-stack/releases/releases/tag/v0.22.7)
diff --git a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.8.md b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.8.md
index 9dbe7a63..73b1aae1 100644
--- a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.8.md	
+++ b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.8.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.8
 title: v0.22.8
-sidebar_position: 17
+sidebar_position: 18
 ---
 # metal-stack v0.22.8
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.8](https://github.com/metal-stack/releases/releases/tag/v0.22.8)
diff --git a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.9.md b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.9.md
index 58e50335..1a8b3fba 100644
--- a/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.9.md	
+++ b/versioned_docs/version-v0.22/07-Release Notes/v0.22/v0.22.9.md	
@@ -1,7 +1,7 @@
 ---
 slug: /release-notes/v0.22.9
 title: v0.22.9
-sidebar_position: 16
+sidebar_position: 17
 ---
 # metal-stack v0.22.9
 See original release note at [https://github.com/metal-stack/releases/releases/tag/v0.22.9](https://github.com/metal-stack/releases/releases/tag/v0.22.9)
diff --git a/versioned_docs/version-v0.22/08-References/Partition/metal-bmc/metal-bmc.md b/versioned_docs/version-v0.22/08-References/Partition/metal-bmc/metal-bmc.md
index 26594b6b..7f36d9c5 100644
--- a/versioned_docs/version-v0.22/08-References/Partition/metal-bmc/metal-bmc.md
+++ b/versioned_docs/version-v0.22/08-References/Partition/metal-bmc/metal-bmc.md
@@ -6,7 +6,7 @@ sidebar_position: 2
 
 # metal-bmc
 
-`metal-bmc` is responsible to gather data from machines via the out of band interfaces and report them back to the metal-api.
+`metal-bmc` is responsible to gather data from machines via the out of band interfaces and report them back to the metal-apiserver.
 It also passes commands to the machines like power on/off, led on/off, firmware update etc.
 Access to the console of a machine is also terminated here in conjunction with the `metal-console` running in the control-plane.
 
@@ -14,9 +14,9 @@ More details per package as follows:
 
 ## Reporter
 
-Reporter reports the ip addresses that are leased to ipmi devices together with their machine uuids to the `metal-api`.
-Therewith it is possible to have knowledge about new machines very early in the `metal-api` and also get knowledge about possibly changing ipmi ip addresses.
-`metal-bmc` parses the DHCPD lease file and reports the mapping of machine uuids to ipmi ip address to the `metal-api`.
+Reporter reports the ip addresses that are leased to ipmi devices together with their machine uuids to the `metal-apiserver`.
+Therewith it is possible to have knowledge about new machines very early in the `metal-apiserver` and also get knowledge about possibly changing ipmi ip addresses.
+`metal-bmc` parses the DHCPD lease file and reports the mapping of machine uuids to ipmi ip address to the `metal-apiserver`.
 
 ## BMC
 
@@ -24,7 +24,7 @@ The `bmc` package serves the following:
 
 ### Commands
 
-Commands from the metal-api are passed via nsq and executed either through redfish or ipmi against the out-of-band interface of a machine.
+Commands from the metal-apiserver are passed via nsq and executed either through redfish or ipmi against the out-of-band interface of a machine.
 
 ### Firmware
 
@@ -32,4 +32,4 @@ Firmware updates the firmware of the BIOS and the BMC of a machine.
 
 ### Console
 
-Console forwards the the serial console access terminated in `metal-console` to the machine.
\ No newline at end of file
+Console forwards the serial console access terminated in `metal-console` to the machine.