diff --git a/tomcat/Chart.yaml b/tomcat/Chart.yaml
index 16900a7597..db130ce1a0 100644
--- a/tomcat/Chart.yaml
+++ b/tomcat/Chart.yaml
@@ -2,7 +2,7 @@ name: tomcat
 home: http://tomcat.apache.org
 source:
 - https://github.com/bitnami/bitnami-docker-tomcat
-version: 0.1.0
+version: 0.2.0
 description: Chart for Apache Tomcat
 maintainers:
 - Bitnami <containers@bitnami.com>
diff --git a/tomcat/manifests/tomcat-rc.yaml b/tomcat/manifests/tomcat-rc.yaml
index 7bd6ef8a57..7a6ed0a79c 100644
--- a/tomcat/manifests/tomcat-rc.yaml
+++ b/tomcat/manifests/tomcat-rc.yaml
@@ -10,18 +10,20 @@ spec:
   replicas: 1
   selector:
     provider: tomcat
-    version: 7.0.68-0
+    version: 8.0.35-r0
   template:
     metadata:
       labels:
         provider: tomcat
-        version: 7.0.68-0
+        version: 8.0.35-r0
         heritage: bitnami
     spec:
       containers:
       - name: tomcat
-        image: bitnami/tomcat:7.0.68-0
+        image: bitnami/tomcat:8.0.35-r0
         env:
+        - name: TOMCAT_USER
+          value: "user"
         - name: TOMCAT_PASSWORD
           value: ""
         ports:
@@ -40,12 +42,8 @@ spec:
           initialDelaySeconds: 5
           timeoutSeconds: 1
         volumeMounts:
-        - name: webapps
-          mountPath: /app
-        - name: conf
-          mountPath: /bitnami/tomcat/conf
+        - name: data
+          mountPath: /bitnami/tomcat
       volumes:
-      - name: webapps
-        emptyDir: {}
-      - name: conf
+      - name: data
         emptyDir: {}
diff --git a/tomcat/tpl/tomcat-rc.yaml b/tomcat/tpl/tomcat-rc.yaml
index 24bc43fd66..ba272ba4ca 100644
--- a/tomcat/tpl/tomcat-rc.yaml
+++ b/tomcat/tpl/tomcat-rc.yaml
@@ -10,18 +10,20 @@ spec:
   replicas: 1
   selector:
     provider: tomcat
-    version: 7.0.68-0
+    version: 8.0.35-r0
   template:
     metadata:
       labels:
         provider: tomcat
-        version: 7.0.68-0
+        version: 8.0.35-r0
         heritage: bitnami
     spec:
       containers:
       - name: tomcat
-        image: bitnami/tomcat:7.0.68-0
+        image: bitnami/tomcat:8.0.35-r0
         env:
+        - name: TOMCAT_USER
+          value: {{ .tomcatUser | quote }}
         - name: TOMCAT_PASSWORD
           value: {{ .tomcatPassword | quote }}
         ports:
@@ -40,12 +42,8 @@ spec:
           initialDelaySeconds: 5
           timeoutSeconds: 1
         volumeMounts:
-        - name: webapps
-          mountPath: /app
-        - name: conf
-          mountPath: /bitnami/tomcat/conf
+        - name: data
+          mountPath: /bitnami/tomcat
       volumes:
-      - name: webapps
-        emptyDir: {}
-      - name: conf
+      - name: data
         emptyDir: {}
diff --git a/tomcat/tpl/values.toml b/tomcat/tpl/values.toml
index 115c22b521..37e7922bea 100644
--- a/tomcat/tpl/values.toml
+++ b/tomcat/tpl/values.toml
@@ -1 +1,2 @@
+tomcatUser = "user"
 tomcatPassword = ""