diff --git a/.ibm/pipelines/cluster/aks/aks-helm-deployment.sh b/.ibm/pipelines/cluster/aks/aks-helm-deployment.sh
index c588070d73..c3af68bdc7 100644
--- a/.ibm/pipelines/cluster/aks/aks-helm-deployment.sh
+++ b/.ibm/pipelines/cluster/aks/aks-helm-deployment.sh
@@ -14,12 +14,12 @@ initiate_aks_helm_deployment() {
   deploy_redis_cache "${NAME_SPACE}"
   patch_and_restart "$NAME_SPACE" "deployment" "redis" "${DIR}/cluster/aks/patch/aks-spot-patch.yaml" # Patch Redis deployment to run on spot cluster
 
-  uninstall_helmchart "${NAME_SPACE}" "${RELEASE_NAME}"
+  helm::uninstall "${NAME_SPACE}" "${RELEASE_NAME}"
 
   cd "${DIR}" || exit
   local rhdh_base_url="https://${K8S_CLUSTER_ROUTER_BASE}"
   apply_yaml_files "${DIR}" "${NAME_SPACE}" "${rhdh_base_url}"
-  yq_merge_value_files "merge" "${DIR}/value_files/${HELM_CHART_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_AKS_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
+  helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_AKS_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
   common::save_artifact "${NAME_SPACE}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
 
   namespace::setup_image_pull_secret "${NAME_SPACE}" "rh-pull-secret" "${REGISTRY_REDHAT_IO_SERVICE_ACCOUNT_DOCKERCONFIGJSON}"
@@ -37,12 +37,12 @@ initiate_rbac_aks_helm_deployment() {
   namespace::delete "${NAME_SPACE}"
   namespace::configure "${NAME_SPACE_RBAC}"
 
-  uninstall_helmchart "${NAME_SPACE_RBAC}" "${RELEASE_NAME_RBAC}"
+  helm::uninstall "${NAME_SPACE_RBAC}" "${RELEASE_NAME_RBAC}"
 
   cd "${DIR}" || exit
   local rbac_rhdh_base_url="https://${K8S_CLUSTER_ROUTER_BASE}"
   apply_yaml_files "${DIR}" "${NAME_SPACE_RBAC}" "${rbac_rhdh_base_url}"
-  yq_merge_value_files "merge" "${DIR}/value_files/${HELM_CHART_RBAC_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_RBAC_AKS_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_RBAC_K8S_MERGED_VALUE_FILE_NAME}"
+  helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_RBAC_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_RBAC_AKS_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_RBAC_K8S_MERGED_VALUE_FILE_NAME}"
   common::save_artifact "${NAME_SPACE_RBAC}" "/tmp/${HELM_CHART_RBAC_K8S_MERGED_VALUE_FILE_NAME}"
 
   namespace::setup_image_pull_secret "${NAME_SPACE_RBAC}" "rh-pull-secret" "${REGISTRY_REDHAT_IO_SERVICE_ACCOUNT_DOCKERCONFIGJSON}"
diff --git a/.ibm/pipelines/cluster/aks/aks-operator-deployment.sh b/.ibm/pipelines/cluster/aks/aks-operator-deployment.sh
index fbf711ab38..11d530f8fc 100644
--- a/.ibm/pipelines/cluster/aks/aks-operator-deployment.sh
+++ b/.ibm/pipelines/cluster/aks/aks-operator-deployment.sh
@@ -21,7 +21,7 @@ initiate_aks_operator_deployment() {
   apply_yaml_files "${DIR}" "${namespace}" "${rhdh_base_url}"
 
   log::info "Creating and applying ConfigMap for dynamic plugins"
-  yq_merge_value_files "merge" "${DIR}/value_files/${HELM_CHART_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_AKS_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
+  helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_AKS_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
   create_dynamic_plugins_config "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}" "/tmp/configmap-dynamic-plugins.yaml"
   common::save_artifact "${namespace}" "/tmp/configmap-dynamic-plugins.yaml"
   kubectl apply -f /tmp/configmap-dynamic-plugins.yaml -n "${namespace}"
@@ -47,7 +47,7 @@ initiate_rbac_aks_operator_deployment() {
   apply_yaml_files "${DIR}" "${namespace}" "${rhdh_base_url}"
 
   log::info "Creating and applying ConfigMap for dynamic plugins"
-  yq_merge_value_files "merge" "${DIR}/value_files/${HELM_CHART_RBAC_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_RBAC_AKS_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
+  helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_RBAC_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_RBAC_AKS_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
   create_dynamic_plugins_config "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}" "/tmp/configmap-dynamic-plugins-rbac.yaml"
   common::save_artifact "${namespace}" "/tmp/configmap-dynamic-plugins-rbac.yaml"
   kubectl apply -f /tmp/configmap-dynamic-plugins-rbac.yaml -n "${namespace}"
diff --git a/.ibm/pipelines/cluster/eks/eks-helm-deployment.sh b/.ibm/pipelines/cluster/eks/eks-helm-deployment.sh
index 4f4ad0e3bb..293d384f1b 100644
--- a/.ibm/pipelines/cluster/eks/eks-helm-deployment.sh
+++ b/.ibm/pipelines/cluster/eks/eks-helm-deployment.sh
@@ -12,7 +12,7 @@ initiate_eks_helm_deployment() {
   namespace::configure "${NAME_SPACE}"
   deploy_redis_cache "${NAME_SPACE}"
 
-  uninstall_helmchart "${NAME_SPACE}" "${RELEASE_NAME}"
+  helm::uninstall "${NAME_SPACE}" "${RELEASE_NAME}"
 
   cd "${DIR}" || exit
 
@@ -21,7 +21,7 @@ initiate_eks_helm_deployment() {
   local rhdh_base_url="https://${K8S_CLUSTER_ROUTER_BASE}"
   apply_yaml_files "${DIR}" "${NAME_SPACE}" "${rhdh_base_url}"
   envsubst < "${DIR}/value_files/${HELM_CHART_EKS_DIFF_VALUE_FILE_NAME}" > "/tmp/${HELM_CHART_EKS_DIFF_VALUE_FILE_NAME}"
-  yq_merge_value_files "merge" "${DIR}/value_files/${HELM_CHART_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_EKS_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
+  helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_EKS_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
   common::save_artifact "${NAME_SPACE}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}" # Save the final value-file into the artifacts directory.
   log::info "Deploying image from repository: ${QUAY_REPO}, TAG_NAME: ${TAG_NAME}, in NAME_SPACE: ${NAME_SPACE}"
   helm upgrade -i "${RELEASE_NAME}" -n "${NAME_SPACE}" \
@@ -38,7 +38,7 @@ initiate_rbac_eks_helm_deployment() {
   namespace::delete "${NAME_SPACE}"
   namespace::configure "${NAME_SPACE_RBAC}"
 
-  uninstall_helmchart "${NAME_SPACE_RBAC}" "${RELEASE_NAME_RBAC}"
+  helm::uninstall "${NAME_SPACE_RBAC}" "${RELEASE_NAME_RBAC}"
 
   cd "${DIR}" || exit
 
@@ -47,7 +47,7 @@ initiate_rbac_eks_helm_deployment() {
   local rbac_rhdh_base_url="https://${K8S_CLUSTER_ROUTER_BASE}"
   apply_yaml_files "${DIR}" "${NAME_SPACE_RBAC}" "${rbac_rhdh_base_url}"
   envsubst < "${DIR}/value_files/${HELM_CHART_RBAC_EKS_DIFF_VALUE_FILE_NAME}" > "/tmp/${HELM_CHART_RBAC_EKS_DIFF_VALUE_FILE_NAME}"
-  yq_merge_value_files "merge" "${DIR}/value_files/${HELM_CHART_RBAC_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_RBAC_EKS_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_RBAC_K8S_MERGED_VALUE_FILE_NAME}"
+  helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_RBAC_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_RBAC_EKS_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_RBAC_K8S_MERGED_VALUE_FILE_NAME}"
   common::save_artifact "${NAME_SPACE_RBAC}" "/tmp/${HELM_CHART_RBAC_K8S_MERGED_VALUE_FILE_NAME}" # Save the final value-file into the artifacts directory.
   log::info "Deploying image from repository: ${QUAY_REPO}, TAG_NAME: ${TAG_NAME}, in NAME_SPACE: ${NAME_SPACE_RBAC}"
   helm upgrade -i "${RELEASE_NAME_RBAC}" -n "${NAME_SPACE_RBAC}" \
diff --git a/.ibm/pipelines/cluster/eks/eks-operator-deployment.sh b/.ibm/pipelines/cluster/eks/eks-operator-deployment.sh
index 59971fd1bc..1b9a60fb18 100644
--- a/.ibm/pipelines/cluster/eks/eks-operator-deployment.sh
+++ b/.ibm/pipelines/cluster/eks/eks-operator-deployment.sh
@@ -19,7 +19,7 @@ initiate_eks_operator_deployment() {
   apply_yaml_files "${DIR}" "${namespace}" "${rhdh_base_url}"
 
   log::info "Creating and applying ConfigMap for dynamic plugins"
-  yq_merge_value_files "merge" "${DIR}/value_files/${HELM_CHART_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_EKS_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
+  helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_EKS_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
   create_dynamic_plugins_config "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}" "/tmp/configmap-dynamic-plugins.yaml"
   common::save_artifact "${namespace}" "/tmp/configmap-dynamic-plugins.yaml"
   kubectl apply -f /tmp/configmap-dynamic-plugins.yaml -n "${namespace}"
@@ -44,7 +44,7 @@ initiate_rbac_eks_operator_deployment() {
   apply_yaml_files "${DIR}" "${namespace}" "${rhdh_base_url}"
 
   log::info "Creating and applying ConfigMap for dynamic plugins"
-  yq_merge_value_files "merge" "${DIR}/value_files/${HELM_CHART_RBAC_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_RBAC_EKS_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
+  helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_RBAC_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_RBAC_EKS_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
   create_dynamic_plugins_config "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}" "/tmp/configmap-dynamic-plugins-rbac.yaml"
   common::save_artifact "${namespace}" "/tmp/configmap-dynamic-plugins-rbac.yaml"
   kubectl apply -f /tmp/configmap-dynamic-plugins-rbac.yaml -n "${namespace}"
diff --git a/.ibm/pipelines/cluster/gke/gke-helm-deployment.sh b/.ibm/pipelines/cluster/gke/gke-helm-deployment.sh
index e3a07c48b6..955cc2277f 100644
--- a/.ibm/pipelines/cluster/gke/gke-helm-deployment.sh
+++ b/.ibm/pipelines/cluster/gke/gke-helm-deployment.sh
@@ -15,13 +15,13 @@ initiate_gke_helm_deployment() {
 
   deploy_redis_cache "${NAME_SPACE}"
 
-  uninstall_helmchart "${NAME_SPACE}" "${RELEASE_NAME}"
+  helm::uninstall "${NAME_SPACE}" "${RELEASE_NAME}"
 
   cd "${DIR}" || exit
   local rhdh_base_url="https://${K8S_CLUSTER_ROUTER_BASE}"
   apply_yaml_files "${DIR}" "${NAME_SPACE}" "${rhdh_base_url}"
   apply_gke_frontend_config "${NAME_SPACE}"
-  yq_merge_value_files "merge" "${DIR}/value_files/${HELM_CHART_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_GKE_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
+  helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_GKE_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
   common::save_artifact "${NAME_SPACE}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
 
   namespace::setup_image_pull_secret "${NAME_SPACE}" "rh-pull-secret" "${REGISTRY_REDHAT_IO_SERVICE_ACCOUNT_DOCKERCONFIGJSON}"
@@ -40,13 +40,13 @@ initiate_rbac_gke_helm_deployment() {
   namespace::delete "${NAME_SPACE}"
   namespace::configure "${NAME_SPACE_RBAC}"
 
-  uninstall_helmchart "${NAME_SPACE_RBAC}" "${RELEASE_NAME_RBAC}"
+  helm::uninstall "${NAME_SPACE_RBAC}" "${RELEASE_NAME_RBAC}"
 
   cd "${DIR}" || exit
   local rbac_rhdh_base_url="https://${K8S_CLUSTER_ROUTER_BASE}"
   apply_yaml_files "${DIR}" "${NAME_SPACE_RBAC}" "${rbac_rhdh_base_url}"
   apply_gke_frontend_config "${NAME_SPACE_RBAC}"
-  yq_merge_value_files "merge" "${DIR}/value_files/${HELM_CHART_RBAC_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_RBAC_GKE_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_RBAC_K8S_MERGED_VALUE_FILE_NAME}"
+  helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_RBAC_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_RBAC_GKE_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_RBAC_K8S_MERGED_VALUE_FILE_NAME}"
   common::save_artifact "${NAME_SPACE_RBAC}" "/tmp/${HELM_CHART_RBAC_K8S_MERGED_VALUE_FILE_NAME}"
 
   namespace::setup_image_pull_secret "${NAME_SPACE_RBAC}" "rh-pull-secret" "${REGISTRY_REDHAT_IO_SERVICE_ACCOUNT_DOCKERCONFIGJSON}"
diff --git a/.ibm/pipelines/cluster/gke/gke-operator-deployment.sh b/.ibm/pipelines/cluster/gke/gke-operator-deployment.sh
index 6d63e9db45..1518d12ae2 100644
--- a/.ibm/pipelines/cluster/gke/gke-operator-deployment.sh
+++ b/.ibm/pipelines/cluster/gke/gke-operator-deployment.sh
@@ -24,7 +24,7 @@ initiate_gke_operator_deployment() {
   apply_gke_frontend_config "${namespace}"
 
   log::info "Creating and applying ConfigMap for dynamic plugins"
-  yq_merge_value_files "merge" "${DIR}/value_files/${HELM_CHART_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_GKE_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
+  helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_GKE_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
   create_dynamic_plugins_config "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}" "/tmp/configmap-dynamic-plugins.yaml"
   common::save_artifact "${namespace}" "/tmp/configmap-dynamic-plugins.yaml"
   kubectl apply -f /tmp/configmap-dynamic-plugins.yaml -n "${namespace}"
@@ -50,7 +50,7 @@ initiate_rbac_gke_operator_deployment() {
   apply_gke_frontend_config "${namespace}"
 
   log::info "Creating and applying ConfigMap for dynamic plugins"
-  yq_merge_value_files "merge" "${DIR}/value_files/${HELM_CHART_RBAC_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_RBAC_GKE_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
+  helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_RBAC_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_RBAC_GKE_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}"
   create_dynamic_plugins_config "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}" "/tmp/configmap-dynamic-plugins-rbac.yaml"
   common::save_artifact "${namespace}" "/tmp/configmap-dynamic-plugins-rbac.yaml"
   kubectl apply -f /tmp/configmap-dynamic-plugins-rbac.yaml -n "${namespace}"
diff --git a/.ibm/pipelines/jobs/ocp-operator.sh b/.ibm/pipelines/jobs/ocp-operator.sh
index 460ba30c79..d58eff9122 100644
--- a/.ibm/pipelines/jobs/ocp-operator.sh
+++ b/.ibm/pipelines/jobs/ocp-operator.sh
@@ -49,7 +49,7 @@ initiate_operator_deployments_osd_gcp() {
   apply_yaml_files "${DIR}" "${NAME_SPACE}" "${rhdh_base_url}"
 
   # Merge base values with OSD-GCP diff file before creating dynamic plugins config
-  yq_merge_value_files "merge" "${DIR}/value_files/${HELM_CHART_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_OSD_GCP_DIFF_VALUE_FILE_NAME}" "/tmp/merged-values_showcase_OSD-GCP.yaml"
+  helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_OSD_GCP_DIFF_VALUE_FILE_NAME}" "/tmp/merged-values_showcase_OSD-GCP.yaml"
   create_dynamic_plugins_config "/tmp/merged-values_showcase_OSD-GCP.yaml" "/tmp/configmap-dynamic-plugins.yaml"
   common::save_artifact "${NAME_SPACE}" "/tmp/configmap-dynamic-plugins.yaml"
 
@@ -67,7 +67,7 @@ initiate_operator_deployments_osd_gcp() {
   apply_yaml_files "${DIR}" "${NAME_SPACE_RBAC}" "${rbac_rhdh_base_url}"
 
   # Merge RBAC values with OSD-GCP diff file before creating dynamic plugins config
-  yq_merge_value_files "merge" "${DIR}/value_files/${HELM_CHART_RBAC_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_RBAC_OSD_GCP_DIFF_VALUE_FILE_NAME}" "/tmp/merged-values_showcase-rbac_OSD-GCP.yaml"
+  helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_RBAC_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_RBAC_OSD_GCP_DIFF_VALUE_FILE_NAME}" "/tmp/merged-values_showcase-rbac_OSD-GCP.yaml"
   create_dynamic_plugins_config "/tmp/merged-values_showcase-rbac_OSD-GCP.yaml" "/tmp/configmap-dynamic-plugins-rbac.yaml"
   common::save_artifact "${NAME_SPACE_RBAC}" "/tmp/configmap-dynamic-plugins-rbac.yaml"
 
diff --git a/.ibm/pipelines/jobs/upgrade.sh b/.ibm/pipelines/jobs/upgrade.sh
index b66e3b9a0a..1f0f6a7cff 100644
--- a/.ibm/pipelines/jobs/upgrade.sh
+++ b/.ibm/pipelines/jobs/upgrade.sh
@@ -22,7 +22,7 @@ handle_ocp_helm_upgrade() {
     save_overall_result 1
     exit 1
   fi
-  CHART_VERSION_BASE=$(get_chart_version "$previous_release_version")
+  CHART_VERSION_BASE=$(helm::get_chart_version "$previous_release_version")
   if [[ -z "$CHART_VERSION_BASE" ]]; then
     log::error "Failed to determine correct chart version for $previous_release_version. Exiting."
     save_overall_result 1
diff --git a/.ibm/pipelines/lib/helm.sh b/.ibm/pipelines/lib/helm.sh
index a28c623210..a78f1856bc 100644
--- a/.ibm/pipelines/lib/helm.sh
+++ b/.ibm/pipelines/lib/helm.sh
@@ -204,34 +204,3 @@ helm::install() {
     --set global.clusterRouterBase="${K8S_CLUSTER_ROUTER_BASE}" \
     $(helm::get_image_params)
 }
-
-# ==============================================================================
-# Backward Compatibility Aliases
-# These functions delegate to the new namespaced functions for backward compatibility
-# ==============================================================================
-
-# Alias for backward compatibility
-yq_merge_value_files() {
-  helm::merge_values "$@"
-  return $?
-}
-uninstall_helmchart() {
-  helm::uninstall "$@"
-  return $?
-}
-get_image_helm_set_params() {
-  helm::get_image_params "$@"
-  return $?
-}
-perform_helm_install() {
-  helm::install "$@"
-  return $?
-}
-get_chart_version() {
-  helm::get_chart_version "$@"
-  return $?
-}
-get_previous_release_value_file() {
-  helm::get_previous_release_values "$@"
-  return $?
-}
diff --git a/.ibm/pipelines/openshift-ci-tests.sh b/.ibm/pipelines/openshift-ci-tests.sh
index e648da9a7b..efd76fd72f 100755
--- a/.ibm/pipelines/openshift-ci-tests.sh
+++ b/.ibm/pipelines/openshift-ci-tests.sh
@@ -47,7 +47,7 @@ main() {
   log::info "Log file: ${LOGFILE}"
   log::info "JOB_NAME : $JOB_NAME"
 
-  CHART_VERSION=$(get_chart_version "$CHART_MAJOR_VERSION")
+  CHART_VERSION=$(helm::get_chart_version "$CHART_MAJOR_VERSION")
   export CHART_VERSION
 
   case "$JOB_NAME" in
diff --git a/.ibm/pipelines/utils.sh b/.ibm/pipelines/utils.sh
index f1be382dba..eac98563c8 100755
--- a/.ibm/pipelines/utils.sh
+++ b/.ibm/pipelines/utils.sh
@@ -71,17 +71,6 @@ disable_orchestrator_plugins_in_values() {
   return $?
 }
 
-# ==============================================================================
-# K8s Wait Functions - Delegate to lib/k8s-wait.sh
-# ==============================================================================
-wait_for_deployment() { k8s_wait::deployment "$@"; }
-
-wait_for_job_completion() { k8s_wait::job "$@"; }
-
-wait_for_svc() { k8s_wait::service "$@"; }
-
-wait_for_endpoint() { k8s_wait::endpoint "$@"; }
-
 # ==============================================================================
 # Operator Functions - Delegate to lib/operators.sh
 # ==============================================================================
@@ -657,7 +646,7 @@ base_deployment() {
 
   if should_skip_orchestrator; then
     local merged_pr_value_file="/tmp/merged-values_showcase_PR.yaml"
-    yq_merge_value_files "merge" "${DIR}/value_files/${HELM_CHART_VALUE_FILE_NAME}" "${DIR}/value_files/diff-values_showcase_PR.yaml" "${merged_pr_value_file}"
+    helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_VALUE_FILE_NAME}" "${DIR}/value_files/diff-values_showcase_PR.yaml" "${merged_pr_value_file}"
     disable_orchestrator_plugins_in_values "${merged_pr_value_file}"
 
     mkdir -p "${ARTIFACT_DIR}/${NAME_SPACE}"
@@ -667,9 +656,9 @@ base_deployment() {
       "${HELM_CHART_URL}" --version "${CHART_VERSION}" \
       -f "${merged_pr_value_file}" \
       --set global.clusterRouterBase="${K8S_CLUSTER_ROUTER_BASE}" \
-      $(get_image_helm_set_params)
+      $(helm::get_image_params)
   else
-    perform_helm_install "${RELEASE_NAME}" "${NAME_SPACE}" "${HELM_CHART_VALUE_FILE_NAME}"
+    helm::install "${RELEASE_NAME}" "${NAME_SPACE}" "${HELM_CHART_VALUE_FILE_NAME}"
   fi
 
   if should_skip_orchestrator; then
@@ -698,7 +687,7 @@ rbac_deployment() {
   log::info "Deploying image from repository: ${QUAY_REPO}, TAG_NAME: ${TAG_NAME}, in NAME_SPACE: ${RELEASE_NAME_RBAC}"
   if should_skip_orchestrator; then
     local merged_pr_rbac_value_file="/tmp/merged-values_showcase-rbac_PR.yaml"
-    yq_merge_value_files "merge" "${DIR}/value_files/${HELM_CHART_RBAC_VALUE_FILE_NAME}" "${DIR}/value_files/diff-values_showcase-rbac_PR.yaml" "${merged_pr_rbac_value_file}"
+    helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_RBAC_VALUE_FILE_NAME}" "${DIR}/value_files/diff-values_showcase-rbac_PR.yaml" "${merged_pr_rbac_value_file}"
     disable_orchestrator_plugins_in_values "${merged_pr_rbac_value_file}"
 
     mkdir -p "${ARTIFACT_DIR}/${NAME_SPACE_RBAC}"
@@ -708,9 +697,9 @@ rbac_deployment() {
       "${HELM_CHART_URL}" --version "${CHART_VERSION}" \
       -f "${merged_pr_rbac_value_file}" \
       --set global.clusterRouterBase="${K8S_CLUSTER_ROUTER_BASE}" \
-      $(get_image_helm_set_params)
+      $(helm::get_image_params)
   else
-    perform_helm_install "${RELEASE_NAME_RBAC}" "${NAME_SPACE_RBAC}" "${HELM_CHART_RBAC_VALUE_FILE_NAME}"
+    helm::install "${RELEASE_NAME_RBAC}" "${NAME_SPACE_RBAC}" "${HELM_CHART_RBAC_VALUE_FILE_NAME}"
   fi
 
   # NOTE: This is a workaround to allow the sonataflow platform to connect to the external postgres db using ssl.
@@ -752,7 +741,7 @@ base_deployment_osd_gcp() {
   apply_yaml_files "${DIR}" "${NAME_SPACE}" "${rhdh_base_url}"
 
   # Merge base values with OSD-GCP diff file
-  yq_merge_value_files "merge" "${DIR}/value_files/${HELM_CHART_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_OSD_GCP_DIFF_VALUE_FILE_NAME}" "/tmp/merged-values_showcase_OSD-GCP.yaml"
+  helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_OSD_GCP_DIFF_VALUE_FILE_NAME}" "/tmp/merged-values_showcase_OSD-GCP.yaml"
   mkdir -p "${ARTIFACT_DIR}/${NAME_SPACE}"
   cp -a "/tmp/merged-values_showcase_OSD-GCP.yaml" "${ARTIFACT_DIR}/${NAME_SPACE}/" # Save the final value-file into the artifacts directory.
 
@@ -763,7 +752,7 @@ base_deployment_osd_gcp() {
     "${HELM_CHART_URL}" --version "${CHART_VERSION}" \
     -f "/tmp/merged-values_showcase_OSD-GCP.yaml" \
     --set global.clusterRouterBase="${K8S_CLUSTER_ROUTER_BASE}" \
-    $(get_image_helm_set_params)
+    $(helm::get_image_params)
 
   # Skip orchestrator workflows deployment for OSD-GCP
   log::warn "Skipping orchestrator workflows deployment on OSD-GCP environment"
@@ -779,7 +768,7 @@ rbac_deployment_osd_gcp() {
   apply_yaml_files "${DIR}" "${NAME_SPACE_RBAC}" "${rbac_rhdh_base_url}"
 
   # Merge RBAC values with OSD-GCP diff file
-  yq_merge_value_files "merge" "${DIR}/value_files/${HELM_CHART_RBAC_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_RBAC_OSD_GCP_DIFF_VALUE_FILE_NAME}" "/tmp/merged-values_showcase-rbac_OSD-GCP.yaml"
+  helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_RBAC_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_RBAC_OSD_GCP_DIFF_VALUE_FILE_NAME}" "/tmp/merged-values_showcase-rbac_OSD-GCP.yaml"
   mkdir -p "${ARTIFACT_DIR}/${NAME_SPACE_RBAC}"
   cp -a "/tmp/merged-values_showcase-rbac_OSD-GCP.yaml" "${ARTIFACT_DIR}/${NAME_SPACE_RBAC}/" # Save the final value-file into the artifacts directory.
 
@@ -790,7 +779,7 @@ rbac_deployment_osd_gcp() {
     "${HELM_CHART_URL}" --version "${CHART_VERSION}" \
     -f "/tmp/merged-values_showcase-rbac_OSD-GCP.yaml" \
     --set global.clusterRouterBase="${K8S_CLUSTER_ROUTER_BASE}" \
-    $(get_image_helm_set_params)
+    $(helm::get_image_params)
 
   # Skip orchestrator workflows deployment for OSD-GCP
   log::warn "Skipping orchestrator workflows deployment on OSD-GCP RBAC environment"
@@ -826,7 +815,7 @@ initiate_upgrade_base_deployments() {
 
   # Get dynamic value file path based on previous release version
   local previous_release_value_file
-  previous_release_value_file=$(get_previous_release_value_file "showcase")
+  previous_release_value_file=$(helm::get_previous_release_values "showcase")
   echo "Using dynamic value file: ${previous_release_value_file}"
 
   helm upgrade -i "${release_name}" -n "${namespace}" \
@@ -848,7 +837,7 @@ initiate_upgrade_deployments() {
   log::info "Initiating upgrade deployment"
   cd "${DIR}"
 
-  yq_merge_value_files "merge" "${DIR}/value_files/${HELM_CHART_VALUE_FILE_NAME}" "${DIR}/value_files/diff-values_showcase_upgrade.yaml" "/tmp/merged_value_file.yaml"
+  helm::merge_values "merge" "${DIR}/value_files/${HELM_CHART_VALUE_FILE_NAME}" "${DIR}/value_files/diff-values_showcase_upgrade.yaml" "/tmp/merged_value_file.yaml"
   log::info "Deploying image from repository: ${QUAY_REPO}, TAG_NAME: ${TAG_NAME}, in NAME_SPACE: ${NAME_SPACE}"
 
   helm upgrade -i "${RELEASE_NAME}" -n "${NAME_SPACE}" \
@@ -867,7 +856,7 @@ initiate_runtime_deployment() {
   local release_name=$1
   local namespace=$2
   namespace::configure "${namespace}"
-  uninstall_helmchart "${namespace}" "${release_name}"
+  helm::uninstall "${namespace}" "${release_name}"
 
   oc apply -f "$DIR/resources/postgres-db/dynamic-plugins-root-PVC.yaml" -n "${namespace}"
 
@@ -876,7 +865,7 @@ initiate_runtime_deployment() {
     "${HELM_CHART_URL}" --version "${CHART_VERSION}" \
     -f "$DIR/resources/postgres-db/values-showcase-postgres.yaml" \
     --set global.clusterRouterBase="${K8S_CLUSTER_ROUTER_BASE}" \
-    $(get_image_helm_set_params)
+    $(helm::get_image_params)
 }
 
 initiate_sanity_plugin_checks_deployment() {
@@ -885,10 +874,10 @@ initiate_sanity_plugin_checks_deployment() {
   local sanity_plugins_url=$3
 
   namespace::configure "${name_space_sanity_plugins_check}"
-  uninstall_helmchart "${name_space_sanity_plugins_check}" "${release_name}"
+  helm::uninstall "${name_space_sanity_plugins_check}" "${release_name}"
   deploy_redis_cache "${name_space_sanity_plugins_check}"
   apply_yaml_files "${DIR}" "${name_space_sanity_plugins_check}" "${sanity_plugins_url}"
-  yq_merge_value_files "overwrite" "${DIR}/value_files/${HELM_CHART_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_SANITY_PLUGINS_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_SANITY_PLUGINS_MERGED_VALUE_FILE_NAME}"
+  helm::merge_values "overwrite" "${DIR}/value_files/${HELM_CHART_VALUE_FILE_NAME}" "${DIR}/value_files/${HELM_CHART_SANITY_PLUGINS_DIFF_VALUE_FILE_NAME}" "/tmp/${HELM_CHART_SANITY_PLUGINS_MERGED_VALUE_FILE_NAME}"
   mkdir -p "${ARTIFACT_DIR}/${name_space_sanity_plugins_check}"
   cp -a "/tmp/${HELM_CHART_SANITY_PLUGINS_MERGED_VALUE_FILE_NAME}" "${ARTIFACT_DIR}/${name_space_sanity_plugins_check}/" || true # Save the final value-file into the artifacts directory.
   # shellcheck disable=SC2046
@@ -896,7 +885,7 @@ initiate_sanity_plugin_checks_deployment() {
     "${HELM_CHART_URL}" --version "${CHART_VERSION}" \
     -f "/tmp/${HELM_CHART_SANITY_PLUGINS_MERGED_VALUE_FILE_NAME}" \
     --set global.clusterRouterBase="${K8S_CLUSTER_ROUTER_BASE}" \
-    $(get_image_helm_set_params) \
+    $(helm::get_image_params) \
     --set orchestrator.enabled=true
 }
 
@@ -966,16 +955,12 @@ check_helm_upgrade() {
 # ==============================================================================
 # Common Functions - Delegate to lib/common.sh
 # ==============================================================================
-oc_login() { common::oc_login "$@"; }
-
 is_openshift() {
   oc get routes.route.openshift.io &> /dev/null || kubectl get routes.route.openshift.io &> /dev/null
 }
 
 sed_inplace() { common::sed_inplace "$@"; }
 
-get_previous_release_version() { common::get_previous_release_version "$@"; }
-
 # Helper function to wait for backstage resource to exist in namespace
 wait_for_backstage_resource() {
   local namespace=$1