diff --git a/docs/help.rst b/docs/help.rst
index 2afea74e1..f068fcaf9 100644
--- a/docs/help.rst
+++ b/docs/help.rst
@@ -247,3 +247,29 @@ Alert Manager is not working
                             resources:
                               requests:
                                 storage: 10Gi
+
+
+CRD issues
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. details:: CustomResourceDefinition.apiextensions.k8s.io "prometheuses.monitoring.coreos.com" is invalid: metadata.annotations: Too long
+
+      This is often a CRD issue which can be fixed by enabling server-side apply option as shown below. Check out `this blog <https://blog.ediri.io/kube-prometheus-stack-and-argocd-25-server-side-apply-to-the-rescue>`_ to learn more. 
+
+      .. image:: /images/Argocd_crd_issue_fix.png 
+      :width: 400
+      :align: center
+
+.. details:: one or more objects failed to apply... CustomResourceDefinition.apiextensions.k8s.io "prometheusagents.monitoring.coreos.com" is invalid
+
+      This indicates potential discrepancies between the version of Prometheus you are trying to use and the version of the CRDs in your cluster.
+
+      Follow this guide for :ref:`upgrading CRDs from an older version <Manual Upgrade>`.
+
+.. details:: CustomResourceDefinition.apiextensions.k8s.io "prometheuses.monitoring.coreos.com" is invalid
+
+
+      This indicates potential discrepancies between the version of Prometheus you are trying to use and the version of the CRDs in your cluster.
+
+      Follow this guide for :ref:`upgrading CRDs from an older version <Manual Upgrade>`.
+
diff --git a/docs/images/Argocd_crd_issue_fix.png b/docs/images/Argocd_crd_issue_fix.png
new file mode 100644
index 000000000..7d8cf50bf
Binary files /dev/null and b/docs/images/Argocd_crd_issue_fix.png differ
diff --git a/docs/setup-robusta/gitops/argocd.rst b/docs/setup-robusta/gitops/argocd.rst
index 99ee79d63..3b69bc273 100644
--- a/docs/setup-robusta/gitops/argocd.rst
+++ b/docs/setup-robusta/gitops/argocd.rst
@@ -120,8 +120,9 @@ Finally, run ``robusta logs`` from your cli and make sure there is no error.
 
     On some Robusta versions, the sync might fail with ``CustomResourceDefinition.apiextensions.k8s.io “prometheuses.monitoring.coreos.com” is invalid: metadata.annotations: Too long: must have at most 262144 bytes``.
 
-    To solve it, use the workaround proposed `here <https://github.com/prometheus-community/helm-charts/issues/1500#issuecomment-1132907207>`_
+    To solve it, use the workaround proposed `here <https://blog.ediri.io/kube-prometheus-stack-and-argocd-25-server-side-apply-to-the-rescue>`_.
 
+    
 Configure ArgoCD Declaratively
 --------------------------------
 
diff --git a/docs/setup-robusta/upgrade.rst b/docs/setup-robusta/upgrade.rst
index ecc558314..d9d6a40e3 100644
--- a/docs/setup-robusta/upgrade.rst
+++ b/docs/setup-robusta/upgrade.rst
@@ -87,7 +87,7 @@ Manual upgrade instructions
     kubectl replace -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.70.0/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
     kubectl replace -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.70.0/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
 
-3. If you're upgrading from Robusta v0.10.27 or below and using thanos please check if you need to adapt your config according to the `kube-prometheus-stack upgrade docs <https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/README.md#from-51x-to-52x>`. 
+3. If you're upgrading from Robusta v0.10.27 or below and using thanos please check if you need to adapt your config according to the `kube-prometheus-stack upgrade docs <https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/README.md#from-51x-to-52x>`_. 
 
 4. Update Robusta with Helm. If you've lost ``generated_values.yaml``, you can :ref:`extract it from the cluster.<where-is-generated-values>`