diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index b9d84dcca9..fe7c80fdbc 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -1244,6 +1244,11 @@ static void cgroup_context_apply(
                         xsprintf(buf, "%" PRIu64 "\n", weight);
                         (void) set_attribute_and_warn(u, "blkio", "blkio.weight", buf);
 
+                        /* FIXME: drop this when distro kernels properly support BFQ through "blkio.weight"
+                         * See also: https://github.com/systemd/systemd/pull/13335 */
+                        xsprintf(buf, "%" PRIu64 "\n", weight);
+                        (void) set_attribute_and_warn(u, "blkio", "blkio.bfq.weight", buf);
+
                         if (has_io) {
                                 CGroupIODeviceWeight *w;