diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ac2d3174bd36c96646b984740a71486e5826efc5..785de985387317a63ef37379029a1b604ddca36b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -175,19 +175,19 @@ deploy_to_staging:
     - staging
   script:
   - set -x
-  - echo "$KUBE_CA_PEM_HX" > "$(pwd)/kube.ca.pem"
-  - kubectl config set-cluster ${KUBE_CLUS_NAME_HX} --server="${KUBE_URL_HX}" --certificate-authority="$(pwd)/kube.ca.pem"
-  - kubectl config set-credentials ${KUBE_USER_HX} --token="${KUBE_TOKEN_HX}"
-  - kubectl config set-context ${CHEMBL_NS_STAGING} --cluster=${KUBE_CLUS_NAME_HX} --user=${KUBE_USER_HX}
+  - echo "$KUBE_CA_PEM_HH" > "$(pwd)/kube.ca.pem"
+  - kubectl config set-cluster ${KUBE_CLUS_NAME_HH} --server="${KUBE_URL_HH}" --certificate-authority="$(pwd)/kube.ca.pem"
+  - kubectl config set-credentials ${KUBE_USER_HH} --token="${KUBE_TOKEN_HH}"
+  - kubectl config set-context ${CHEMBL_NS_STAGING} --cluster=${KUBE_CLUS_NAME_HH} --user=${KUBE_USER_HH}
   - kubectl config use-context ${CHEMBL_NS_STAGING}
-  - echo ${CHEMBL_NS_STAGING} ${KUBE_URL_HX} ${KUBE_CLUS_NAME_HX} ${KUBE_USER_HX}
+  - echo ${CHEMBL_NS_STAGING} ${KUBE_URL_HH} ${KUBE_CLUS_NAME_HH} ${KUBE_USER_HH}
   - kubectl get pods -n ${CHEMBL_NS_STAGING}
   - kubectl create secret generic ${ENV_SECRET_NAME_STAGING} --from-file=.env=${ENV_STAGING_FILE_PATH} -o yaml -n ${CHEMBL_NS_STAGING} --dry-run=client | kubectl replace -f -
   - cat ${ENV_STAGING_FILE_PATH}
   - sed -i "s~<NAMESPACE>~${CHEMBL_NS_STAGING}~g" k8s-deployment.yaml
-  - sed -i "s~<HTTP_PROXY>~${HTTP_PROXY_HX}~g" k8s-deployment.yaml
-  - sed -i "s~<HTTPS_PROXY>~${HTTPS_PROXY_HX}~g" k8s-deployment.yaml
-  - sed -i "s~<NO_PROXY>~${NO_PROXY_HX_DEFAULT}~g" k8s-deployment.yaml
+  - sed -i "s~<HTTP_PROXY>~${HTTP_PROXY_HH}~g" k8s-deployment.yaml
+  - sed -i "s~<HTTPS_PROXY>~${HTTPS_PROXY_HH}~g" k8s-deployment.yaml
+  - sed -i "s~<NO_PROXY>~${NO_PROXY_HH_DEFAULT}~g" k8s-deployment.yaml
   - sed -i "s~<SERVER_IMAGE_TAG>~${SERVER_IMAGE_TAG_STAGING}~g" k8s-deployment.yaml
   - sed -i "s~<ENV_SECRET_NAME>~${ENV_SECRET_NAME_STAGING}~g" k8s-deployment.yaml
   - sed -i "s~<NODE_PORT>~${EUBOPEN_WEB_PORT_STAGING}~" k8s-deployment.yaml
diff --git a/web-components-submodule b/web-components-submodule
index 2f0f0d88a8ed8238504648464940d9d9779342d8..8bf863dac8152a4e62c3c5c689157577073a1fe4 160000
--- a/web-components-submodule
+++ b/web-components-submodule
@@ -1 +1 @@
-Subproject commit 2f0f0d88a8ed8238504648464940d9d9779342d8
+Subproject commit 8bf863dac8152a4e62c3c5c689157577073a1fe4