diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md
index 48676ca7..de07f2ca 100644
--- a/charts/argo-cd/README.md
+++ b/charts/argo-cd/README.md
@@ -165,6 +165,9 @@ NAME: my-release
 | configs.secret.createSecret | Create the argocd-secret. | `true` |
 | configs.secret.githubSecret | GitHub incoming webhook secret | `""` |
 | configs.secret.gitlabSecret | GitLab incoming webhook secret | `""` |
+| configs.repositoryCredentials | DEPRECATED: Instead, use configs.credentialTemplates and/or configs.repositories. | `{}` |
+| configs.credentialTemplates | Repository credentials to be used as Templates for other repos. | `{}` |
+| configs.repositories | Repositories list to be used by applications. | `{}` |
 | configs.tlsCertsAnnotations | TLS certificate configmap annotations | `{}` |
 | configs.tlsCerts.data."argocd.example.com" | TLS certificate | See [values.yaml](values.yaml) |
 | configs.secret.extra | add additional secrets to be added to argocd-secret | `{}` |
@@ -295,6 +298,7 @@ NAME: my-release
 | server.clusterAdminAccess.enabled | Enable RBAC for local cluster deployments. | `true` |
 | server.configAnnotations | ArgoCD configuration configmap annotations | `{}` |
 | server.config | [General Argo CD configuration](https://argoproj.github.io/argo-cd/operator-manual/declarative-setup/#repositories) | See [values.yaml](values.yaml) |
+| server.config.repositories | [DEPRECATED: Instead, use configs.credentialTemplates and/or configs.repositories.](https://argo-cd.readthedocs.io/en/latest/operator-manual/declarative-setup/#legacy-behaviour) | See [values.yaml](values.yaml) |
 | server.containerPort | Server container port. | `8080` |
 | server.extraArgs | Additional arguments for the server. A list of flags. | `[]` |
 | server.staticAssets.enabled | Disable deprecated flag --staticassets | `false` |
diff --git a/charts/argo-cd/templates/argocd-configs/repository-credentials-secret.yaml b/charts/argo-cd/templates/argocd-configs/repository-credentials-secret.yaml
index 1c7fd40b..fe21917c 100644
--- a/charts/argo-cd/templates/argocd-configs/repository-credentials-secret.yaml
+++ b/charts/argo-cd/templates/argocd-configs/repository-credentials-secret.yaml
@@ -6,7 +6,7 @@ metadata:
   name: argocd-repo-creds-{{ $repo_cred_key }}
   labels:
     argocd.argoproj.io/secret-type: repo-creds
-    {{- include "argo-cd.labels" (dict "context" $ "component" $.Values.server.name "name" "secret") | nindent 4 }}
+    {{- include "argo-cd.labels" (dict "context" .) | nindent 4 }}
 data:
   {{- range $key, $value := $repo_cred_value }}
   {{ $key }}: {{ $value | toString | b64enc }}
diff --git a/charts/argo-cd/templates/argocd-configs/repository-secret.yaml b/charts/argo-cd/templates/argocd-configs/repository-secret.yaml
index ad5e6ac7..b42eaefc 100644
--- a/charts/argo-cd/templates/argocd-configs/repository-secret.yaml
+++ b/charts/argo-cd/templates/argocd-configs/repository-secret.yaml
@@ -6,7 +6,7 @@ metadata:
   name: argocd-repo-{{ $repo_key }}
   labels:
     argocd.argoproj.io/secret-type: repository
-    {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" "secret") | nindent 4 }}
+    {{- include "argo-cd.labels" (dict "context" .) | nindent 4 }}
 data:
   {{- range $key, $value := $repo_value }}
   {{ $key }}: {{ $value | b64enc }}
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 9fb21215..e05f7b3f 100755
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -99,7 +99,6 @@ controller:
     #     - all
     # readOnlyRootFilesystem: true
     # runAsNonRoot: true
-    # readOnlyRootFilesystem: true
 
   ## Configures the controller port
   containerPort: 8082
@@ -1128,7 +1127,7 @@ configs:
     #   password: my-password
     #   username: my-username
     # private-repo:
-    #  url: https://github.com/argoproj/private-repo
+    #   url: https://github.com/argoproj/private-repo
 
   secret:
     createSecret: true