diff --git a/chronos-umbrella/Chart.yaml b/chronos-umbrella/Chart.yaml
index 1d697f6..8aae521 100644
--- a/chronos-umbrella/Chart.yaml
+++ b/chronos-umbrella/Chart.yaml
@@ -7,7 +7,7 @@
 description: Chronos Umbrella chart to deploy all Aether ROC
 kubeVersion: ">=1.18.0"
 type: application
-version: 0.1.30
+version: 0.1.31
 appVersion: v0.0.0
 keywords:
   - aether
@@ -48,6 +48,5 @@
     version: 1.16.0
   - name: mailhog
     condition: import.rasa.enabled
-    alias: chronos-umbrella-mailhog
-    version: 1.0.2
-    repository: https://sitepilot.github.io/helm-charts
+    version: 5.0.5
+    repository: https://codecentric.github.io/helm-charts
diff --git a/chronos-umbrella/templates/NOTES.txt b/chronos-umbrella/templates/NOTES.txt
index c5c7359..c9fb46f 100644
--- a/chronos-umbrella/templates/NOTES.txt
+++ b/chronos-umbrella/templates/NOTES.txt
@@ -12,3 +12,6 @@
   $ helm -n {{.Release.Namespace}} get all {{ .Release.Name }}
   $ watch kubectl -n {{.Release.Namespace}} get pods
 
+NOTE: if you're deploying this with a name other than "chronos-umbrella" you will have to add
+`--set aether-enterprise-portal.rasa.service=<name>-rasa`. This is because RASA Helm Chart can utilize `fullnameOverride`
+See https://github.com/RasaHQ/helm-charts/issues/69
diff --git a/chronos-umbrella/templates/_helpers.tpl b/chronos-umbrella/templates/_helpers.tpl
deleted file mode 100644
index 72286dc..0000000
--- a/chronos-umbrella/templates/_helpers.tpl
+++ /dev/null
@@ -1,81 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-SPDX-License-Identifier: Apache-2.0
-
-Expand the name of the chart.
-*/}}
-{{- define "global.name" -}}
-{{- default .Chart.Name .Values.global.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "global.fullname" -}}
-{{- if .Values.global.fullnameOverride -}}
-{{- .Values.global.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.global.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "global.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "global.labels" -}}
-helm.sh/chart: {{ include "global.chart" . }}
-{{ include "global.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
-
-{{/*
-Selector labels
-*/}}
-{{- define "global.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "global.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end -}}
-
-{{/*
-global consensus image name
-*/}}
-{{- define "global.store.consensus.imagename" -}}
-{{- if .Values.global.store.consensus.image.tag -}}
-{{- if .Values.global.store.consensus.image.registry -}}
-{{- printf "%s/" .Values.global.store.consensus.image.registry -}}
-{{- end -}}
-{{- printf "%s:" .Values.global.store.consensus.image.repository -}}
-{{- .Values.global.store.consensus.image.tag -}}
-{{- else -}}
-""
-{{- end -}}
-{{- end -}}
-
-{{/*
-global consensus store name
-*/}}
-{{- define "global.store.consensus.name" -}}
-{{- if .Values.global.store.consensus.name -}}
-{{- printf "%s" .Values.global.store.consensus.name -}}
-{{- else -}}
-{{- printf "%s-consensus-store" ( include "global.fullname" . ) -}}
-{{- end -}}
-{{- end -}}
\ No newline at end of file
diff --git a/chronos-umbrella/values.yaml b/chronos-umbrella/values.yaml
index 8e9ac78..7bf05fe 100644
--- a/chronos-umbrella/values.yaml
+++ b/chronos-umbrella/values.yaml
@@ -7,7 +7,7 @@
 # Declare variables to be passed into your templates.
 
 global:
-  fullnameOverride: "onos"
+  fullnameOverride: "chronos"
   nameOverride: ""
 
 import:
@@ -29,13 +29,13 @@
     service: chronos-grafana
   prometheus:
     proxyEnabled: true
-    service: chronos-prometheus-chronos-server
+    service: chronos-prometheus
   rasa:
     proxyEnabled: true
     service: chronos-umbrella-rasa
   mailhog:
     proxyEnabled: true
-    service: chronos-umbrella
+    service: chronos-mailhog
 
 grafana:
   image:
@@ -54,7 +54,7 @@
   source:
   - name: chronos
     protocol: http
-    service: chronos-prometheus-chronos-server
+    service: chronos-prometheus
     port: 80
   grafana.ini:
     log:
@@ -100,20 +100,19 @@
 
 prometheus-chronos:
   alertmanager:
+    enabled: false
     persistentVolume:
       enabled: false
   server:
     persistentVolume:
       enabled: false
-    fullnameOverride: chronos-prometheus-chronos-server
+    fullnameOverride: chronos-prometheus
   pushgateway:
     enabled: false
   nodeExporter:
     enabled: false
   kubeStateMetrics:
     enabled: false
-  alertmanager:
-    enabled: false
   serverFiles:
     prometheus.yml:
       scrape_configs:
@@ -127,6 +126,7 @@
   image:
     repository: onosproject/rasa-sanic
     tag: v0.1.4
+#  fullnameOverride: "chronos-rasa"
   applicationSettings:
     token: chronos-rasa-token
     endpoints:
@@ -152,4 +152,7 @@
 
 rasa-action-server:
   smtp:
-    server: chronos-umbrella
+    server: chronos-mailhog
+
+mailhog:
+  fullnameOverride: chronos-mailhog
\ No newline at end of file