diff --git a/installers/install_ngsa.sh b/installers/install_ngsa.sh
index fb86817..56da955 100755
--- a/installers/install_ngsa.sh
+++ b/installers/install_ngsa.sh
@@ -36,11 +36,11 @@
         # if it does not exist, create secrets and install
         helm repo add apache-airflow https://airflow.apache.org
         helm repo update
-        helm -n osm install airflow apache-airflow/airflow -f ${OSM_HELM_WORK_DIR}/airflow-values.yaml --version ${AIRFLOW_HELM_VERSION}
+        helm -n osm install airflow apache-airflow/airflow -f ${OSM_HELM_WORK_DIR}/airflow-values.yaml --version ${AIRFLOW_HELM_VERSION} --timeout 10m || FATAL_TRACK ngsa "Failed installing airflow helm chart"
     else
         # if it exists, upgrade
         helm repo update
-        helm -n osm upgrade airflow apache-airflow/airflow -f ${OSM_HELM_WORK_DIR}/airflow-values.yaml --version ${AIRFLOW_HELM_VERSION}
+        helm -n osm upgrade airflow apache-airflow/airflow -f ${OSM_HELM_WORK_DIR}/airflow-values.yaml --version ${AIRFLOW_HELM_VERSION} || FATAL_TRACK ngsa "Failed installing airflow helm chart"
     fi
     [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
 }
@@ -52,11 +52,11 @@
         # if it does not exist, install
         helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
         helm repo update
-        helm -n osm install pushgateway prometheus-community/prometheus-pushgateway --version ${PROMPUSHGW_HELM_VERSION}
+        helm -n osm install pushgateway prometheus-community/prometheus-pushgateway --version ${PROMPUSHGW_HELM_VERSION} || FATAL_TRACK ngsa "Failed installing pushgateway helm chart"
     else
         # if it exists, upgrade
         helm repo update
-        helm -n osm upgrade pushgateway prometheus-community/prometheus-pushgateway --version ${PROMPUSHGW_HELM_VERSION}
+        helm -n osm upgrade pushgateway prometheus-community/prometheus-pushgateway --version ${PROMPUSHGW_HELM_VERSION} || FATAL_TRACK ngsa "Failed installing pushgateway helm chart"
     fi
     [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
 }
@@ -71,11 +71,11 @@
         # if it does not exist, install
         helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
         helm repo update
-        helm -n osm install alertmanager prometheus-community/alertmanager -f ${OSM_HELM_WORK_DIR}/alertmanager-values.yaml --version ${ALERTMANAGER_HELM_VERSION}
+        helm -n osm install alertmanager prometheus-community/alertmanager -f ${OSM_HELM_WORK_DIR}/alertmanager-values.yaml --version ${ALERTMANAGER_HELM_VERSION} || FATAL_TRACK ngsa "Failed installing alertmanager helm chart"
     else
         # if it exists, upgrade
         helm repo update
-        helm -n osm upgrade alertmanager prometheus-community/alertmanager -f ${OSM_HELM_WORK_DIR}/alertmanager-values.yaml --version ${ALERTMANAGER_HELM_VERSION}
+        helm -n osm upgrade alertmanager prometheus-community/alertmanager -f ${OSM_HELM_WORK_DIR}/alertmanager-values.yaml --version ${ALERTMANAGER_HELM_VERSION} || FATAL_TRACK ngsa "Failed installing alertmanager helm chart"
     fi
     [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
 }