diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 6491ccb2a..61df378a4 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -17,6 +17,9 @@ Deprecated
 Fixed
 -----
 
+- Change enabled services in baseline and releng profile to adapt to changes in ``cloud-init`` (renamed
+  ``cloud-init.service`` to ``cloud-init-main.service``).
+
 Removed
 -------
 
diff --git a/configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-main.service b/configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-main.service
new file mode 120000
index 000000000..875ff7314
--- /dev/null
+++ b/configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-main.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/cloud-init-main.service
\ No newline at end of file
diff --git a/configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-network.service b/configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-network.service
new file mode 120000
index 000000000..ae7773461
--- /dev/null
+++ b/configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-network.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/cloud-init-network.service
\ No newline at end of file
diff --git a/configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service b/configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service
deleted file mode 120000
index 24c7a26f0..000000000
--- a/configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/cloud-init.service
\ No newline at end of file
diff --git a/configs/releng/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-main.service b/configs/releng/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-main.service
new file mode 120000
index 000000000..875ff7314
--- /dev/null
+++ b/configs/releng/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-main.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/cloud-init-main.service
\ No newline at end of file
diff --git a/configs/releng/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-network.service b/configs/releng/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-network.service
new file mode 120000
index 000000000..ae7773461
--- /dev/null
+++ b/configs/releng/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-network.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/cloud-init-network.service
\ No newline at end of file
diff --git a/configs/releng/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service b/configs/releng/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service
deleted file mode 120000
index 24c7a26f0..000000000
--- a/configs/releng/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/systemd/system/cloud-init.service
\ No newline at end of file