diff --git a/build_scripts/code-compilation/basic-gluster-duffy.sh b/build_scripts/code-compilation/basic-gluster-duffy.sh
deleted file mode 100644
index ec5d4131..00000000
--- a/build_scripts/code-compilation/basic-gluster-duffy.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-l!/bin/bash
-
-SERVER_TEST_SCRIPT=${SERVER_TEST_SCRIPT}
-CLIENT_TEST_SCRIPT=${CLIENT_TEST_SCRIPT}
-GERRIT_HOST=${GERRIT_HOST}
-GERRIT_PROJECT=${GERRIT_PROJECT}
-GERRIT_REFSPEC=${GERRIT_REFSPEC}
-CENTOS_VERSION=${CENTOS_VERSION}
-CENTOS_ARCH=${CENTOS_ARCH}
-GLUSTER_VOLUME=${EXPORT}
-
-SERVER_IP=$(cat $WORKSPACE/hosts | sed -n '1p')
-CLIENT_IP=$(cat $WORKSPACE/hosts | sed -n '2p')
-
-SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
-
-scp ${SSH_OPTIONS} ${SERVER_TEST_SCRIPT} root@${SERVER_IP}:./$(basename ${SERVER_TEST_SCRIPT})
-
-ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "GERRIT_HOST='${GERRIT_HOST}' GERRIT_PROJECT='${GERRIT_PROJECT}' GERRIT_REFSPEC='${GERRIT_REFSPEC}' CENTOS_VERSION='${CENTOS_VERSION}' GLUSTER_VOLUME='${EXPORT}' YUM_REPO='${YUM_REPO}' bash ./$(basename ${SERVER_TEST_SCRIPT})"
-
-RETURN_CODE=$?
-
-if [ $RETURN_CODE == 0 ]; then
-    client_env="export SERVER='${SERVER_IP}'"
-    client_env+=" EXPORT='/${EXPORT}'"
-    client_env+=" CENTOS_VERSION='${CENTOS_VERSION}'"
-
-    scp ${SSH_OPTIONS} /duffy-ssh-key/ssh-privatekey root@${CLIENT_IP}:./ssh-privatekey
-
-    ssh -t ${SSH_OPTIONS} root@${CLIENT_IP} 'chmod 0600 ./ssh-privatekey'
-
-    scp ${SSH_OPTIONS} ${CLIENT_TEST_SCRIPT} root@${CLIENT_IP}:./$(basename ${CLIENT_TEST_SCRIPT})
-
-    set +x
-    ssh -t ${SSH_OPTIONS} root@${CLIENT_IP} "SERVER='${SERVER_IP}' EXPORT='/${EXPORT}' CENTOS_VERSION='${CENTOS_VERSION}' bash ./$(basename ${CLIENT_TEST_SCRIPT})"
-    RETURN_CODE_CLIENT=$?
-
-    echo "Checking if the process had crashed!"
-    CHECK_SERVER_PROCESS=$(ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "ps ax | grep ganesha | grep -v grep")
-    if [ -z "${CHECK_SERVER_PROCESS}" ]; then
-        echo "No process was found"
-    fi
-
-    exit $RETURN_CODE_CLIENT
-else
-    echo "The SERVER script failed!"
-    exit $RETURN_CODE
-fi
diff --git a/build_scripts/common/basic-server-client.sh b/build_scripts/common/basic-server-client.sh
new file mode 100644
index 00000000..65ce4ff9
--- /dev/null
+++ b/build_scripts/common/basic-server-client.sh
@@ -0,0 +1,64 @@
+#!/bin/bash
+
+function server_run()
+{
+  if [ "$JOB_NAME" == "iozone-vfs" ] || [ "$JOB_NAME" == "iozone-vfs-minmdcache" ]; then
+    VOLUME_TYPE="VFS"
+  else
+    VOLUME_TYPE="GLUSTER"
+  fi
+
+  if [ "$JOB_NAME" == "pynfs-acl" ]; then
+    INCLUDE_ACL_PARAM=" ENABLE_ACL='${ENABLE_ACL}'"
+  fi
+
+  scp ${SSH_OPTIONS} ${2} root@${1}:./$(basename ${2})
+
+  ssh -t ${SSH_OPTIONS} root@${1} "GERRIT_HOST='${GERRIT_HOST}' GERRIT_PROJECT='${GERRIT_PROJECT}' GERRIT_REFSPEC='${GERRIT_REFSPEC}' CENTOS_VERSION='${CENTOS_VERSION}' CENTOS_ARCH='${CENTOS_ARCH}' ${VOLUME_TYPE}_VOLUME='${EXPORT}' YUM_REPO='${YUM_REPO}' ${INCLUDE_TEMPLATE_URL} ${INCLUDE_ACL_PARAM} bash ./$(basename ${2})"
+  RETURN_CODE=$?
+
+  return $RETURN_CODE
+}
+
+function client_run()
+{
+  scp ${SSH_OPTIONS} ${2} root@${1}:./$(basename ${2})
+
+  if [ "${JOB_NAME}" == "pynfs" ] || [ "${JOB_NAME}" == "pynfs-acl" ]; then
+    INCLUDE_TEST_PARAMS="TEST_PARAMETERS='${TEST_PARAMETERS}'"
+  fi
+
+  ssh -t ${SSH_OPTIONS} root@${1} "SERVER='${3}' EXPORT='/${EXPORT}' CENTOS_VERSION='${CENTOS_VERSION}' ${INCLUDE_TEST_PARAMS} bash ./$(basename ${2})"
+  RETURN_CODE_CLIENT=$?
+
+  return $RETURN_CODE_CLIENT
+}
+
+SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
+SERVER_IP=$(cat $WORKSPACE/hosts | sed -n '1p')
+
+if [ "${TEST_SCRIPT}" ]; then
+  if [ "${TEMPLATES_URL}" ]; then
+    TEMPLATES_FOLDER=$(basename ${TEMPLATES_URL})
+    #Copy the private key to the Server and Give appropriate permission to the file
+    scp ${SSH_OPTIONS} /duffy-ssh-key/ssh-privatekey root@${SERVER_IP}:./ssh-private-key
+    ssh -t ${SSH_OPTIONS} root@${SERVER_IP} 'chmod 0600 ~/ssh-private-key'
+    scp ${SSH_OPTIONS} -r ${TEMPLATES_URL} root@${SERVER_IP}:
+    INCLUDE_TEMPLATE_URL="TEMPLATES_URL='/root/${TEMPLATES_FOLDER}'"
+  fi
+  server_run ${SERVER_IP} ${TEST_SCRIPT}
+  FINAL_RESULT=$?
+elif [ "${SERVER_TEST_SCRIPT}" ] && [ "${CLIENT_TEST_SCRIPT}" ]; then
+  CLIENT_IP=$(cat $WORKSPACE/hosts | sed -n '2p')
+  server_run ${SERVER_IP} ${SERVER_TEST_SCRIPT}
+  SERVER_SCRIPT_RESULT=$?
+  if [ "${SERVER_SCRIPT_RESULT}" == "0" ]; then
+    echo "Server script success!"
+    client_run ${CLIENT_IP} ${CLIENT_TEST_SCRIPT} ${SERVER_IP}
+    FINAL_RESULT=$?
+  else
+    FINAL_RESULT=${SERVER_SCRIPT_RESULT}
+  fi
+fi
+
+exit ${FINAL_RESULT}
diff --git a/build_scripts/cthon04/basic-gluster-duffy.sh b/build_scripts/cthon04/basic-gluster-duffy.sh
deleted file mode 100644
index 020bb3b4..00000000
--- a/build_scripts/cthon04/basic-gluster-duffy.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-SERVER_TEST_SCRIPT=${SERVER_TEST_SCRIPT}
-CLIENT_TEST_SCRIPT=${CLIENT_TEST_SCRIPT}
-
-server_env="export GERRIT_HOST='${GERRIT_HOST}'"
-server_env+=" GERRIT_PROJECT='${GERRIT_PROJECT}'"
-server_env+=" GERRIT_REFSPEC='${GERRIT_REFSPEC}'"
-server_env+=" YUM_REPO='${YUM_REPO}'"
-server_env+=" GLUSTER_VOLUME='${EXPORT}'"
-server_env+=" CENTOS_VERSION='${CENTOS_VERSION}'"
-
-SERVER_IP=$(cat $WORKSPACE/hosts | sed -n '1p')
-CLIENT_IP=$(cat $WORKSPACE/hosts | sed -n '2p')
-
-echo $server_env > $WORKSPACE/SERVER_ENV.txt
-
-SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
-
-#add the export with environment to ~/.bashrc
-scp ${SSH_OPTIONS} "$WORKSPACE/SERVER_ENV.txt" "root@${SERVER_IP}:./SERVER_ENV.txt"
-
-ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "tee -a ~/.bashrc < ./SERVER_ENV.txt"
-
-scp ${SSH_OPTIONS} ${SERVER_TEST_SCRIPT} root@${SERVER_IP}:./$(basename ${SERVER_TEST_SCRIPT})
-
-ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "bash ./$(basename ${SERVER_TEST_SCRIPT})"
-RETURN_CODE=$?
-
-if [ $RETURN_CODE == 0 ]; then
-    client_env="export SERVER='${SERVER_IP}'"
-    client_env+=" EXPORT='/${EXPORT}'"
-    client_env+=" CENTOS_VERSION='${CENTOS_VERSION}'"
-
-    echo $client_env > $WORKSPACE/CLIENT_ENV.txt
-
-    scp ${SSH_OPTIONS} "$WORKSPACE/CLIENT_ENV.txt" "root@${CLIENT_IP}:./CLIENT_ENV.txt"
-
-    ssh -t ${SSH_OPTIONS} root@$CLIENT_IP 'tee -a ~/.bashrc < ./CLIENT_ENV.txt'
-
-    scp ${SSH_OPTIONS} ${CLIENT_TEST_SCRIPT} root@${CLIENT_IP}:./$(basename ${CLIENT_TEST_SCRIPT})
-
-    ssh -t ${SSH_OPTIONS} root@${CLIENT_IP} "bash ./$(basename ${CLIENT_TEST_SCRIPT})"
-    RETURN_CODE_CLIENT=$?
-
-    exit $RETURN_CODE_CLIENT
-else
-    echo "The SERVER script failed!"
-    exit $RETURN_CODE
-fi
diff --git a/build_scripts/dbench/basic-gluster-duffy.sh b/build_scripts/dbench/basic-gluster-duffy.sh
deleted file mode 100644
index 8866239a..00000000
--- a/build_scripts/dbench/basic-gluster-duffy.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-
-SERVER_TEST_SCRIPT=${SERVER_TEST_SCRIPT}
-CLIENT_TEST_SCRIPT=${CLIENT_TEST_SCRIPT}
-
-server_env="export GERRIT_HOST='${GERRIT_HOST}'"
-server_env+=" GERRIT_PROJECT='${GERRIT_PROJECT}'"
-server_env+=" GERRIT_REFSPEC='${GERRIT_REFSPEC}'"
-server_env+=" YUM_REPO='${YUM_REPO}'"
-
-if [ $CENTOS_VERSION ]; then 
-    server_env+=" CENTOS_VERSION='${CENTOS_VERSION}'"
-fi
-
-if [ "$JOB_NAME" == "nfs_ganesha_iozone_vfs" ] || [ "$JOB_NAME" == "nfs_ganesha_iozone_vfs_minmdcache" ]; then
-    server_env+=" VFS_VOLUME='${EXPORT}'"
-else
-    server_env+=" GLUSTER_VOLUME='${EXPORT}'"
-fi
-
-SERVER_IP=$(cat $WORKSPACE/hosts | sed -n '1p')
-CLIENT_IP=$(cat $WORKSPACE/hosts | sed -n '2p')
-
-echo $server_env > $WORKSPACE/SERVER_ENV.txt
-
-SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
-
-#add the export with environment to ~/.bashrc
-scp ${SSH_OPTIONS} "$WORKSPACE/SERVER_ENV.txt" "root@${SERVER_IP}:./SERVER_ENV.txt"
-
-ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "tee -a ~/.bashrc < ./SERVER_ENV.txt"
-
-scp ${SSH_OPTIONS} ${SERVER_TEST_SCRIPT} root@${SERVER_IP}:./$(basename ${SERVER_TEST_SCRIPT})
-
-ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "bash ./$(basename ${SERVER_TEST_SCRIPT})"
-RETURN_CODE=$?
-
-if [ $RETURN_CODE == 0 ]; then
-    client_env="export SERVER='${SERVER_IP}'"
-    client_env+=" EXPORT='/${EXPORT}'"
-    client_env+=" CENTOS_VERSION='${CENTOS_VERSION}'"
-
-    echo $client_env > $WORKSPACE/CLIENT_ENV.txt
-
-    scp ${SSH_OPTIONS} "$WORKSPACE/CLIENT_ENV.txt" "root@${CLIENT_IP}:./CLIENT_ENV.txt"
-
-    ssh -t ${SSH_OPTIONS} root@$CLIENT_IP 'tee -a ~/.bashrc < ./CLIENT_ENV.txt'
-
-    scp ${SSH_OPTIONS} ${CLIENT_TEST_SCRIPT} root@${CLIENT_IP}:./$(basename ${CLIENT_TEST_SCRIPT})
-
-    sleep 180
-
-    ssh -t ${SSH_OPTIONS} root@${CLIENT_IP} "bash ./$(basename ${CLIENT_TEST_SCRIPT})"
-    RETURN_CODE_CLIENT=$?
-
-    exit $RETURN_CODE_CLIENT
-else
-    echo "The SERVER script failed!"
-    exit $RETURN_CODE
-fi
diff --git a/build_scripts/ganesha-build/build-ganesha.sh b/build_scripts/ganesha-build/build-ganesha.sh
index c155b334..97a275de 100644
--- a/build_scripts/ganesha-build/build-ganesha.sh
+++ b/build_scripts/ganesha-build/build-ganesha.sh
@@ -2,6 +2,7 @@
 
 artifact()
 {
+    rm -rf ${RESULTDIR}/*.log
     [ -e ~/ssh-private-key ] || return 0
     scp -q -o StrictHostKeyChecking=no -i ~/ssh-private-key -r "${@}" nfs-ganesha@artifacts.ci.centos.org:/srv/artifacts/nfs-ganesha/
 }
diff --git a/build_scripts/iozone/basic-gluster-duffy.sh b/build_scripts/iozone/basic-gluster-duffy.sh
deleted file mode 100644
index 6e6c20b7..00000000
--- a/build_scripts/iozone/basic-gluster-duffy.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-
-SERVER_TEST_SCRIPT=${SERVER_TEST_SCRIPT}
-CLIENT_TEST_SCRIPT=${CLIENT_TEST_SCRIPT}
-
-server_env="export GERRIT_HOST='${GERRIT_HOST}'"
-server_env+=" GERRIT_PROJECT='${GERRIT_PROJECT}'"
-server_env+=" GERRIT_REFSPEC='${GERRIT_REFSPEC}'"
-server_env+=" YUM_REPO='${YUM_REPO}'"
-
-if [ $CENTOS_VERSION ]; then 
-    server_env+=" CENTOS_VERSION='${CENTOS_VERSION}'"
-fi
-
-if [ "$JOB_NAME" == "iozone-vfs" ] || [ "$JOB_NAME" == "iozone-vfs-minmdcache" ]; then
-    server_env+=" VFS_VOLUME='${EXPORT}'"
-else
-    server_env+=" GLUSTER_VOLUME='${EXPORT}'"
-fi
-
-SERVER_IP=$(cat $WORKSPACE/hosts | sed -n '1p')
-CLIENT_IP=$(cat $WORKSPACE/hosts | sed -n '2p')
-
-echo $server_env > $WORKSPACE/SERVER_ENV.txt
-
-SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
-
-#add the export with environment to ~/.bashrc
-scp ${SSH_OPTIONS} "$WORKSPACE/SERVER_ENV.txt" "root@${SERVER_IP}:./SERVER_ENV.txt"
-
-ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "tee -a ~/.bashrc < ./SERVER_ENV.txt"
-
-scp ${SSH_OPTIONS} ${SERVER_TEST_SCRIPT} root@${SERVER_IP}:./$(basename ${SERVER_TEST_SCRIPT})
-
-ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "bash ./$(basename ${SERVER_TEST_SCRIPT})"
-RETURN_CODE=$?
-
-if [ $RETURN_CODE == 0 ]; then
-    client_env="export SERVER='${SERVER_IP}'"
-    client_env+=" EXPORT='/${EXPORT}'"
-    client_env+=" CENTOS_VERSION='${CENTOS_VERSION}'"
-
-    echo $client_env > $WORKSPACE/CLIENT_ENV.txt
-
-    scp ${SSH_OPTIONS} "$WORKSPACE/CLIENT_ENV.txt" "root@${CLIENT_IP}:./CLIENT_ENV.txt"
-
-    ssh -t ${SSH_OPTIONS} root@$CLIENT_IP 'tee -a ~/.bashrc < ./CLIENT_ENV.txt'
-
-    scp ${SSH_OPTIONS} ${CLIENT_TEST_SCRIPT} root@${CLIENT_IP}:./$(basename ${CLIENT_TEST_SCRIPT})
-
-    ssh -t ${SSH_OPTIONS} root@${CLIENT_IP} "bash ./$(basename ${CLIENT_TEST_SCRIPT})"
-    RETURN_CODE_CLIENT=$?
-
-    exit $RETURN_CODE_CLIENT
-else
-    echo "The SERVER script failed!"
-    exit $RETURN_CODE
-fi
diff --git a/build_scripts/libntirpc-build/template_files/libntirpc.repo.in b/build_scripts/libntirpc-build/libntirpc-template/libntirpc.repo.in
similarity index 100%
rename from build_scripts/libntirpc-build/template_files/libntirpc.repo.in
rename to build_scripts/libntirpc-build/libntirpc-template/libntirpc.repo.in
diff --git a/build_scripts/libntirpc-build/template_files/libntirpc.spec.in b/build_scripts/libntirpc-build/libntirpc-template/libntirpc.spec.in
similarity index 100%
rename from build_scripts/libntirpc-build/template_files/libntirpc.spec.in
rename to build_scripts/libntirpc-build/libntirpc-template/libntirpc.spec.in
diff --git a/build_scripts/libntirpc-build/template_files/libntirpc_centos7.spec.in b/build_scripts/libntirpc-build/libntirpc-template/libntirpc_centos7.spec.in
similarity index 100%
rename from build_scripts/libntirpc-build/template_files/libntirpc_centos7.spec.in
rename to build_scripts/libntirpc-build/libntirpc-template/libntirpc_centos7.spec.in
diff --git a/build_scripts/posix-compliance/basic-gluster-duffy.sh b/build_scripts/posix-compliance/basic-gluster-duffy.sh
deleted file mode 100644
index 6dc442bf..00000000
--- a/build_scripts/posix-compliance/basic-gluster-duffy.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-SERVER_TEST_SCRIPT=${SERVER_TEST_SCRIPT}
-CLIENT_TEST_SCRIPT=${CLIENT_TEST_SCRIPT}
-
-server_env="export GERRIT_HOST='${GERRIT_HOST}'"
-server_env+=" GERRIT_PROJECT='${GERRIT_PROJECT}'"
-server_env+=" GERRIT_REFSPEC='${GERRIT_REFSPEC}'"
-server_env+=" CENTOS_VERSION='${CENTOS_VERSION}'"
-server_env+=" CENTOS_ARCH='${CENTOS_ARCH}'"
-server_env+=" GLUSTER_VOLUME='${EXPORT}'"
-server_env+=" YUM_REPO='${YUM_REPO}'"
-
-SERVER_IP=$(cat $WORKSPACE/hosts | sed -n '1p')
-CLIENT_IP=$(cat $WORKSPACE/hosts | sed -n '2p')
-
-echo $server_env > $WORKSPACE/SERVER_ENV.txt
-
-SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
-
-#add the export with environment to ~/.bashrc
-scp ${SSH_OPTIONS} "$WORKSPACE/SERVER_ENV.txt" "root@${SERVER_IP}:./SERVER_ENV.txt"
-
-ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "tee -a ~/.bashrc < ./SERVER_ENV.txt"
-
-scp ${SSH_OPTIONS} ${SERVER_TEST_SCRIPT} root@${SERVER_IP}:./$(basename ${SERVER_TEST_SCRIPT})
-
-ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "bash ./$(basename ${SERVER_TEST_SCRIPT})"
-RETURN_CODE=$?
-
-if [ $RETURN_CODE == 0 ]; then
-    client_env="export SERVER='${SERVER_IP}'"
-    client_env+=" EXPORT='/${EXPORT}'"
-    client_env+=" CENTOS_VERSION='${CENTOS_VERSION}'"
-
-    echo $client_env > $WORKSPACE/CLIENT_ENV.txt
-
-    scp ${SSH_OPTIONS} "$WORKSPACE/CLIENT_ENV.txt" "root@${CLIENT_IP}:./CLIENT_ENV.txt"
-
-    ssh -t ${SSH_OPTIONS} root@$CLIENT_IP 'tee -a ~/.bashrc < ./CLIENT_ENV.txt'
-
-    scp ${SSH_OPTIONS} ${CLIENT_TEST_SCRIPT} root@${CLIENT_IP}:./$(basename ${CLIENT_TEST_SCRIPT})
-
-    ssh -t ${SSH_OPTIONS} root@${CLIENT_IP} "bash ./$(basename ${CLIENT_TEST_SCRIPT})"
-    RETURN_CODE_CLIENT=$?
-
-    exit $RETURN_CODE_CLIENT
-else
-    echo "The SERVER script failed!"
-    exit $RETURN_CODE
-fi
diff --git a/build_scripts/pylint/basic-gluster-duffy.sh b/build_scripts/pylint/basic-gluster-duffy.sh
deleted file mode 100644
index 9dbc3d16..00000000
--- a/build_scripts/pylint/basic-gluster-duffy.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-TEST_SCRIPT=${TEST_SCRIPT}
-
-server_env="export GERRIT_HOST='${GERRIT_HOST}'"
-server_env+=" GERRIT_PROJECT='${GERRIT_PROJECT}'"
-server_env+=" GERRIT_REFSPEC='${GERRIT_REFSPEC}'"
-server_env+=" CENTOS_VERSION='${CENTOS_VERSION}'"
-server_env+=" CENTOS_ARCH='${CENTOS_ARCH}'"
-server_env+=" YUM_REPO='${YUM_REPO}'"
-
-SERVER_IP=$(cat $WORKSPACE/hosts | sed -n '1p')
-
-echo $server_env > $WORKSPACE/SERVER_ENV.txt
-
-SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
-
-#add the export with environment to ~/.bashrc
-scp ${SSH_OPTIONS} "$WORKSPACE/SERVER_ENV.txt" "root@${SERVER_IP}:./SERVER_ENV.txt"
-
-ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "tee -a ~/.bashrc < ./SERVER_ENV.txt"
-
-scp ${SSH_OPTIONS} ${TEST_SCRIPT} root@${SERVER_IP}:./$(basename ${TEST_SCRIPT})
-
-ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "bash ./$(basename ${TEST_SCRIPT})"
-RETURN_CODE=$?
-
-if [ $RETURN_CODE != 0 ]; then
-    echo "The SERVER script failed!"
-    exit $RETURN_CODE
-fi
diff --git a/build_scripts/pylint/build-pylint.sh b/build_scripts/pylint/build-pylint.sh
deleted file mode 100644
index 9f7a6eaf..00000000
--- a/build_scripts/pylint/build-pylint.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# these variables need to be set
-[ -n "${GERRIT_HOST}" ]
-[ -n "${GERRIT_PROJECT}" ]
-[ -n "${GERRIT_REFSPEC}" ]
-
-# only use https for now
-GIT_REPO="https://${GERRIT_HOST}/${GERRIT_PROJECT}"
-
-# enable the Storage SIG for pylint
-if [ "$CENTOS_VERSION" == "7" ]; then
-  yum -y install centos-release-nfs-ganesha28
-elif [ "$CENTOS_VERSION" == "8s" ]; then
-  yum -y install epel-release
-else
-  echo "Please check the CENTOS_VERSION! The build implementation for this version=${CENTOS_VERSION} is in progress!"
-fi
-
-# basic packages to install
-xargs yum -y install <<< "
-git
-pylint
-"
-
-git clone --depth=1 ${GIT_REPO}
-cd $(basename "${GERRIT_PROJECT}")
-git fetch --depth=1 origin ${GERRIT_REFSPEC} && git checkout FETCH_HEAD
-
-pushd src/scripts/ganeshactl
-
-for p in *.py */*.py */*/*.py
-do
-    pylint $p || exit 0 
-done
-
-popd
-
-# we accept different return values
-# 0 - SUCCESS + VOTE
-# 1 - FAILED + VOTE
-# 10 - SUCCESS + REPORT ONLY (NO VOTE)
-# 11 - FAILED + REPORT ONLY (NO VOTE)
-
-exit 10
diff --git a/build_scripts/pynfs/basic-gluster-duffy.sh b/build_scripts/pynfs/basic-gluster-duffy.sh
deleted file mode 100644
index faa76d8e..00000000
--- a/build_scripts/pynfs/basic-gluster-duffy.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-SERVER_TEST_SCRIPT=${SERVER_TEST_SCRIPT}
-CLIENT_TEST_SCRIPT=${CLIENT_TEST_SCRIPT}
-
-server_env="export GERRIT_HOST='${GERRIT_HOST}'"
-server_env+=" GERRIT_PROJECT='${GERRIT_PROJECT}'"
-server_env+=" GERRIT_REFSPEC='${GERRIT_REFSPEC}'"
-server_env+=" YUM_REPO='${YUM_REPO}'"
-server_env+=" GLUSTER_VOLUME='${EXPORT}'"
-server_env+=" CENTOS_VERSION='${CENTOS_VERSION}'"
-
-if [ "$JOB_NAME" == "pynfs-acl" ]; then
-    server_env+=" ENABLE_ACL='${ENABLE_ACL}'"
-fi
-
-SERVER_IP=$(cat $WORKSPACE/hosts | sed -n '1p')
-CLIENT_IP=$(cat $WORKSPACE/hosts | sed -n '2p')
-
-echo $server_env > $WORKSPACE/SERVER_ENV.txt
-
-SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
-
-#add the export with environment to ~/.bashrc
-scp ${SSH_OPTIONS} "$WORKSPACE/SERVER_ENV.txt" "root@${SERVER_IP}:./SERVER_ENV.txt"
-
-ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "tee -a ~/.bashrc < ./SERVER_ENV.txt"
-
-scp ${SSH_OPTIONS} ${SERVER_TEST_SCRIPT} root@${SERVER_IP}:./$(basename ${SERVER_TEST_SCRIPT})
-
-ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "bash ./$(basename ${SERVER_TEST_SCRIPT})"
-RETURN_CODE=$?
-
-if [ $RETURN_CODE == 0 ]; then
-    client_env="export SERVER='${SERVER_IP}'"
-    client_env+=" EXPORT='/${EXPORT}'"
-    client_env+=" TEST_PARAMETERS='${TEST_PARAMETERS}'"
-    client_env+=" CENTOS_VERSION='${CENTOS_VERSION}'"
-
-    echo $client_env > $WORKSPACE/CLIENT_ENV.txt
-
-    scp ${SSH_OPTIONS} "$WORKSPACE/CLIENT_ENV.txt" "root@${CLIENT_IP}:./CLIENT_ENV.txt"
-
-    ssh -t ${SSH_OPTIONS} root@$CLIENT_IP 'tee -a ~/.bashrc < ./CLIENT_ENV.txt'
-
-    scp ${SSH_OPTIONS} ${CLIENT_TEST_SCRIPT} root@${CLIENT_IP}:./$(basename ${CLIENT_TEST_SCRIPT})
-
-    ssh -t ${SSH_OPTIONS} root@${CLIENT_IP} "bash ./$(basename ${CLIENT_TEST_SCRIPT})"
-    RETURN_CODE_CLIENT=$?
-
-    exit $RETURN_CODE_CLIENT
-else
-    echo "The SERVER script failed!"
-    exit $RETURN_CODE
-fi
diff --git a/build_scripts/pynfs/client.sh b/build_scripts/pynfs/client.sh
index e23820c7..f0d613c6 100644
--- a/build_scripts/pynfs/client.sh
+++ b/build_scripts/pynfs/client.sh
@@ -17,7 +17,7 @@ set -x
 [ -n "${TEST_PARAMETERS}" ]
 
 # install build and runtime dependencies
-yum -y install git gcc nfs-utils redhat-rpm-config krb5-devel python3
+yum -y install git gcc nfs-utils redhat-rpm-config krb5-devel python3-devel python3-gssapi python3-ply
 
 rm -rf /root/pynfs && git clone git://linux-nfs.org/~bfields/pynfs.git
 
@@ -28,13 +28,14 @@ set +e
 
 LOG_FILE40="/tmp/pynfs"$(date +%s)".log"
 cd /root/pynfs/nfs4.0
-timeout --preserve-status -s SIGKILL 240s ./testserver.py ${SERVER}:${EXPORT} --verbose --maketree --showomit --rundeps all ganesha ${TEST_PARAMETERS} >> "${LOG_FILE40}" 
-TIMED_OUT=$?
+./testserver.py ${SERVER}:${EXPORT} --verbose --maketree --showomit --rundeps all ganesha ${TEST_PARAMETERS} >> "${LOG_FILE40}"
+#timeout --preserve-status -s SIGKILL 240s ./testserver.py ${SERVER}:${EXPORT} --verbose --maketree --showomit --rundeps all ganesha ${TEST_PARAMETERS} >> "${LOG_FILE40}" 
+#TIMED_OUT=$?
 #Return code will be 124 if it ends the process by using SIGTERM for not getting any response. 137 when used SIGKILL to kill the process
-if [ $TIMED_OUT == 137 ]; then
-  echo -e "The process timed out after 4 minute!\nLooks like the Server process to see if it has crashed!"
-  exit 1
-fi
+#if [ $TIMED_OUT == 137 ]; then
+#  echo -e "The process timed out after 4 minute!\nLooks like the Server process to see if it has crashed!"
+#  exit 1
+#fi
 #cd /root/pynfs/nfs4.0 && ./testserver.py ${SERVER}:${EXPORT} --verbose --maketree --showomit --rundeps all ganesha ${TEST_PARAMETERS} >> "${LOG_FILE40}"
 RETURN_CODE40=$?
 
@@ -43,13 +44,14 @@ cat $LOG_FILE40
 
 LOG_FILE41="/tmp/pynfs"$(date +%s)".log"
 cd /root/pynfs/nfs4.1
-timeout --preserve-status -s SIGKILL 240s ./testserver.py ${SERVER}:${EXPORT} all ganesha --verbose --maketree --showomit --rundeps >> "${LOG_FILE41}" 
-TIMED_OUT=$?
+./testserver.py ${SERVER}:${EXPORT} all ganesha --verbose --maketree --showomit --rundeps >> "${LOG_FILE41}"
+#timeout --preserve-status -s SIGKILL 240s ./testserver.py ${SERVER}:${EXPORT} all ganesha --verbose --maketree --showomit --rundeps >> "${LOG_FILE41}" 
+#TIMED_OUT=$?
 #Return code will be 124 if it ends the process by using SIGTERM for not getting any response. 137 when used SIGKILL to kill the process
-if [ $TIMED_OUT == 137 ]; then
-  echo -e "The process timed out after 4 minute!\nLooks like the Server process to see if it has crashed!"
-  exit 1
-fi 
+#if [ $TIMED_OUT == 137 ]; then
+#  echo -e "The process timed out after 4 minute!\nLooks like the Server process to see if it has crashed!"
+#  exit 1
+#fi 
 #cd /root/pynfs/nfs4.1 && ./testserver.py ${SERVER}:${EXPORT} all ganesha --verbose --maketree --showomit --rundeps >> "${LOG_FILE41}"
 RETURN_CODE41=$?
 
diff --git a/build_scripts/small-file/basic-gluster-duffy.sh b/build_scripts/small-file/basic-gluster-duffy.sh
deleted file mode 100644
index 020bb3b4..00000000
--- a/build_scripts/small-file/basic-gluster-duffy.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-SERVER_TEST_SCRIPT=${SERVER_TEST_SCRIPT}
-CLIENT_TEST_SCRIPT=${CLIENT_TEST_SCRIPT}
-
-server_env="export GERRIT_HOST='${GERRIT_HOST}'"
-server_env+=" GERRIT_PROJECT='${GERRIT_PROJECT}'"
-server_env+=" GERRIT_REFSPEC='${GERRIT_REFSPEC}'"
-server_env+=" YUM_REPO='${YUM_REPO}'"
-server_env+=" GLUSTER_VOLUME='${EXPORT}'"
-server_env+=" CENTOS_VERSION='${CENTOS_VERSION}'"
-
-SERVER_IP=$(cat $WORKSPACE/hosts | sed -n '1p')
-CLIENT_IP=$(cat $WORKSPACE/hosts | sed -n '2p')
-
-echo $server_env > $WORKSPACE/SERVER_ENV.txt
-
-SSH_OPTIONS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
-
-#add the export with environment to ~/.bashrc
-scp ${SSH_OPTIONS} "$WORKSPACE/SERVER_ENV.txt" "root@${SERVER_IP}:./SERVER_ENV.txt"
-
-ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "tee -a ~/.bashrc < ./SERVER_ENV.txt"
-
-scp ${SSH_OPTIONS} ${SERVER_TEST_SCRIPT} root@${SERVER_IP}:./$(basename ${SERVER_TEST_SCRIPT})
-
-ssh -t ${SSH_OPTIONS} root@${SERVER_IP} "bash ./$(basename ${SERVER_TEST_SCRIPT})"
-RETURN_CODE=$?
-
-if [ $RETURN_CODE == 0 ]; then
-    client_env="export SERVER='${SERVER_IP}'"
-    client_env+=" EXPORT='/${EXPORT}'"
-    client_env+=" CENTOS_VERSION='${CENTOS_VERSION}'"
-
-    echo $client_env > $WORKSPACE/CLIENT_ENV.txt
-
-    scp ${SSH_OPTIONS} "$WORKSPACE/CLIENT_ENV.txt" "root@${CLIENT_IP}:./CLIENT_ENV.txt"
-
-    ssh -t ${SSH_OPTIONS} root@$CLIENT_IP 'tee -a ~/.bashrc < ./CLIENT_ENV.txt'
-
-    scp ${SSH_OPTIONS} ${CLIENT_TEST_SCRIPT} root@${CLIENT_IP}:./$(basename ${CLIENT_TEST_SCRIPT})
-
-    ssh -t ${SSH_OPTIONS} root@${CLIENT_IP} "bash ./$(basename ${CLIENT_TEST_SCRIPT})"
-    RETURN_CODE_CLIENT=$?
-
-    exit $RETURN_CODE_CLIENT
-else
-    echo "The SERVER script failed!"
-    exit $RETURN_CODE
-fi
diff --git a/jobs/cthon04.yml b/jobs/cthon04.yml
index 13b4887a..6d2854db 100644
--- a/jobs/cthon04.yml
+++ b/jobs/cthon04.yml
@@ -31,7 +31,7 @@
     builders:
     - shell: !include-raw: scripts/common/get-node.sh
     - shell: |
-        bash $WORKSPACE/ci-tests/build_scripts/cthon04/basic-gluster-duffy.sh
+        bash $WORKSPACE/ci-tests/build_scripts/common/basic-server-client.sh
 
     wrappers:
     - cleanup-ws
diff --git a/jobs/ganesha-build.yml b/jobs/ganesha-build.yml
index 7f7715a1..8d9d29eb 100644
--- a/jobs/ganesha-build.yml
+++ b/jobs/ganesha-build.yml
@@ -29,7 +29,7 @@
     builders:
     - shell: !include-raw: scripts/common/get-node.sh
     - shell: |
-        bash $WORKSPACE/ci-tests/build_scripts/ganesha-build/basic-gluster-duffy.sh
+        bash $WORKSPACE/ci-tests/build_scripts/common/basic-server-client.sh
 
     wrappers:
     - gerrithub_key
diff --git a/jobs/libntirpc-build.yml b/jobs/libntirpc-build.yml
index bfd24f2d..8c655038 100644
--- a/jobs/libntirpc-build.yml
+++ b/jobs/libntirpc-build.yml
@@ -19,7 +19,7 @@
         description: 'Test script to execute on the reserved machine.'
         name: TEST_SCRIPT
     - string:
-        default: "$WORKSPACE/ci-tests/build_scripts/libntirpc-build/template_files"
+        default: "$WORKSPACE/ci-tests/build_scripts/libntirpc-build/libntirpc-template"
         description: 'URL pointing to the directory with the templates for when building the source RPM and .repo file.'
         name: TEMPLATES_URL
     - centos_variables
@@ -27,7 +27,7 @@
     builders:
     - shell: !include-raw: scripts/common/get-node.sh
     - shell: |
-        bash $WORKSPACE/ci-tests/build_scripts/libntirpc-build/basic-gluster-duffy.sh
+        bash $WORKSPACE/ci-tests/build_scripts/common/basic-server-client.sh
 
     wrappers:
     - cleanup-ws
diff --git a/jobs/pynfs.yml b/jobs/pynfs.yml
index c6081f14..2f602db9 100644
--- a/jobs/pynfs.yml
+++ b/jobs/pynfs.yml
@@ -42,7 +42,7 @@
 
     triggers:
     - gerrithub-trigger:
-        option: 'pynfs'
+        option: 'pynfs$'
 
     publishers:
     - post_build_task_return-node
diff --git a/jobs/scripts/common.sh b/jobs/scripts/common.sh
index b11cb358..93e10b57 100644
--- a/jobs/scripts/common.sh
+++ b/jobs/scripts/common.sh
@@ -6,17 +6,7 @@ export GERRIT_REFSPEC=${GERRIT_REFSPEC}
 export LAST_TRIGGERED_JOB_NAME=$JOB_NAME
 export BUILD_NUMBER=${BUILD_NUMBER}
 
-if [ "$JOB_NAME" == "dbench" ]; then 
-  FOLDER_NAME="dbench"
-elif [ "$JOB_NAME" == "code-compilation" ]; then
-  FOLDER_NAME="code-compilation"
-elif [[ $JOB_NAME =~ iozone-* ]]; then
-  FOLDER_NAME="iozone"
-elif [[ $JOB_NAME =~ pynfs(-)* ]]; then
-  FOLDER_NAME="pynfs"
-fi
-
-bash $WORKSPACE/ci-tests/build_scripts/${FOLDER_NAME}/basic-gluster-duffy.sh
+bash $WORKSPACE/ci-tests/build_scripts/common/basic-server-client.sh
 RET=$?
 
 JOB_OUTPUT="${JENKINS_URL}/job/${LAST_TRIGGERED_JOB_NAME}/${BUILD_NUMBER}/console"
diff --git a/jobs/scripts/posix_compliance.sh b/jobs/scripts/posix_compliance.sh
index 41218da9..dd3b2c1a 100644
--- a/jobs/scripts/posix_compliance.sh
+++ b/jobs/scripts/posix_compliance.sh
@@ -7,7 +7,7 @@ export LAST_TRIGGERED_JOB_NAME=nfs_ganesha_posix_compliance
 export BUILD_NUMBER=${BUILD_NUMBER}
 
 set +e
-bash $WORKSPACE/ci-tests/build_scripts/posix-compliance/basic-gluster-duffy.sh
+bash $WORKSPACE/ci-tests/build_scripts/common/basic-server-client.sh
 RET=$?
 set -e
 
diff --git a/jobs/scripts/pylint.sh b/jobs/scripts/pylint.sh
index 1927daf7..7d0e0087 100644
--- a/jobs/scripts/pylint.sh
+++ b/jobs/scripts/pylint.sh
@@ -5,7 +5,7 @@ set +x
 set +e
 
 # run the get-node script
-bash $WORKSPACE/ci-tests/build_scripts/pylint/basic-gluster-duffy.sh
+bash $WORKSPACE/ci-tests/build_scripts/common/basic-server-client.sh
 RET=$?
 
 # we accept different return values
diff --git a/jobs/scripts/tests.sh b/jobs/scripts/tests.sh
index c808ff6c..2c3c1a62 100644
--- a/jobs/scripts/tests.sh
+++ b/jobs/scripts/tests.sh
@@ -5,7 +5,7 @@ set +x
 set +e
 
 # download and run the bootstrap script
-bash $WORKSPACE/ci-tests/build_scripts/build-tests/basic-gluster-duffy.sh 
+bash $WORKSPACE/ci-tests/build_scripts/common/basic-server-client.sh
 RET=$?
 
 # we accept different return values
diff --git a/jobs/small-file.yml b/jobs/small-file.yml
index dc18177c..80075096 100644
--- a/jobs/small-file.yml
+++ b/jobs/small-file.yml
@@ -33,7 +33,7 @@
     builders:
     - shell: !include-raw: scripts/common/get-node.sh
     - shell: |
-        bash $WORKSPACE/ci-tests/build_scripts/small-file/basic-gluster-duffy.sh
+        bash $WORKSPACE/ci-tests/build_scripts/common/basic-server-client.sh
 
     wrappers:
     - cleanup-ws
diff --git a/jobs/trigger-cthon04-on-new-patch.yml b/jobs/trigger-cthon04-on-new-patch.yml
index 82191492..3e813369 100644
--- a/jobs/trigger-cthon04-on-new-patch.yml
+++ b/jobs/trigger-cthon04-on-new-patch.yml
@@ -32,3 +32,6 @@
     triggers:
     - gerrithub-trigger:
         option: 'cthon04'
+
+    wrappers:
+    - gerrithub_key
diff --git a/jobs/trigger-ganesha-builds.yml b/jobs/trigger-ganesha-builds.yml
index 2353fd9d..ea8d44c6 100644
--- a/jobs/trigger-ganesha-builds.yml
+++ b/jobs/trigger-ganesha-builds.yml
@@ -11,7 +11,7 @@
     scm:
     - git:
         branches:
-        - '**'
+        - 'refs/heads/next'
         url: https://github.com/nfs-ganesha/nfs-ganesha.git 
 
     builders: