diff --git a/docs/_data/extra_pages.json b/docs/_data/extra_pages.json
index 09a6bed09c..958ab86a6d 100644
--- a/docs/_data/extra_pages.json
+++ b/docs/_data/extra_pages.json
@@ -96,8 +96,13 @@
   },
   {
     "category": "Publications",
-    "title": "RHEL7 docs",
-    "url": "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/system_administrators_guide/chap-managing_services_with_systemd"
+    "title": "RHEL9 docs - Configuring basic system settings - Managing systemd",
+    "url": "https://docs.redhat.com/en/documentation/red_hat_enterprise_linux/9/html/configuring_basic_system_settings/managing-systemd_configuring-basic-system-settings#managing-systemd_configuring-basic-system-settings"
+  },
+  {
+    "category": "Publications",
+    "title": "RHEL9 docs - Using systemd unit files to customize and optimize your system",
+    "url": "https://docs.redhat.com/en/documentation/red_hat_enterprise_linux/9/html/using_systemd_unit_files_to_customize_and_optimize_your_system/index"
   },
   {
     "category": "Publications",
diff --git a/meson.build b/meson.build
index 933133e6b1..881dfb4306 100644
--- a/meson.build
+++ b/meson.build
@@ -1351,10 +1351,6 @@ libgcrypt = dependency('libgcrypt',
                        required : feature)
 libgpg_error = dependency('gpg-error',
                           required : feature.disabled() ? feature : false)
-if not libgpg_error.found()
-        # CentOS 8 does not provide the .pc file.
-        libgpg_error = cc.find_library('gpg-error', required : feature)
-endif
 
 have = libgcrypt.found() and libgpg_error.found()
 if not have
diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index 9203948d6c..b6549b96b3 100755
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -2862,10 +2862,6 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
 
     @expectedFailureIfModuleIsNotAvailable('fou')
     def test_fou(self):
-        # The following redundant check is necessary for CentOS CI.
-        # Maybe, error handling in lookup_id() in sd-netlink/generic-netlink.c needs to be updated.
-        self.assertTrue(is_module_available('fou'))
-
         copy_network_unit('25-fou-ipproto-ipip.netdev', '25-fou-ipproto-gre.netdev',
                           '25-fou-ipip.netdev', '25-fou-sit.netdev',
                           '25-fou-gre.netdev', '25-fou-gretap.netdev')
@@ -7923,7 +7919,7 @@ class NetworkdDHCPPDTests(unittest.TestCase, Utilities):
         self.assertGreater(prefixInfo[0]['PreferredLifetimeUSec'], 0)
         self.assertGreater(prefixInfo[0]['ValidLifetimeUSec'], 0)
 
-    @unittest.skipUnless(shutil.which('dhcpd'), reason="dhcpd is not available on CentOS Stream 10")
+    @unittest.skipUnless(shutil.which('dhcpd'), reason="dhcpd is not available")
     def test_dhcp6pd_no_address(self):
         # For issue #29979.
         copy_network_unit('25-veth.netdev', '25-dhcp6pd-server.network', '25-dhcp6pd-upstream-no-address.network')
@@ -7945,7 +7941,7 @@ class NetworkdDHCPPDTests(unittest.TestCase, Utilities):
 
         self.check_dhcp6_prefix('veth99')
 
-    @unittest.skipUnless(shutil.which('dhcpd'), reason="dhcpd is not available on CentOS Stream 10")
+    @unittest.skipUnless(shutil.which('dhcpd'), reason="dhcpd is not available")
     def test_dhcp6pd_no_assign(self):
         # Similar to test_dhcp6pd_no_assign(), but in this case UseAddress=yes (default),
         # However, the server does not provide IA_NA. For issue #31349.
@@ -7968,7 +7964,7 @@ class NetworkdDHCPPDTests(unittest.TestCase, Utilities):
 
         self.check_dhcp6_prefix('veth99')
 
-    @unittest.skipUnless(shutil.which('dhcpd'), reason="dhcpd is not available on CentOS Stream 10")
+    @unittest.skipUnless(shutil.which('dhcpd'), reason="dhcpd is not available")
     def test_dhcp6pd(self):
         copy_network_unit('25-veth.netdev', '25-dhcp6pd-server.network', '25-dhcp6pd-upstream.network',
                           '25-veth-downstream-veth97.netdev', '25-dhcp-pd-downstream-veth97.network', '25-dhcp-pd-downstream-veth97-peer.network',
diff --git a/tools/meson-build.sh b/tools/meson-build.sh
index 2366df23f9..64498be605 100755
--- a/tools/meson-build.sh
+++ b/tools/meson-build.sh
@@ -16,6 +16,4 @@ if [ ! -f "$builddir/build.ninja" ]; then
     CC="$CC" CXX="$CXX" meson setup -Dc_args="$c_args" -Dcpp_args="$cpp_args" "$builddir" "$sourcedir" $options
 fi
 
-# Locate ninja binary, on CentOS 7 it is called ninja-build, so use that name if available.
-command -v ninja-build >/dev/null && ninja="ninja-build" || ninja="ninja"
-"$ninja" -C "$builddir" "$target"
+ninja -C "$builddir" "$target"