diff --git a/pkg/cluster/util.go b/pkg/cluster/util.go
index d3190a56d..34e0e9029 100644
--- a/pkg/cluster/util.go
+++ b/pkg/cluster/util.go
@@ -257,9 +257,7 @@ func (c *Cluster) credentialSecretName(username string) string {
 	// and must start and end with an alphanumeric character
 	return fmt.Sprintf(constants.UserSecretTemplate,
 		strings.Replace(username, "_", "-", -1),
-		c.Metadata.Name,
-		constants.TPRName,
-		constants.TPRVendor)
+		c.Metadata.Name)
 }
 
 func (c *Cluster) deleteEtcdKey() error {
diff --git a/pkg/util/constants/constants.go b/pkg/util/constants/constants.go
index a110f2080..f9de7d98b 100644
--- a/pkg/util/constants/constants.go
+++ b/pkg/util/constants/constants.go
@@ -12,7 +12,7 @@ const (
 	K8sApiPath                = "/api"
 	DataVolumeName            = "pgdata"
 	PasswordLength            = 64
-	UserSecretTemplate        = "%s.%s.credentials.%s.%s" // Username, ClusterName, TPRName, TPRVendor
+	UserSecretTemplate        = "%s.%s.credentials." + TPRName + "." + TPRVendor // Username, ClusterName
 	ZalandoDnsNameAnnotation  = "external-dns.alpha.kubernetes.io/hostname"
 	ElbTimeoutAnnotationName  = "service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout"
 	ElbTimeoutAnnotationValue = "3600"