diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml
index 38982cdeeee..1784a99deb9 100644
--- a/man/kernel-command-line.xml
+++ b/man/kernel-command-line.xml
@@ -646,7 +646,7 @@
         <term><varname>systemd.firstboot=</varname></term>
 
         <listitem><para>Takes a boolean argument, defaults to on. If off,
-        <citerefentry><refentrytitle>systemd-firstboot.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+        <citerefentry><refentrytitle>systemd-firstboot.service</refentrytitle><manvolnum>1</manvolnum></citerefentry>
         and
         <citerefentry><refentrytitle>systemd-homed-firstboot.service</refentrytitle><manvolnum>1</manvolnum></citerefentry>
         will not query the user for basic system settings, even if the system boots up for the first time and
@@ -898,7 +898,7 @@
         <member><citerefentry><refentrytitle>systemd-backlight@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
         <member><citerefentry><refentrytitle>systemd-rfkill.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
         <member><citerefentry><refentrytitle>systemd-hibernate-resume-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
-        <member><citerefentry><refentrytitle>systemd-firstboot.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
+        <member><citerefentry><refentrytitle>systemd-firstboot.service</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
         <member><citerefentry><refentrytitle>bootctl</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
       </simplelist></para>
   </refsect1>
diff --git a/man/systemd-coredump.xml b/man/systemd-coredump.xml
index c27981bd89b..4741d254083 100644
--- a/man/systemd-coredump.xml
+++ b/man/systemd-coredump.xml
@@ -107,7 +107,7 @@
         which ensures that coredumps of a container are attempted to be forwarded to
         <filename>systemd-coredump@.service</filename> running inside the container, i.e the container gets
         to process and store its own core dumps. Note that
-        <citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+        <citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry>
         defaults to this mode if invoked with the <option>--boot</option> switch. This mode of operation is
         generally recommended for security reasons: the security-sensitive processing of the core dump is
         done within the confinements of the container itself, by the container's own code, backed by the
diff --git a/man/systemd-repart.xml b/man/systemd-repart.xml
index 2d7fedd3cd9..f9cd28f8720 100644
--- a/man/systemd-repart.xml
+++ b/man/systemd-repart.xml
@@ -807,7 +807,7 @@ systemd-repart -C \
 systemd-confext refresh</programlisting>
 
       <para>The DDI generated that way may be applied to the system with
-      <citerefentry><refentrytitle>systemd-confext</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
+      <citerefentry><refentrytitle>systemd-confext</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
     </example>
 
     <example>
diff --git a/man/systemd-vconsole-setup.service.xml b/man/systemd-vconsole-setup.service.xml
index e6656eb5785..4f018424fba 100644
--- a/man/systemd-vconsole-setup.service.xml
+++ b/man/systemd-vconsole-setup.service.xml
@@ -71,7 +71,7 @@
         credentials.</para>
 
         <para>Note the relationship to the <varname>firstboot.keymap</varname> credential understood by
-        <citerefentry><refentrytitle>systemd-firstboot.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>:
+        <citerefentry><refentrytitle>systemd-firstboot.service</refentrytitle><manvolnum>1</manvolnum></citerefentry>:
         both ultimately affect the same setting, but <varname>firstboot.keymap</varname> is written into
         <filename>/etc/vconsole.conf</filename> on first boot (if not already configured), and then read from
         there by <command>systemd-vconsole-setup</command>, while <varname>vconsole.keymap</varname> is read
diff --git a/man/systemd.special.xml b/man/systemd.special.xml
index f6f35b861d0..a86d32afc28 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -1037,7 +1037,7 @@ WantedBy=sleep.target</programlisting>
           <listitem><para>This template unit is used to order mount units and other consumers of block
           devices after services that synthesize these block devices. In particular, this is intended to be
           used with storage services (such as
-          <citerefentry><refentrytitle>systemd-cryptsetup@.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>/
+          <citerefentry><refentrytitle>systemd-cryptsetup@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>/
           <citerefentry><refentrytitle>systemd-veritysetup@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>)
           that allocate and manage a virtual block device. Storage services are ordered before an instance of
           <filename>blockdev@.target</filename>, and the consumer units after it. The ordering is
diff --git a/man/systemd.system-credentials.xml b/man/systemd.system-credentials.xml
index f316961cd72..eb7e3aff92b 100644
--- a/man/systemd.system-credentials.xml
+++ b/man/systemd.system-credentials.xml
@@ -549,7 +549,7 @@
           <filename>/etc/userdb/foobar.group</filename>. Symlinks for the uid/gid will also be created in
           <filename>/etc/userdb/</filename>, as well as the corresponding<filename>.membership</filename>
           files. See
-          <citerefentry><refentrytitle>systemd-userdbd.service</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
+          <citerefentry><refentrytitle>systemd-userdbd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
           <citerefentry><refentrytitle>nss-systemd</refentrytitle><manvolnum>8</manvolnum></citerefentry>, and
           <citerefentry><refentrytitle>userdbctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
           for details.</para>