diff --git a/charts/incubator/cloudflared/Chart.yaml b/charts/incubator/cloudflared/Chart.yaml
index d21cd879d8c..29bd9279f4b 100644
--- a/charts/incubator/cloudflared/Chart.yaml
+++ b/charts/incubator/cloudflared/Chart.yaml
@@ -20,7 +20,7 @@ name: cloudflared
 sources:
   - https://github.com/truecharts/charts/tree/master/charts/incubator/cloudflared
 type: application
-version: 5.0.1
+version: 5.0.2
 annotations:
   truecharts.org/catagories: |
     - network
diff --git a/charts/incubator/cloudflared/ci/test-values.yaml b/charts/incubator/cloudflared/ci/test-values.yaml
index a910b9773b5..bc009c83e10 100644
--- a/charts/incubator/cloudflared/ci/test-values.yaml
+++ b/charts/incubator/cloudflared/ci/test-values.yaml
@@ -1,4 +1,3 @@
-# With the bellow we test both container starts and that tpl is working inside extraArgs list
 workload:
   main:
     podSpec:
@@ -7,6 +6,4 @@ workload:
           args:
             - tunnel
             - --no-autoupdate
-            - "{{ .Values.testTpl }}"
-
-testTpl: "--hello-world"
+            - --hello-world
diff --git a/charts/incubator/cloudflared/questions.yaml b/charts/incubator/cloudflared/questions.yaml
index cde41102915..9e9cfb9219e 100644
--- a/charts/incubator/cloudflared/questions.yaml
+++ b/charts/incubator/cloudflared/questions.yaml
@@ -8,17 +8,16 @@ questions:
 # Include{replicas1}
 # Include{podSpec}
 # Include{containerMain}
-
-                                - variable: cloudflared
-                                  group: App Configuration
-                                  label: Cloudflared Configuration
+                                - variable: env
+                                  group: "App Configuration"
+                                  label: "Image Environment"
                                   schema:
                                     additional_attrs: true
                                     type: dict
                                     attrs:
-                                      - variable: token
-                                        label: Tunnel Token
-                                        description: Token for tunnel (Tunnel managed by Cloudflare not locally)
+                                      - variable: TUNNEL_TOKEN
+                                        label: "Tunnel Token"
+                                        description: "Token for tunnel (Tunnel managed by Cloudflare not locally)"
                                         schema:
                                           type: string
                                           required: true
diff --git a/charts/incubator/cloudflared/values.yaml b/charts/incubator/cloudflared/values.yaml
index fb7816f0dbd..1d96b95a421 100644
--- a/charts/incubator/cloudflared/values.yaml
+++ b/charts/incubator/cloudflared/values.yaml
@@ -22,8 +22,8 @@ workload:
             - tunnel
             - --no-autoupdate
             - run
-            - --token
-            - "{{ .Values.cloudflared.token }}"
+          env:
+            TUNNEL_TOKEN: ""
 
 service:
   main: