diff --git a/.jenkins.d/00-deps.sh b/.jenkins.d/00-deps.sh
index fb63468..d3b16f9 100755
--- a/.jenkins.d/00-deps.sh
+++ b/.jenkins.d/00-deps.sh
@@ -43,7 +43,7 @@
             ;;
     esac
 
-elif has CentOS-8 $NODE_LABELS; then
+elif has CentOS $NODE_LABELS; then
     sudo dnf -y install gcc-c++ libasan pkgconf-pkg-config python3 \
                         boost-devel openssl-devel sqlite-devel
 fi
diff --git a/.jenkins.d/10-build.sh b/.jenkins.d/10-build.sh
index f2ddf0c..a4e6cd5 100755
--- a/.jenkins.d/10-build.sh
+++ b/.jenkins.d/10-build.sh
@@ -10,8 +10,7 @@
 if [[ $JOB_NAME == *"code-coverage" ]]; then
     COVERAGE="--with-coverage"
 fi
-if has CentOS-8 $NODE_LABELS; then
-    # https://bugzilla.redhat.com/show_bug.cgi?id=1721553
+if [[ -n $DISABLE_PCH ]]; then
     PCH="--without-pch"
 fi
 
@@ -40,7 +39,7 @@
 # Install
 sudo_preserve_env PATH -- ./waf --color=yes install
 
-if has CentOS-8 $NODE_LABELS; then
+if has CentOS $NODE_LABELS; then
     sudo tee /etc/ld.so.conf.d/ndn.conf >/dev/null <<< /usr/local/lib64
 fi
 if has Linux $NODE_LABELS; then
diff --git a/.jenkins.d/20-tests.sh b/.jenkins.d/20-tests.sh
index a752c72..d34fd88 100755
--- a/.jenkins.d/20-tests.sh
+++ b/.jenkins.d/20-tests.sh
@@ -8,8 +8,6 @@
     security unlock-keychain -p named-data
 fi
 
-ndnsec key-gen "/tmp/jenkins/$NODE_NAME" | ndnsec cert-install -
-
 # https://github.com/google/sanitizers/wiki/AddressSanitizerFlags
 ASAN_OPTIONS="color=always"
 ASAN_OPTIONS+=":check_initialization_order=1"
diff --git a/.jenkins.d/40-headers-check.sh b/.jenkins.d/40-headers-check.sh
index 861d8c9..e3493f4 100755
--- a/.jenkins.d/40-headers-check.sh
+++ b/.jenkins.d/40-headers-check.sh
@@ -13,7 +13,7 @@
   exit 0
 fi
 
-if has CentOS-8 $NODE_LABELS; then
+if has CentOS $NODE_LABELS; then
   export PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig
 fi