diff --git a/man/os-release.xml b/man/os-release.xml
index 7e3e9a73a8..875ac946f0 100644
--- a/man/os-release.xml
+++ b/man/os-release.xml
@@ -117,7 +117,7 @@
       change between the build and the deployment phases, it is possible to relax this check: if exactly one
       file whose name matches <literal><filename>extension-release.*</filename></literal> is present in this
       directory, and the file is tagged with a <varname>user.extension-release.strict</varname>
-      <citerefentry><refentrytitle>xattr</refentrytitle><manvolnum>7</manvolnum></citerefentry> set to the
+      <citerefentry project='man-pages'><refentrytitle>xattr</refentrytitle><manvolnum>7</manvolnum></citerefentry> set to the
       string <literal>0</literal>, it will be used instead.</para>
 
       <para>The rest of this document that talks about <filename>os-release</filename> should be understood
@@ -499,14 +499,14 @@ VERSION_ID=32</programlisting>
 
     <example>
       <title>Reading <filename>os-release</filename> in
-      <citerefentry><refentrytitle>sh</refentrytitle><manvolnum>1</manvolnum></citerefentry></title>
+      <citerefentry project='man-pages'><refentrytitle>sh</refentrytitle><manvolnum>1</manvolnum></citerefentry></title>
 
       <programlisting><xi:include href="check-os-release.sh" parse="text" /></programlisting>
     </example>
 
     <example>
       <title>Reading <filename>os-release</filename> in
-      <citerefentry><refentrytitle>python</refentrytitle><manvolnum>1</manvolnum></citerefentry> (versions &gt;= 3.10)</title>
+      <citerefentry project='die-net'><refentrytitle>python</refentrytitle><manvolnum>1</manvolnum></citerefentry> (versions &gt;= 3.10)</title>
 
       <programlisting><xi:include href="check-os-release-simple.py" parse="text" /></programlisting>
 
@@ -517,7 +517,7 @@ VERSION_ID=32</programlisting>
 
     <example>
       <title>Reading <filename>os-release</filename> in
-      <citerefentry><refentrytitle>python</refentrytitle><manvolnum>1</manvolnum></citerefentry> (any version)</title>
+      <citerefentry project='die-net'><refentrytitle>python</refentrytitle><manvolnum>1</manvolnum></citerefentry> (any version)</title>
 
       <programlisting><xi:include href="check-os-release.py" parse="text" /></programlisting>
 
diff --git a/man/systemd-cryptenroll.xml b/man/systemd-cryptenroll.xml
index 02f932edfb..3b235fd9c9 100644
--- a/man/systemd-cryptenroll.xml
+++ b/man/systemd-cryptenroll.xml
@@ -314,8 +314,8 @@
         its configuration. The lockout mechanism is a global property of the TPM,
         <command>systemd-cryptenroll</command> does not control or configure the lockout mechanism. You may
         use tpm2-tss tools to inspect or configure the dictionary attack lockout, with
-        <citerefentry><refentrytitle>tpm2_getcap</refentrytitle><manvolnum>1</manvolnum></citerefentry> and
-        <citerefentry><refentrytitle>tpm2_dictionarylockout</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+        <citerefentry project='mankier'><refentrytitle>tpm2_getcap</refentrytitle><manvolnum>1</manvolnum></citerefentry> and
+        <citerefentry project='mankier'><refentrytitle>tpm2_dictionarylockout</refentrytitle><manvolnum>1</manvolnum></citerefentry>
         commands, respectively.</para></listitem>
       </varlistentry>
 
diff --git a/man/systemd-integritysetup@.service.xml b/man/systemd-integritysetup@.service.xml
index ade5663c28..a47ee4af1a 100644
--- a/man/systemd-integritysetup@.service.xml
+++ b/man/systemd-integritysetup@.service.xml
@@ -33,8 +33,9 @@
     protected block devices. It should be instantiated for each device that requires integrity
     protection.</para>
 
-    <para>At early boot and when the system manager configuration is reloaded, entries from /etc/integritytab are converted into
-    <filename>systemd-integritysetup@.service</filename> units by
+    <para>At early boot and when the system manager configuration is reloaded, entries from
+    <citerefentry><refentrytitle>integritytab</refentrytitle><manvolnum>5</manvolnum></citerefentry> are
+    converted into <filename>systemd-integritysetup@.service</filename> units by
     <citerefentry><refentrytitle>systemd-integritysetup-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
 
     <para><filename>systemd-integritysetup@.service</filename> calls <command>systemd-integritysetup</command>.</para>
@@ -57,7 +58,7 @@
 
         <listitem><para>Create a block device <replaceable>volume</replaceable> using
         <replaceable>device</replaceable>. See
-        <citerefentry><refentrytitle>systemd-integritytab</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+        <citerefentry><refentrytitle>integritytab</refentrytitle><manvolnum>5</manvolnum></citerefentry>
         and
         <ulink url="https://www.kernel.org/doc/html/latest/admin-guide/device-mapper/dm-integrity.html">
           Kernel dm-integrity</ulink> documentation for details.
diff --git a/man/systemd-run.xml b/man/systemd-run.xml
index 66ac26c5f8..ab1fb82567 100644
--- a/man/systemd-run.xml
+++ b/man/systemd-run.xml
@@ -479,7 +479,7 @@ Dec 08 20:44:48 container systemd[1]: Started /bin/touch /tmp/foo.</programlisti
     <example>
       <title>Allowing access to the tty</title>
 
-      <para>The following command invokes <citerefentry><refentrytitle>bash</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+      <para>The following command invokes <citerefentry project='die-net'><refentrytitle>bash</refentrytitle><manvolnum>1</manvolnum></citerefentry>
       as a service passing its standard input, output and error to the calling TTY.</para>
 
       <programlisting># systemd-run -t --send-sighup bash</programlisting>
diff --git a/man/systemd-stub.xml b/man/systemd-stub.xml
index f2d3b91e20..3a8fc925d7 100644
--- a/man/systemd-stub.xml
+++ b/man/systemd-stub.xml
@@ -178,7 +178,7 @@
     <title>Assembling Kernel Images</title>
 
     <para>In order to assemble an UEFI PE kernel image from various components as described above, use an
-    <citerefentry><refentrytitle>objcopy</refentrytitle><manvolnum>1</manvolnum></citerefentry> command line
+    <citerefentry project='man-pages'><refentrytitle>objcopy</refentrytitle><manvolnum>1</manvolnum></citerefentry> command line
     like this:</para>
 
     <programlisting>objcopy \
@@ -196,7 +196,7 @@
     UEFI boot stub.</para>
 
     <para>To then sign the resulting image for UEFI SecureBoot use an
-    <citerefentry><refentrytitle>sbsign</refentrytitle><manvolnum>1</manvolnum></citerefentry> command like
+    <citerefentry project='archlinux'><refentrytitle>sbsign</refentrytitle><manvolnum>1</manvolnum></citerefentry> command like
     the following:</para>
 
     <programlisting>sbsign \
@@ -219,8 +219,8 @@
       <citerefentry><refentrytitle>systemd-sysext</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
       <ulink url="https://systemd.io/BOOT_LOADER_SPECIFICATION">Boot Loader Specification</ulink>,
       <ulink url="https://systemd.io/BOOT_LOADER_INTERFACE">Boot Loader Interface</ulink>,
-      <citerefentry><refentrytitle>objcopy</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>sbsign</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+      <citerefentry project='man-pages'><refentrytitle>objcopy</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+      <citerefentry project='archlinux'><refentrytitle>sbsign</refentrytitle><manvolnum>1</manvolnum></citerefentry>
     </para>
   </refsect1>
 </refentry>
diff --git a/man/systemd-sysusers.xml b/man/systemd-sysusers.xml
index 3ad8135dcd..7da7b18dcf 100644
--- a/man/systemd-sysusers.xml
+++ b/man/systemd-sysusers.xml
@@ -184,7 +184,7 @@
     for the first time, it may not be used for changing the password or shell of an account that already
     exists.</para>
 
-    <para>Use <citerefentry><refentrytitle>mkpasswd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+    <para>Use <citerefentry project='man-pages'><refentrytitle>mkpasswd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
     for generating UNIX password hashes from the command line.</para>
   </refsect1>
 
@@ -202,7 +202,7 @@
       <citerefentry><refentrytitle>sysusers.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
       <ulink url="https://systemd.io/UIDS-GIDS">Users, Groups, UIDs and GIDs on systemd systems</ulink>,
       <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>mkpasswd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+      <citerefentry project='man-pages'><refentrytitle>mkpasswd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
     </para>
   </refsect1>
 
diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index 0ba3c85521..ace1dc6336 100644
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -2134,7 +2134,7 @@
         <term><varname>RoutingAlgorithm=</varname></term>
         <listitem>
           <para>This can be either <literal>batman-v</literal> or <literal>batman-iv</literal> and describes which routing_algo
-          of <citerefentry><refentrytitle>batctl</refentrytitle><manvolnum>8</manvolnum></citerefentry> to use. The algorithm
+          of <citerefentry project='mankier'><refentrytitle>batctl</refentrytitle><manvolnum>8</manvolnum></citerefentry> to use. The algorithm
           cannot be changed after interface creation. Defaults to <literal>batman-v</literal>.
           </para>
         </listitem>
diff --git a/man/udevadm.xml b/man/udevadm.xml
index 5994abde8e..b327a4ef7e 100644
--- a/man/udevadm.xml
+++ b/man/udevadm.xml
@@ -800,7 +800,7 @@
       does not probe a block device while changes are made to it, for example partitions created or file
       systems formatted. Note that many tools that interface with block devices natively support taking
       relevant locks, see for example
-      <citerefentry><refentrytitle>sfdisk</refentrytitle><manvolnum>8</manvolnum></citerefentry>'s
+      <citerefentry project='man-pages'><refentrytitle>sfdisk</refentrytitle><manvolnum>8</manvolnum></citerefentry>'s
       <option>--lock</option> switch.</para>
 
       <para>The command expects at least one block device specified via <option>--device=</option> or