diff --git a/wildfly/Chart.yaml b/wildfly/Chart.yaml
index 8dc9fb9f7d..768e49adca 100644
--- a/wildfly/Chart.yaml
+++ b/wildfly/Chart.yaml
@@ -2,7 +2,7 @@ name: wildfly
 home: http://wildfly.org
 source:
 - https://github.com/bitnami/bitnami-docker-wildfly
-version: 0.1.0
+version: 0.2.0
 description: Chart for Wildfly
 maintainers:
 - Bitnami <containers@bitnami.com>
diff --git a/wildfly/manifests/wildfly-rc.yaml b/wildfly/manifests/wildfly-rc.yaml
index fd802410b2..27837a9f98 100644
--- a/wildfly/manifests/wildfly-rc.yaml
+++ b/wildfly/manifests/wildfly-rc.yaml
@@ -10,20 +10,22 @@ spec:
   replicas: 1
   selector:
     provider: wildfly
-    version: 10.0.0-0
+    version: 10.0.0-r0
   template:
     metadata:
       labels:
         provider: wildfly
-        version: 10.0.0-0
+        version: 10.0.0-r0
         heritage: bitnami
     spec:
       containers:
       - name: wildfly
-        image: bitnami/wildfly:10.0.0-0
+        image: bitnami/wildfly:10.0.0-r0
         env:
+        - name: WILDFLY_USER
+          value: "user"
         - name: WILDFLY_PASSWORD
-          value: "wildfly"
+          value: "password"
         ports:
         - name: http
           containerPort: 8080
@@ -43,11 +45,7 @@ spec:
           timeoutSeconds: 1
         volumeMounts:
         - name: data
-          mountPath: /bitnami/wildfly/data
-        - name: conf
-          mountPath: /bitnami/wildfly/conf
+          mountPath: /bitnami/wildfly
       volumes:
       - name: data
         emptyDir: {}
-      - name: conf
-        emptyDir: {}
diff --git a/wildfly/tpl/values.toml b/wildfly/tpl/values.toml
index 96d7f184cf..0a819f4bce 100644
--- a/wildfly/tpl/values.toml
+++ b/wildfly/tpl/values.toml
@@ -1 +1,2 @@
-wildflyPassword = "wildfly"
+wildflyUser = "user"
+wildflyPassword = "password"
diff --git a/wildfly/tpl/wildfly-rc.yaml b/wildfly/tpl/wildfly-rc.yaml
index 95bbf77cd9..12c324e1e5 100644
--- a/wildfly/tpl/wildfly-rc.yaml
+++ b/wildfly/tpl/wildfly-rc.yaml
@@ -10,18 +10,20 @@ spec:
   replicas: 1
   selector:
     provider: wildfly
-    version: 10.0.0-0
+    version: 10.0.0-r0
   template:
     metadata:
       labels:
         provider: wildfly
-        version: 10.0.0-0
+        version: 10.0.0-r0
         heritage: bitnami
     spec:
       containers:
       - name: wildfly
-        image: bitnami/wildfly:10.0.0-0
+        image: bitnami/wildfly:10.0.0-r0
         env:
+        - name: WILDFLY_USER
+          value: {{ .wildflyUser | quote }}
         - name: WILDFLY_PASSWORD
           value: {{ .wildflyPassword | quote }}
         ports:
@@ -43,11 +45,7 @@ spec:
           timeoutSeconds: 1
         volumeMounts:
         - name: data
-          mountPath: /bitnami/wildfly/data
-        - name: conf
-          mountPath: /bitnami/wildfly/conf
+          mountPath: /bitnami/wildfly
       volumes:
       - name: data
         emptyDir: {}
-      - name: conf
-        emptyDir: {}