diff --git a/core/installer/values-tmpl/gerrit.cue b/core/installer/values-tmpl/gerrit.cue
index 36be36d..a18cc10 100644
--- a/core/installer/values-tmpl/gerrit.cue
+++ b/core/installer/values-tmpl/gerrit.cue
@@ -112,7 +112,7 @@
 		chart: charts.oauth2Client
 		info: "Creating OAuth2 client"
 		values: {
-			name: "gerrit-oauth2-client"
+			name: "\(release.namespace)-gerrit"
 			secretName: _oauth2ClientCredentials
 			grantTypes: ["authorization_code"]
 			scope: "openid profile email"
diff --git a/core/installer/values-tmpl/headscale.cue b/core/installer/values-tmpl/headscale.cue
index ec06383..18b0d6e 100644
--- a/core/installer/values-tmpl/headscale.cue
+++ b/core/installer/values-tmpl/headscale.cue
@@ -49,7 +49,7 @@
 			namespace: "\(global.namespacePrefix)core-auth"
 		}]
 		values: {
-			name: "oauth2-client"
+			name: "\(release.namespace)-headscale"
 			secretName: _oauth2ClientSecretName
 			grantTypes: ["authorization_code"]
 			responseTypes: ["code"]
diff --git a/core/installer/values-tmpl/jenkins.cue b/core/installer/values-tmpl/jenkins.cue
index 40f2085..0202f4e 100644
--- a/core/installer/values-tmpl/jenkins.cue
+++ b/core/installer/values-tmpl/jenkins.cue
@@ -61,7 +61,7 @@
 		chart: charts.oauth2Client
 		info: "Creating OAuth2 client"
 		values: {
-			name: "oauth2-client"
+			name: "\(release.namespace)-jenkins"
 			secretName: _oauth2ClientCredentials
 			grantTypes: ["authorization_code"]
 			scope: "openid profile email offline offline_access"
diff --git a/core/installer/values-tmpl/matrix.cue b/core/installer/values-tmpl/matrix.cue
index ba2627d..348d190 100644
--- a/core/installer/values-tmpl/matrix.cue
+++ b/core/installer/values-tmpl/matrix.cue
@@ -54,7 +54,7 @@
 		chart: charts.oauth2Client
 		info: "Creating OAuth2 client"
 		values: {
-			name: "oauth2-client"
+			name: "\(release.namespace)-matrix"
 			secretName: _oauth2ClientSecretName
 			grantTypes: ["authorization_code"]
 			responseTypes: ["code"]
diff --git a/core/installer/values-tmpl/penpot.cue b/core/installer/values-tmpl/penpot.cue
index 961cd30..cad8227 100644
--- a/core/installer/values-tmpl/penpot.cue
+++ b/core/installer/values-tmpl/penpot.cue
@@ -66,7 +66,7 @@
 	"oauth2-client": {
 		chart: charts.oauth2Client
 		values: {
-			name: "penpot"
+			name: "\(release.namespace)-penpot"
 			secretName: _oauth2SecretName
 			grantTypes: ["authorization_code"]
 			responseTypes: ["code"]