diff --git a/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml b/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
index 6d4c3901..47a6243b 100644
--- a/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
+++ b/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
@@ -23,5 +23,15 @@ data:
   {{- if .Values.configs.secret.bitbucketSecret }}
   bitbucket.webhook.uuid: {{ .Values.configs.secret.bitbucketSecret | b64enc }}
   {{- end }}
+
+  {{- if and .Values.configs.secret.argocdServerTlsConfig.key (.Values.configs.secret.argocdServerTlsConfig.cert) }}
+  tls.key: {{ .Values.configs.secret.argocdServerTlsConfig.key | b64enc }}
+  tls.cert: {{ .Values.configs.secret.argocdServerTlsConfig.cert | b64enc }}
+  {{- end }}
+  
+  {{- if .Values.configs.secret.argocdServerAdminPassword }}
+  admin.password: {{ .Values.configs.secret.argocdServerAdminPassword | b64enc }}
+  {{- end }}
+
+{{- end }}
 {{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 9cd31ba3..7fecb9fe 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -524,3 +524,8 @@ configs:
     githubSecret: ""
     gitlabSecret: ""
     bitbucketSecret: ""
+#   argocdServerTlsConfig:
+#     key: 
+#     cert: 
+#   argocdServerAdminPassword: 
+