diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index a3a109d8..3c5c02b2 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.3.0"
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 1.2.3
+version: 1.3.1
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png
 keywords:
diff --git a/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml b/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
index 6d4c3901..ba9e6627 100644
--- a/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
+++ b/charts/argo-cd/templates/argocd-configs/argocd-secret.yaml
@@ -11,17 +11,31 @@ metadata:
     app.kubernetes.io/part-of: argocd
     app.kubernetes.io/component: {{ .Values.server.name }}
 type: Opaque
-{{- if or .Values.configs.secret.githubSecret (or .Values.configs.secret.gitlabSecret .Values.configs.secret.bitbucketSecret) }}
+{{- if or .Values.configs.secret.githubSecret (or .Values.configs.secret.gitlabSecret .Values.configs.secret.bitbucketUUID .Values.configs.secret.bitbucketServerSecret .Values.configs.secret.gogsSecret .Values.configs.secret.argocdServerAdminPassword .Values.configs.secret.argocdServerTlsConfig) }}
 # Setting a blank data again will wipe admin password/key/cert
 data:
   {{- if .Values.configs.secret.githubSecret }}
-  github.webhook.secret: {{ .Values.configs.secret.githubSecret | b64enc }}
+  webhook.github.secret: {{ .Values.configs.secret.githubSecret | b64enc }}
   {{- end }}
   {{- if .Values.configs.secret.gitlabSecret }}
-  gitlab.webhook.secret: {{ .Values.configs.secret.gitlabSecret | b64enc }}
+  webhook.gitlab.secret: {{ .Values.configs.secret.gitlabSecret | b64enc }}
   {{- end }}
-  {{- if .Values.configs.secret.bitbucketSecret }}
-  bitbucket.webhook.uuid: {{ .Values.configs.secret.bitbucketSecret | b64enc }}
+  {{- if .Values.configs.secret.bitbucketServerSecret }}
+  webhook.bitbucketserver.secret: {{ .Values.configs.secret.bitbucketServerSecret | b64enc }}
+  {{- end }}
+  {{- if .Values.configs.secret.bitbucketUUID }}
+  webhook.bitbucket.uuid: {{ .Values.configs.secret.bitbucketUUID | b64enc }}
+  {{- end }}
+  {{- if .Values.configs.secret.gogsSecret }}
+  webhook.gogs.secret: {{ .Values.configs.secret.gogsSecret | b64enc }}
+  {{- end }}
+  {{- if .Values.configs.secret.argocdServerTlsConfig }}
+  tls.key: {{ .Values.configs.secret.argocdServerTlsConfig.key | b64enc }}
+  tls.crt: {{ .Values.configs.secret.argocdServerTlsConfig.crt | b64enc }}
+  {{- end }}
+  {{- if .Values.configs.secret.argocdServerAdminPassword }}
+  admin.password: {{ .Values.configs.secret.argocdServerAdminPassword | b64enc }}
+  admin.passwordMtime: {{ date "2006-01-02T15:04:05Z" now | b64enc }}
   {{- end }}
 {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index dfd95c9b..5af2ad69 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -605,6 +605,25 @@ configs:
     # -----END RSA PRIVATE KEY-----
   secret:
     createSecret: true
+
+    # Webhook Configs
     githubSecret: ""
     gitlabSecret: ""
-    bitbucketSecret: ""
+    bitbucketServerSecret: ""
+    bitbucketUUÌD: ""
+    gogsSecret: ""
+
+# Argo TLS Data.
+  argocdServerTlsConfig: {}
+    # key:
+    # crt: |
+    #   -----BEGIN CERTIFICATE-----
+    #   <cert data>
+    #   -----END CERTIFICATE-----
+    #   -----BEGIN CERTIFICATE-----
+    #   <ca cert data>
+    #   -----END CERTIFICATE-----
+
+  # Argo expects the password in the secret to be bcrypt hashed. You can create this hash with
+  # `htpasswd -nbBC 10 "" $ARGO_PWD | tr -d ':\n' | sed 's/$2y/$2a/'`
+  # argocdServerAdminPassword: