diff --git a/charts/cloudflared/Chart.yaml b/charts/cloudflared/Chart.yaml
index de8ff86..ac4562d 100644
--- a/charts/cloudflared/Chart.yaml
+++ b/charts/cloudflared/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: cloudflared
-version: 2.1.0
+version: 2.1.1
 description: Cloudflared Tunnel
 keywords:
   - cloudflare
diff --git a/charts/cloudflared/README.md b/charts/cloudflared/README.md
index eda5d02..f966e2a 100644
--- a/charts/cloudflared/README.md
+++ b/charts/cloudflared/README.md
@@ -1,6 +1,6 @@
 # cloudflared
 
-![Version: 2.1.0](https://img.shields.io/badge/Version-2.1.0-informational?style=flat-square) ![AppVersion: 2025.11.1](https://img.shields.io/badge/AppVersion-2025.11.1-informational?style=flat-square)
+![Version: 2.1.1](https://img.shields.io/badge/Version-2.1.1-informational?style=flat-square) ![AppVersion: 2025.11.1](https://img.shields.io/badge/AppVersion-2025.11.1-informational?style=flat-square)
 
 Cloudflared Tunnel
 
@@ -26,7 +26,7 @@ Cloudflared Tunnel
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | image | object | `{"pullPolicy":"IfNotPresent","repository":"cloudflare/cloudflared","tag":"2025.11.1"}` | Default image |
-| name | string | `""` | Name override of release |
+| name | string | `"rgw"` | Name override of release |
 | resources | object | `{"requests":{"cpu":"10m","memory":"128Mi"}}` | Default resources |
 | secret | object | `{"existingSecret":{"key":"cf-tunnel-token","name":"cloudflared-secret"},"externalSecret":{"additionalLabels":{},"enabled":true,"nameOverride":"","store":{"name":"vault","path":"/cloudflare/tunnels","property":"token"}}}` | Secret configuration |
 | secret.existingSecret | object | `{"key":"cf-tunnel-token","name":"cloudflared-secret"}` | Name of existing secret that contains Cloudflare token |
diff --git a/charts/cloudflared/templates/_helpers.tpl b/charts/cloudflared/templates/_helpers.tpl
index b2c570c..5074a87 100644
--- a/charts/cloudflared/templates/_helpers.tpl
+++ b/charts/cloudflared/templates/_helpers.tpl
@@ -3,9 +3,9 @@ Generate the root name
 */}}
 {{- define "cloudflared.name" -}}
   {{- if .Values.name }}
-    {{- printf "%s-%s-cloudflared" .Release.Name .Values.name -}}
+    {{- printf "%s-cloudflared" .Values.name -}}
   {{- else }}
-    {{- printf "%s-cloudflared" .Release.Name -}}
+    {{- printf "cloudflared" -}}
   {{- end }}
 {{- end }}
 
diff --git a/charts/cloudflared/templates/common.yaml b/charts/cloudflared/templates/common.yaml
index 62a72dd..4d7d3cc 100644
--- a/charts/cloudflared/templates/common.yaml
+++ b/charts/cloudflared/templates/common.yaml
@@ -1,11 +1,9 @@
 {{- include "bjw-s.common.loader.init" . }}
 
 {{- define "cloudflared.hardcodedValues" -}}
-{{ if not .Values.global.nameOverride }}
 global:
   nameOverride: {{ include "cloudflared.name" . }}
   fullNameOverride: {{ include "cloudflared.name" . }}
-{{ end }}
 controllers:
   main:
     type: deployment
diff --git a/charts/cloudflared/templates/external-secret.yaml b/charts/cloudflared/templates/external-secret.yaml
index c7fe0be..7765a72 100644
--- a/charts/cloudflared/templates/external-secret.yaml
+++ b/charts/cloudflared/templates/external-secret.yaml
@@ -3,7 +3,7 @@
 apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
-  name: {{ include "secret.name" . }}
+  name: {{ .Release.Name }}-{{ include "secret.name" . }}
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "secret.labels" . | nindent 4 }}
diff --git a/charts/cloudflared/values.yaml b/charts/cloudflared/values.yaml
index ca25e6e..e81960c 100644
--- a/charts/cloudflared/values.yaml
+++ b/charts/cloudflared/values.yaml
@@ -1,5 +1,5 @@
 # -- Name override of release
-name: ""
+name: "rgw"
 
 # -- Secret configuration
 secret: