diff --git a/build_scripts/code-compilation/client.sh b/build_scripts/code-compilation/client.sh
index e8218b63..0b6f2331 100644
--- a/build_scripts/code-compilation/client.sh
+++ b/build_scripts/code-compilation/client.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+-devel userspace-rcu libnsl2-devel libcephfs-devel#!/bin/sh
 #
 # Environment variables used:
 #  - SERVER: hostname or IP-address of the NFS-server
@@ -15,7 +15,7 @@ set -x
 
 # install build and runtime dependencies
 echo "Install build and runtime dependencies"
-yum -y install nfs-utils git gcc time
+yum -y install nfs-utils git gcc time centos-release-gluster
 
 # flag for commands which should run only once
 once=0
@@ -33,7 +33,9 @@ do
     if [ $once -eq 0 ]
     then
         if [ "${CENTOS_VERSION}" == "7" ]; then
-          yum -y install bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel libnfsidmap-devel libwbclient-devel libcap-devel libblkid-devel rpm-build redhat-rpm-config centos-release-gluster userspace-rcu-devel userspace-rcu libnsl2-devel libcephfs-devel
+          yum -y install bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel libnfsidmap-devel libwbclient-devel libcap-devel libblkid-devel rpm-build redhat-rpm-config glusterfs-api epel-release libnsl2-devel libcephfs-devel
+          yum clean all & yum clean metadata
+          yum -y install userspace-rcu
         elif [ "${CENTOS_VERSION}" == "8s" ]; then
           yum -y install bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel libcap-devel libblkid-devel rpm-build redhat-rpm-config glusterfs-api
           yum -y --enablerepo=powertools install libnfsidmap-devel libwbclient-devel userspace-rcu-devel userspace-rcu libnsl2-devel libcephfs-devel
diff --git a/jobs/nfs-ganesha_trigger-checkpatch.yml b/jobs/checkpatch.yml
similarity index 96%
rename from jobs/nfs-ganesha_trigger-checkpatch.yml
rename to jobs/checkpatch.yml
index 68664fd1..21e3d8ac 100644
--- a/jobs/nfs-ganesha_trigger-checkpatch.yml
+++ b/jobs/checkpatch.yml
@@ -1,5 +1,5 @@
 - job:
-    name: nfs-ganesha_trigger-checkpatch 
+    name: checkpatch 
     node: cico-workspace
     description: "Run checkpatch on nfs-ganesha. This job is triggered by sending a change to https://review.gerrithub.io/#/q/project:ffilz/nfs-ganesha for review\n\nNote: it is possible to retrigger a test for a change by including recheck checkpatch in a comment on GerritHub." 
     project-type: freestyle
@@ -51,4 +51,4 @@
                   branch-compare-type: ANT
 
     wrappers:
-    - ssh-agent
+    - gerrithub_key 
diff --git a/jobs/scripts/checkpatch.sh b/jobs/scripts/checkpatch.sh
index 1c25ff64..0fc8fcc9 100644
--- a/jobs/scripts/checkpatch.sh
+++ b/jobs/scripts/checkpatch.sh
@@ -7,16 +7,14 @@ if [[ -n "$GERRIT_REFSPEC" ]]; then
   GERRIT_PUBLISH=true
 fi
 
-#ssh -o 'StrictHostKeyChecking no' -p 29418 $GERRIT_USER@review.gerrithub.io -v
-
 if ! [ -d nfs-ganesha ]; then
-  GIT_SSH_COMMAND="ssh -o StrictHostKeyChecking=no" git clone --depth=1 -o gerrit ssh://$GERRIT_USER@review.gerrithub.io:29418/ffilz/nfs-ganesha.git -v
+  GIT_SSH_COMMAND="ssh -o StrictHostKeyChecking=no -i $GERRITHUB_KEY" git clone --depth=1 -o gerrit ssh://$GERRIT_USER@review.gerrithub.io:29418/ffilz/nfs-ganesha.git -v
 fi
 
 ( cd nfs-ganesha && git fetch gerrit $GERRIT_REF && git checkout $REVISION )
 
 publish_checkpatch() {
-  local SSH_GERRIT="ssh -p 29418 $GERRIT_USER@review.gerrithub.io"
+  local SSH_GERRIT="ssh -p 29418 -i $GERRITHUB_KEY $GERRIT_USER@review.gerrithub.io"
   if [[ "$GERRIT_PUBLISH" == "true" ]]; then
     tee /proc/$$/fd/1 | $SSH_GERRIT "gerrit review --json --project ffilz/nfs-ganesha $REVISION"
   else