diff --git a/xCAT/postscripts/xcatclient b/xCAT/postscripts/xcatclient
index 928ba8f19..6d56a855b 100644
--- a/xCAT/postscripts/xcatclient
+++ b/xCAT/postscripts/xcatclient
@@ -15,3 +15,4 @@ if [ ! -x /usr/sbin/stunnel ]; then #Stop if no stunnel to help the next bit
    getcredentials.awk xcat_client_cred | grep -v '<'|sed -e 's/&lt;/</' -e 's/&gt;/>/' -e 's/&amp;/&/' -e 's/&quot/"/' -e "s/&apos;/'/" > /root/.xcat/client-cred.pem
    chmod 600 /root/.xcat/client-cred.pem
    cp _xcat/ca.pem /root/.xcat/ca.pem
+   kill -9 $CREDPID
diff --git a/xCAT/postscripts/xcatserver b/xCAT/postscripts/xcatserver
index 36360a117..af16ca22f 100644
--- a/xCAT/postscripts/xcatserver
+++ b/xCAT/postscripts/xcatserver
@@ -16,3 +16,4 @@ if [ ! -x /usr/sbin/stunnel ]; then #Stop if no stunnel to help the next bit
    getcredentials.awk xcat_cfgloc | grep -v '<'|sed -e 's/&lt;/</' -e 's/&gt;/>/' -e 's/&amp;/&/' -e 's/&quot/"/' -e "s/&apos;/'/" > /etc/xcat/cfgloc
    chmod 600 /etc/xcat/cfgloc
    cp _xcat/ca.pem /etc/xcat/cert/ca.pem
+   kill -9 $CREDPID