diff --git a/aether-enterprise-portal/Chart.yaml b/aether-enterprise-portal/Chart.yaml
index 6dc4af4..ffb8576 100644
--- a/aether-enterprise-portal/Chart.yaml
+++ b/aether-enterprise-portal/Chart.yaml
@@ -7,8 +7,8 @@
 description: Aether Enterprise Portal
 kubeVersion: ">=1.15.0"
 type: application
-version: 0.1.0
-appVersion: 0.1.0
+version: 0.1.1
+appVersion: 0.1.1
 keywords:
   - aether
   - roc
diff --git a/aether-enterprise-portal/templates/configmap.yaml b/aether-enterprise-portal/templates/configmap.yaml
index bed5fab..aa59c25 100644
--- a/aether-enterprise-portal/templates/configmap.yaml
+++ b/aether-enterprise-portal/templates/configmap.yaml
@@ -45,6 +45,21 @@
             proxy_set_header Upgrade $http_upgrade;
             add_header X-Frame-Options SAMEORIGIN;
         }{{end}}
+        {{- if .Values.rasa.proxyEnabled }}
+        location /rasa/ {
+            proxy_pass {{ .Values.rasa.protocol }}://{{ .Values.rasa.service }}:{{ .Values.rasa.port }}/;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "Upgrade";
+            proxy_set_header Host $host;
+        }{{end}}
+        {{- if .Values.mailhog.proxyEnabled }}
+        location /mailhog/ {
+            proxy_pass {{ .Values.mailhog.protocol }}://{{ .Values.mailhog.service }}:{{ .Values.mailhog.port }}/;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            add_header X-Frame-Options SAMEORIGIN;
+        }{{end}}
         location / {
           root /usr/share/nginx/html;
         }
diff --git a/aether-enterprise-portal/values.yaml b/aether-enterprise-portal/values.yaml
index a468140..845be6e 100644
--- a/aether-enterprise-portal/values.yaml
+++ b/aether-enterprise-portal/values.yaml
@@ -10,7 +10,7 @@
 
 image:
   repository: onosproject/aether-enterprise-portal
-  tag: v0.0.10
+  tag: v0.1.1
   pullPolicy: IfNotPresent
   pullSecrets: []
 
@@ -64,6 +64,18 @@
     protocol: http
     streamTimeout: 3600
 
+rasa:
+  proxyEnabled: false
+  service: rasa
+  protocol: http
+  port: 5005
+
+mailhog:
+  proxyEnabled: false
+  service: mailhog
+  protocol: http
+  port: 8025
+
 websocket:
   proxyEnabled: false
   service: aether-roc-websocket
diff --git a/chronos-exporter/Chart.yaml b/chronos-exporter/Chart.yaml
index f7e5038..06a13d8 100644
--- a/chronos-exporter/Chart.yaml
+++ b/chronos-exporter/Chart.yaml
@@ -7,8 +7,8 @@
 description: Chronos Exporter
 kubeVersion: ">=1.15.0"
 type: application
-version: 0.0.25
-appVersion: v0.0.20
+version: 0.1.0
+appVersion: v0.1.7
 keywords:
   - aether
   - exporter
diff --git a/chronos-exporter/values.yaml b/chronos-exporter/values.yaml
index 9b97fc3..99b2f14 100644
--- a/chronos-exporter/values.yaml
+++ b/chronos-exporter/values.yaml
@@ -10,7 +10,7 @@
 
 image:
   repository: onosproject/chronos-exporter
-  tag: v0.0.20
+  tag: v0.1.7
   pullPolicy: IfNotPresent
   pullSecrets: []
 
diff --git a/chronos-umbrella/Chart.yaml b/chronos-umbrella/Chart.yaml
index 12a8cfc..1d697f6 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.29
+version: 0.1.30
 appVersion: v0.0.0
 keywords:
   - aether
@@ -29,16 +29,25 @@
   - name: chronos-exporter
     condition: import.chronos-exporter.enabled
     repository: "file://../chronos-exporter"
-    version: 0.0.25
+    version: 0.1.0
   - name: aether-enterprise-portal
     condition: import.aether-enterprise-portal.enabled
     repository: "file://../aether-enterprise-portal"
-    version: 0.1.0
+    version: 0.1.1
   - name: rasa-model-server
-    condition: import.rasa-model-server.enabled
+    condition: import.rasa.enabled
     repository: "file://../rasa-model-server"
-    version: 0.0.4
+    version: 0.1.0
+  - name: rasa-action-server
+    condition: import.rasa.enabled
+    repository: "file://../rasa-action-server"
+    version: 0.1.0
   - name: rasa
     condition: import.rasa.enabled
     repository: https://helm.rasa.com
     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
diff --git a/chronos-umbrella/values.yaml b/chronos-umbrella/values.yaml
index 1f07720..8e9ac78 100644
--- a/chronos-umbrella/values.yaml
+++ b/chronos-umbrella/values.yaml
@@ -12,7 +12,7 @@
 
 import:
   grafana:
-    enabled: true
+    enabled: false
   prometheus:
     chronos:
       enabled: true
@@ -25,11 +25,17 @@
 
 aether-enterprise-portal:
   grafana:
-    proxyEnabled: true
+    proxyEnabled: false
     service: chronos-grafana
   prometheus:
     proxyEnabled: true
     service: chronos-prometheus-chronos-server
+  rasa:
+    proxyEnabled: true
+    service: chronos-umbrella-rasa
+  mailhog:
+    proxyEnabled: true
+    service: chronos-umbrella
 
 grafana:
   image:
@@ -118,6 +124,9 @@
                 - chronos-exporter:2112
 
 rasa:
+  image:
+    repository: onosproject/rasa-sanic
+    tag: v0.1.4
   applicationSettings:
     token: chronos-rasa-token
     endpoints:
@@ -125,13 +134,22 @@
         enabled: true
         url: http://rasa-model-server:8080/models/20220101-000000-aether-trained
         token: chronos-rasa-model-server-token
+        wait_time_between_pulls: 60
       trackerStore:
         enabled: false
-      credientials:
-        enabled: true
-        additionalChannelCredentials:
-          rest:
-      telemetry:
-        enabled: false
+    credentials:
+      enabled: true
+      additionalChannelCredentials:
+        rest:
+        socketio:
+          user_message_evt: user_uttered
+          bot_message_evt: bot_uttered
+          session_persistence: true/false
+    telemetry:
+      enabled: false
   postgresql:
     install: false
+
+rasa-action-server:
+  smtp:
+    server: chronos-umbrella
diff --git a/rasa-action-server/.helmignore b/rasa-action-server/.helmignore
new file mode 100644
index 0000000..98c5305
--- /dev/null
+++ b/rasa-action-server/.helmignore
@@ -0,0 +1,25 @@
+# SPDX-FileCopyrightText: 2022 Open Networking Foundation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/rasa-action-server/Chart.yaml b/rasa-action-server/Chart.yaml
new file mode 100644
index 0000000..e463817
--- /dev/null
+++ b/rasa-action-server/Chart.yaml
@@ -0,0 +1,18 @@
+# SPDX-FileCopyrightText: 2022-present Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: Apache-2.0
+
+apiVersion: v2
+name: rasa-action-server
+description: Rasa Model Server
+kubeVersion: ">=1.15.0"
+type: application
+version: 0.1.0
+appVersion: v0.1.7
+keywords:
+  - aether
+  - exporter
+home: https://www.opennetworking.org/aether/
+maintainers:
+  - name: Aether Ops team
+    email: support@opennetworking.org
diff --git a/rasa-action-server/README.md b/rasa-action-server/README.md
new file mode 100644
index 0000000..9e6b244
--- /dev/null
+++ b/rasa-action-server/README.md
@@ -0,0 +1,9 @@
+<!--
+SPDX-FileCopyrightText: 2022 Open Networking Foundation
+
+SPDX-License-Identifier: Apache-2.0
+-->
+
+## Rasa Model Server
+
+Provides a [Helm] chart for deploying Rasa Model Server on [Kubernetes].
diff --git a/rasa-action-server/files/certs/README.md b/rasa-action-server/files/certs/README.md
new file mode 100644
index 0000000..3a45831
--- /dev/null
+++ b/rasa-action-server/files/certs/README.md
@@ -0,0 +1,32 @@
+<!--
+SPDX-FileCopyrightText: 2022 Open Networking Foundation
+
+SPDX-License-Identifier: Apache-2.0
+-->
+
+This folder contains self-signed certificates for use in testing. _DO NOT USE THESE
+CERTIFICATES IN PRODUCTION!_
+
+The certificates were generated with the
+https://github.com/onosproject/simulators/blob/master/pkg/certs/generate_certs.sh 
+script as
+```bash
+generate_certs.sh sdcore-adapter
+```
+
+In this folder they **must** be (re)named
+* tls.cacrt
+* tls.crt
+* tls.key
+
+Use
+```bash
+openssl x509 -in deployments/helm/onos-config/files/certs/tls.crt -text -noout
+```
+to verify the contents (especially the subject).
+
+There is another Cert for onos-config in test/certs but these were created with:
+```
+generate-certs.sh onos-config
+```
+and are left named onf.cacrt, onos-config.key and onos-config.crt
diff --git a/rasa-action-server/files/certs/tls.cacert b/rasa-action-server/files/certs/tls.cacert
new file mode 100644
index 0000000..3dcb76b
--- /dev/null
+++ b/rasa-action-server/files/certs/tls.cacert
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDYDCCAkgCCQDe99fSN9qxSTANBgkqhkiG9w0BAQsFADByMQswCQYDVQQGEwJV
+UzELMAkGA1UECAwCQ0ExEjAQBgNVBAcMCU1lbmxvUGFyazEMMAoGA1UECgwDT05G
+MRQwEgYDVQQLDAtFbmdpbmVlcmluZzEeMBwGA1UEAwwVY2Eub3Blbm5ldHdvcmtp
+bmcub3JnMB4XDTE5MDQxMTA5MDYxM1oXDTI5MDQwODA5MDYxM1owcjELMAkGA1UE
+BhMCVVMxCzAJBgNVBAgMAkNBMRIwEAYDVQQHDAlNZW5sb1BhcmsxDDAKBgNVBAoM
+A09ORjEUMBIGA1UECwwLRW5naW5lZXJpbmcxHjAcBgNVBAMMFWNhLm9wZW5uZXR3
+b3JraW5nLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMEg7CZR
+X8Y+syKHaQCh6mNIL1D065trwX8RnuKM2kBwSu034zefQAPloWugSoJgJnf5fe0j
+nUD8gN3Sm8XRhCkvf67pzfabgw4n8eJmHScyL/ugyExB6Kahwzn37bt3oT3gSqhr
+6PUznWJ8fvfVuCHZZkv/HPRp4eyAcGzbJ4TuB0go4s6VE0WU5OCxCSlAiK3lvpVr
+3DOLdYLVoCa5q8Ctl3wXDrfTLw5/Bpfrg9fF9ED2/YKIdV8KZ2ki/gwEOQqWcKp8
+0LkTlfOWsdGjp4opPuPT7njMBGXMJzJ8/J1e1aJvIsoB7n8XrfvkNiWL5U3fM4N7
+UZN9jfcl7ULmm7cCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAIh6FjkQuTfXddmZY
+FYpoTen/VD5iu2Xxc1TexwmKeH+YtaKp1Zk8PTgbCtMEwEiyslfeHTMtODfnpUIk
+DwvtB4W0PAnreRsqh9MBzdU6YZmzGyZ92vSUB3yukkHaYzyjeKM0AwgVl9yRNEZw
+Y/OM070hJXXzJh3eJpLl9dlUbMKzaoAh2bZx6y3ZJIZFs/zrpGfg4lvBAvfO/59i
+mxJ9bQBSN3U2Hwp6ioOQzP0LpllfXtx9N5LanWpB0cu/HN9vAgtp3kRTBZD0M1XI
+Ctit8bXV7Mz+1iGqoyUhfCYcCSjuWTgAxzir+hrdn7uO67Hv4ndCoSj4SQaGka3W
+eEfVeA==
+-----END CERTIFICATE-----
diff --git a/rasa-action-server/files/certs/tls.crt b/rasa-action-server/files/certs/tls.crt
new file mode 100644
index 0000000..a634ab0
--- /dev/null
+++ b/rasa-action-server/files/certs/tls.crt
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDYzCCAksCFErBGzsXHo1l8bmZRmDkF+h2bsdWMA0GCSqGSIb3DQEBCwUAMHIx
+CzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTESMBAGA1UEBwwJTWVubG9QYXJrMQww
+CgYDVQQKDANPTkYxFDASBgNVBAsMC0VuZ2luZWVyaW5nMR4wHAYDVQQDDBVjYS5v
+cGVubmV0d29ya2luZy5vcmcwHhcNMjExMTA1MTQyNzU0WhcNMzExMTAzMTQyNzU0
+WjBqMQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExEjAQBgNVBAcMCU1lbmxvUGFy
+azEMMAoGA1UECgwDT05GMRQwEgYDVQQLDAtFbmdpbmVlcmluZzEWMBQGA1UEAwwN
+ZGVtby1leHBvcnRlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPUf
+jSlFz8wQBeUid4hUq8gL9Tggoe38QX26j/XuLsbM0dxzJMD2k2nDXOz0caMlUYqX
+sOSn5GRtoZsVa9lKbNTxF9HkEPLV7CWv+gqRXYOOPI9Wjr5lDKufxeKKXrW+zJvu
+gUWRQ+l9bZLb7KHbhQ+mmLQC1/r+PgS1CIMc1PQ560FPpI9w+cl3IeY8XvEvKDGE
+cxroDfPqrv0gTtOekuGBVQj1ivUg+SdfyP8j5RX/RyCUfuWJoNJEDWKioKKBjrhK
+rP17yILr0RZst8tAuwxJXruMzNDribYgJn3bXHUQjX1tiFr48ProjfQCr77Elvd9
+DSd4XxtPwomJPXcQKN0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAXFs7WVelZ+6X
+ASTmhLZtzoWtBOjPCGEnBrK2SHVRHbaVLBBaZp/sW2+XkPMQrHwWVpFP+7ttrJ0V
+fsfGlRrZ6uxB9MDK9D2RS6Zo8HKUXCQWs4VRcw7Zzy1NPa4MLBAXRxLv83t4UfAj
+cUFkZ0UhKlFJNUZ74AcMBzK121BzxmDCDwnZWyeqzB8SKexdk8I+sEoc5/KIM/QP
+LdTKe3vw/WGH7p45M693BXWc5lyAcwB8iSmecjlPB5peN71sY3OeSJGUvS+Qbdla
+FBPC5tNbp4byRVciyLKnwxg4HmOfNhCZbRVYG2WHBaT7oMtx+4DaNs8ePwWIwvko
+ga0pInZUNg==
+-----END CERTIFICATE-----
diff --git a/rasa-action-server/files/certs/tls.key b/rasa-action-server/files/certs/tls.key
new file mode 100644
index 0000000..bc89538
--- /dev/null
+++ b/rasa-action-server/files/certs/tls.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQD1H40pRc/MEAXl
+IneIVKvIC/U4IKHt/EF9uo/17i7GzNHccyTA9pNpw1zs9HGjJVGKl7Dkp+RkbaGb
+FWvZSmzU8RfR5BDy1ewlr/oKkV2DjjyPVo6+ZQyrn8Xiil61vsyb7oFFkUPpfW2S
+2+yh24UPppi0Atf6/j4EtQiDHNT0OetBT6SPcPnJdyHmPF7xLygxhHMa6A3z6q79
+IE7TnpLhgVUI9Yr1IPknX8j/I+UV/0cglH7liaDSRA1ioqCigY64Sqz9e8iC69EW
+bLfLQLsMSV67jMzQ64m2ICZ921x1EI19bYha+PD66I30Aq++xJb3fQ0neF8bT8KJ
+iT13ECjdAgMBAAECggEAHFfroKwb3QK1S8tyeucffeA0GKtdTgFvKTSbVNqXuhEQ
+6ya9Rzq7zOz0H8ocIbs89IOZxrbLJ/mtSBtv/w4mC3FdSb3PX+Twi2MPzI0GfSHD
+Sue9VbKlhmrRHOLXFLjdO+KWPA8SBTuloeegMw8JEcg3vAjgJHulfDHarB53WU3n
+QXm34u759a4xGFFGtHW7wzDjsnt6Cm78Moi3IIbs40cE7EbUkGoHYstaQH8Kl2CI
+TIFcT2KuzJ057dxcS6KsBNbbyG0vbcBjV+221EGIcjuj7p53XhhLIE1p4tdv+9TG
+SZDPpgKLjMkIqeeq7It2XAG3sCkirwzEF7n+rVCeAQKBgQD6rnUX8Xr0r5lgPNIO
+Nsgop/aRQ/bfYNZfMP7kNLooq9efMPoxqaaCysMa+IjkCaCowladoQRtaWGp/iVM
+hjwE/l/oEASe8NDUUqk2w2SdNos6Cm9sj00TfCBqMhOKkAxbEZWMJxJ73hXYbkTt
+I/5rVj2dqE7YVCO2umExe91enQKBgQD6Uue+7iFdp77aghScEic109pEXoDfdcoa
+6ThDuroSb+f/YIl5na8IrXYQve40ycf2O9z3M2Sg9GczYqfSL1wMaVnkGUgkihJN
+W5yhDpqfkNMVJLQLTzX3dNQ3y10+XAneSuclY5gH0RBp4vfnn1r7vrP+ZhFx9khi
+aNyQbhS/QQKBgAz6dUN9FBGQ+c7at0FXIrvAHmrc6u4btF2PStMDy9OJOgua3Ikv
+sFg7KSi/T08HFJNIJHXavUDw4MaNSt8QYBEeHlcEZUjZTOaBNROJwC7HgSPLIIOt
+U587oO3+k7ZryMf6PBTafQF+uQDQjK7+WxCxkVUVPqfCi2rNcXS/ZfGdAoGAH9zp
+rr309Uzi2EFyiiMtZoae49D7qnX90csZ5FUiVjJ0X2dUWGyf2QTrYFostf9xOoCI
+MdcS2gICGOJX5kMs/k9yp7woGK6SgdJFb6LCP8lZdPmFCWN9xQ/T634xUjy47Niv
+72xr76LG6hN/5rW8CQtPMfSgB9eHgy9B1AiPD4ECgYBOyipIZ9YJG/gcOmWqgRdv
+22lD8nl0hU7El4gHhWYzABApglpCwwcE+GLK9h/9KZbOEIQs7itzZFEQCX1VbuUo
+8+JWR8ZsimMSmLb5ySF3hMbevaA6iYNjjpvDy1syFNW+WVefp7nf1zQB4qRMW1vb
+p0dF88DF/NJK1kAC2RBZew==
+-----END PRIVATE KEY-----
diff --git a/rasa-action-server/templates/_helpers.tpl b/rasa-action-server/templates/_helpers.tpl
new file mode 100644
index 0000000..e1a24b5
--- /dev/null
+++ b/rasa-action-server/templates/_helpers.tpl
@@ -0,0 +1,56 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+SPDX-FileCopyrightText: 2022-present Open Networking Foundation <info@opennetworking.org>
+SPDX-License-Identifier: Apache-2.0
+
+Expand the name of the chart.
+*/}}
+{{- define "rasa-action-server.name" -}}
+{{- default .Chart.Name .Values.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 "rasa-action-server.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.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 "rasa-action-server.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+{{/*
+Common labels
+*/}}
+{{- define "rasa-action-server.labels" -}}
+helm.sh/chart: {{ include "rasa-action-server.chart" . }}
+{{ include "rasa-action-server.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end -}}
+
+{{/*
+Selector labels
+*/}}
+{{- define "rasa-action-server.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "rasa-action-server.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end -}}
diff --git a/rasa-action-server/templates/deployment.yaml b/rasa-action-server/templates/deployment.yaml
new file mode 100644
index 0000000..9334358
--- /dev/null
+++ b/rasa-action-server/templates/deployment.yaml
@@ -0,0 +1,66 @@
+# SPDX-FileCopyrightText: 2022-present Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: Apache-2.0
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ template "rasa-action-server.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    name: {{ template "rasa-action-server.fullname" . }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "rasa-action-server.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        name: {{ template "rasa-action-server.fullname" . }}
+        {{- include "rasa-action-server.selectorLabels" . | nindent 8 }}
+    spec:
+    {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 6 }}
+    {{- end }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
+          args:
+            - "/usr/local/bin/rasa-action-server"
+            - "--smtpServer"
+            - {{.Values.smtp.server | quote }}
+            - "--smtpSerPort"
+            - {{.Values.smtp.port | quote}}
+          ports:
+            - name: action
+              containerPort: 8081
+          readinessProbe:
+            httpGet:
+              path: /webhook
+              port: 8081
+            initialDelaySeconds: 5
+            periodSeconds: 10
+          livenessProbe:
+            httpGet:
+              path: /webhook
+              port: 8081
+            initialDelaySeconds: 15
+            periodSeconds: 20
diff --git a/rasa-action-server/templates/secret.yaml b/rasa-action-server/templates/secret.yaml
new file mode 100644
index 0000000..2248efe
--- /dev/null
+++ b/rasa-action-server/templates/secret.yaml
@@ -0,0 +1,18 @@
+# SPDX-FileCopyrightText: 2022-present Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: Apache-2.0
+
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "rasa-action-server.fullname" . }}-secret
+  labels:
+     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+     release: "{{ .Release.Name }}"
+     heritage: "{{ .Release.Service }}"
+data:
+  {{ $root := . }}
+  {{ range $path, $bytes := .Files.Glob "files/certs/tls.*" }}
+  {{ base $path }}: '{{ $root.Files.Get $path | b64enc }}'
+  {{ end }}
+type: Opaque
diff --git a/rasa-action-server/templates/service.yaml b/rasa-action-server/templates/service.yaml
new file mode 100644
index 0000000..33a5133
--- /dev/null
+++ b/rasa-action-server/templates/service.yaml
@@ -0,0 +1,20 @@
+# SPDX-FileCopyrightText: 2022-present Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: Apache-2.0
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "rasa-action-server.fullname" . }}
+  labels:
+    app: {{ template "rasa-action-server.fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
+    {{- include "rasa-action-server.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  selector:
+    name: {{ template "rasa-action-server.fullname" . }}
+  ports:
+  - name: models
+    port: 8080
diff --git a/rasa-action-server/values.yaml b/rasa-action-server/values.yaml
new file mode 100644
index 0000000..1e69b7a
--- /dev/null
+++ b/rasa-action-server/values.yaml
@@ -0,0 +1,22 @@
+# SPDX-FileCopyrightText: 2022-present Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: Apache-2.0
+
+nameOverride: ""
+fullnameOverride: "rasa-action-server"
+
+replicaCount: 1
+annotations: {}
+
+image:
+  repository: onosproject/rasa-action-server
+  tag: v0.1.7
+  pullPolicy: IfNotPresent
+  pullSecrets: []
+
+service:
+  type: ClusterIP
+
+smtp:
+  server: mailhog
+  port: 1025
\ No newline at end of file
diff --git a/rasa-model-server/Chart.yaml b/rasa-model-server/Chart.yaml
index 82a1f0c..ddb0732 100644
--- a/rasa-model-server/Chart.yaml
+++ b/rasa-model-server/Chart.yaml
@@ -7,8 +7,8 @@
 description: Rasa Model Server
 kubeVersion: ">=1.15.0"
 type: application
-version: 0.0.4
-appVersion: v0.0.13
+version: 0.1.0
+appVersion: v0.1.7
 keywords:
   - aether
   - exporter
diff --git a/rasa-model-server/values.yaml b/rasa-model-server/values.yaml
index 0b580fb..a68b399 100644
--- a/rasa-model-server/values.yaml
+++ b/rasa-model-server/values.yaml
@@ -10,7 +10,7 @@
 
 image:
   repository: onosproject/rasa-model-server
-  tag: v0.0.13
+  tag: v0.1.7
   pullPolicy: IfNotPresent
   pullSecrets: []