diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md
index 12ad3284..d70c3529 100644
--- a/charts/argo-cd/README.md
+++ b/charts/argo-cd/README.md
@@ -115,6 +115,15 @@ This version **removes support for**:
 * deprecated configuration `server.rbacConfig` that was replaced with `configs.rbac`
 
 Please upgrade with replace strategy due to removal of immutable fields in StatefulSet.
+ 
+  1) Use Helm uninstall / install 6.0.0
+  2) Use `helm template argocd/argo-cd | kubectl replace -f`
+
+Major version also contains **changes related to Argo CD Ingress** resources that are were hard to extend and maintain due to support of multiple ingress controllers.
+
+* catch all rule was removed for security reasons. If you need this please use `server.ingress.extraRules` to provide rule without hostname
+* ingress rule for `paths` changed to `path` as there is single Argo CD backend
+* ingress rule for `hosts` changed to `hostname` as there can be only single SSO redirect for given domain
 
 ### 5.53.0
 
@@ -756,7 +765,7 @@ NAME: my-release
 | server.imagePullSecrets | list | `[]` (defaults to global.imagePullSecrets) | Secrets with credentials to pull images from a private registry |
 | server.ingress.annotations | object | `{}` | Additional ingress annotations |
 | server.ingress.enabled | bool | `false` | Enable an ingress resource for the Argo CD server |
-| server.ingress.extraPaths | list | `[]` | Additional ingress paths |
+| server.ingress.extraPaths | list | `[]` (See [values.yaml]) | Additional ingress paths |
 | server.ingress.extraRules | list | `[]` (See [values.yaml]) | Additional ingress rules |
 | server.ingress.hosts | list | `[]` | List of ingress hosts |
 | server.ingress.https | bool | `false` | Uses `server.service.servicePortHttps` instead `server.service.servicePortHttp` |
@@ -769,7 +778,7 @@ NAME: my-release
 | server.ingressGrpc.awsALB.backendProtocolVersion | string | `"HTTP2"` | Backend protocol version for the AWS ALB gRPC service |
 | server.ingressGrpc.awsALB.serviceType | string | `"NodePort"` | Service type for the AWS ALB gRPC service |
 | server.ingressGrpc.enabled | bool | `false` | Enable an ingress resource for the Argo CD server for dedicated [gRPC-ingress] |
-| server.ingressGrpc.extraPaths | list | `[]` | Additional ingress paths for dedicated [gRPC-ingress] |
+| server.ingressGrpc.extraPaths | list | `[]` (See [values.yaml]) | Additional ingress paths for dedicated [gRPC-ingress] |
 | server.ingressGrpc.extraRules | list | `[]` (See [values.yaml]) | Additional ingress rules |
 | server.ingressGrpc.hosts | list | `[]` | List of ingress hosts for dedicated [gRPC-ingress] |
 | server.ingressGrpc.https | bool | `false` | Uses `server.service.servicePortHttps` instead `server.service.servicePortHttp` |
@@ -1180,7 +1189,7 @@ If you want to use an existing Redis (eg. a managed service from a cloud provide
 | applicationSet.topologySpreadConstraints | list | `[]` (defaults to global.topologySpreadConstraints) | Assign custom [TopologySpreadConstraints] rules to the ApplicationSet controller |
 | applicationSet.webhook.ingress.annotations | object | `{}` | Additional ingress annotations |
 | applicationSet.webhook.ingress.enabled | bool | `false` | Enable an ingress resource for Webhooks |
-| applicationSet.webhook.ingress.extraPaths | list | `[]` | Additional ingress paths |
+| applicationSet.webhook.ingress.extraPaths | list | `[]` (See [values.yaml]) | Additional ingress paths |
 | applicationSet.webhook.ingress.extraRules | list | `[]` (See [values.yaml]) | Additional ingress rules |
 | applicationSet.webhook.ingress.hosts | list | `[]` | List of ingress hosts |
 | applicationSet.webhook.ingress.ingressClassName | string | `""` | Defines which ingress ApplicationSet controller will implement the resource |
diff --git a/charts/argo-cd/README.md.gotmpl b/charts/argo-cd/README.md.gotmpl
index fa5322c7..59640f77 100644
--- a/charts/argo-cd/README.md.gotmpl
+++ b/charts/argo-cd/README.md.gotmpl
@@ -114,6 +114,15 @@ This version **removes support for**:
 * deprecated configuration `server.rbacConfig` that was replaced with `configs.rbac`
 
 Please upgrade with replace strategy due to removal of immutable fields in StatefulSet.
+  
+  1) Use Helm uninstall / install 6.0.0
+  2) Use `helm template argocd/argo-cd | kubectl replace -f`
+
+Major version also contains **changes related to Argo CD Ingress** resources that are were hard to extend and maintain due to support of multiple ingress controllers.
+
+* catch all rule was removed for security reasons. If you need this please use `server.ingress.extraRules` to provide rule without hostname
+* ingress rule for `paths` changed to `path` as there is single Argo CD backend
+* ingress rule for `hosts` changed to `hostname` as there can be only single SSO redirect for given domain 
 
 ### 5.53.0
 
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index cee82f32..cad4f8d9 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -1903,10 +1903,14 @@ server:
   ingress:
     # -- Enable an ingress resource for the Argo CD server
     enabled: false
-    # -- Additional ingress annotations
-    annotations: {}
     # -- Additional ingress labels
     labels: {}
+    # -- Additional ingress annotations
+    ## Ref: https://argo-cd.readthedocs.io/en/stable/operator-manual/ingress/#option-1-ssl-passthrough
+    annotations: {}
+      # nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+      # nginx.ingress.kubernetes.io/ssl-passthrough: "true"
+
     # -- Defines which ingress controller will implement the resource
     ingressClassName: ""
 
@@ -1924,6 +1928,7 @@ server:
     pathType: Prefix
 
     # -- Additional ingress paths
+    # @default -- `[]` (See [values.yaml])
     extraPaths: []
       # - path: /*
       #   pathType: Prefix
@@ -1991,9 +1996,12 @@ server:
     # -- List of ingress paths for dedicated [gRPC-ingress]
     paths:
       - /
+
     # -- Ingress path type for dedicated [gRPC-ingress]. One of `Exact`, `Prefix` or `ImplementationSpecific`
     pathType: Prefix
+
     # -- Additional ingress paths for dedicated [gRPC-ingress]
+    # @default -- `[]` (See [values.yaml])
     extraPaths: []
       # - path: /*
       #   pathType: Prefix
@@ -2702,10 +2710,11 @@ applicationSet:
     ingress:
       # -- Enable an ingress resource for Webhooks
       enabled: false
-      # -- Additional ingress annotations
-      annotations: {}
       # -- Additional ingress labels
       labels: {}
+      # -- Additional ingress annotations
+      annotations: {}
+
       # -- Defines which ingress ApplicationSet controller will implement the resource
       ingressClassName: ""
 
@@ -2718,9 +2727,12 @@ applicationSet:
       # -- List of ingress paths
       paths:
         - /api/webhook
+
       # -- Ingress path type. One of `Exact`, `Prefix` or `ImplementationSpecific`
       pathType: Prefix
+
       # -- Additional ingress paths
+      # @default -- `[]` (See [values.yaml])
       extraPaths: []
         # - path: /*
         #   pathType: Prefix