diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md
index cebd0923..fc520725 100644
--- a/charts/argo-cd/README.md
+++ b/charts/argo-cd/README.md
@@ -224,6 +224,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
 | server.ingressGrpc.tls | Ingress TLS configuration for dedicated [gRPC-ingress] | `[]` |
 | server.route.enabled | Enable a OpenShift route for the server | `false` |
 | server.route.hostname | Hostname of OpenShift route | `""` |
+| server.lifecycle | PostStart and PreStop hooks configuration | `{}` |
 | server.livenessProbe.failureThreshold | [Kubernetes probe configuration](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes) | `3` |
 | server.livenessProbe.initialDelaySeconds | [Kubernetes probe configuration](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes) | `10` |
 | server.livenessProbe.periodSeconds | [Kubernetes probe configuration](https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes) | `10` |
diff --git a/charts/argo-cd/templates/argocd-server/deployment.yaml b/charts/argo-cd/templates/argocd-server/deployment.yaml
index aeec1579..097975a1 100755
--- a/charts/argo-cd/templates/argocd-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-server/deployment.yaml
@@ -120,6 +120,10 @@ spec:
           failureThreshold: {{ .Values.server.readinessProbe.failureThreshold }}
         resources:
 {{- toYaml .Values.server.resources | nindent 10 }}
+{{- if .Values.server.lifecycle }}
+        lifecycle:
+{{- toYaml .Values.server.lifecycle | nindent 10 }}
+{{- end }}
     {{- if .Values.server.extraContainers }}
 {{- toYaml .Values.server.extraContainers | nindent 6 }}
     {{- end }}
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 5331d96b..e9a2face 100755
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -366,6 +366,9 @@ server:
   ##
   env: []
 
+  ## Specify postStart and preStop lifecycle hooks for your argo-cd-server container
+  lifecycle: {}
+
   ## Argo server log format: text|json
   logFormat: text
   ## Argo server log level