diff --git a/jobs/Jenkinsfile_Common b/jobs/Jenkinsfile_Common
index a790700..da83568 100644
--- a/jobs/Jenkinsfile_Common
+++ b/jobs/Jenkinsfile_Common
@@ -11,14 +11,15 @@ env.BITBUCKET_URL = "https://${env.BITBUCKET_LOCAL}"
 
 env.YOCTO_REPO_URL = "ssh://git@${env.BITBUCKET_LOCAL}:7999/nm-nsp/netmodule-wireless-linux.git"
 
-env.STORAGE_URL = "http://10.115.101.100"
+env.HASH_SSTATE_SRV_IP = "10.115.101.100"
+env.STORAGE_URL = "http://${env.HASH_SSTATE_SRV_IP}"
 env.SSTATE_STORAGE_SRV_WEB_ROOT_PATH = "/var/www/html"
 env.STORAGE_NWL_DIR = "nwl"
 env.SSTATE_STORAGE_DIR = "nwl-sstate"
 env.SSTATE_STORAGE_URL = "${env.STORAGE_URL}/${env.STORAGE_NWL_DIR}/${env.SSTATE_STORAGE_DIR}"
 env.BINARY_STORAGE_URL = "${env.STORAGE_URL}/downloads"
 
-//env.HASHSERVER = "172.16.70.254:8686"
+env.HASHSERVER = "${env.HASH_SSTATE_SRV_IP}:8686"
 
 
 // Yocto build definitions
@@ -154,14 +155,9 @@ def getDownloadDirConfig() {
 }
 //-----------------------------------------------------------------------------
 def getSstateMirrorConfig() {
-  // ToDo: set the sstate-cache mirror and the HashEquivalance Server accordingly
-
-//  def signatureHdl = "BB_SIGNATURE_HANDLER = \"OEEquivHash\""
-//  def hashSrv = "BB_HASHSERVE = \"${env.HASHSERVER}\""
-
   def mirrorCfg = "SSTATE_MIRRORS = \"file://.* ${env.SSTATE_STORAGE_URL}/PATH\""
-  def signatureHdl = "BB_SIGNATURE_HANDLER = \"OEBasicHash\""
-  def hashSrv = "BB_HASHSERVE = \"\""
+  def signatureHdl = "BB_SIGNATURE_HANDLER = \"OEEquivHash\""
+  def hashSrv = "BB_HASHSERVE = \"${env.HASHSERVER}\""
   def sstateDir = "SSTATE_DIR=\"${env.SSTATE_CACHE}\""
   return "${signatureHdl}\n${hashSrv}\n${mirrorCfg}\n${sstateDir}"
 }