diff --git a/charts/openstack-cluster/templates/control-plane/machine-health-check.yaml b/charts/openstack-cluster/templates/control-plane/machine-health-check.yaml
index c21d769..0392218 100644
--- a/charts/openstack-cluster/templates/control-plane/machine-health-check.yaml
+++ b/charts/openstack-cluster/templates/control-plane/machine-health-check.yaml
@@ -6,8 +6,8 @@ metadata:
   name: {{ include "openstack-cluster.componentName" (list . "control-plane") }}
   labels: {{ include "openstack-cluster.componentLabels" (list . "control-plane") | nindent 4 }}
   annotations:
-    # Argo should manage this resource even though it has an owner ref for the cluster
-    argocd.argoproj.io/managed-resource: "true"
+    # Tell Argo to ignore the non-controller owner references for this object
+    argocd.argoproj.io/sync-options: "ControllerReferencesOnly=true"
 spec:
   clusterName: {{ include "openstack-cluster.clusterName" . }}
   selector:
diff --git a/charts/openstack-cluster/templates/node-group/machine-deployment.yaml b/charts/openstack-cluster/templates/node-group/machine-deployment.yaml
index 818dc01..7885b34 100644
--- a/charts/openstack-cluster/templates/node-group/machine-deployment.yaml
+++ b/charts/openstack-cluster/templates/node-group/machine-deployment.yaml
@@ -9,8 +9,8 @@ metadata:
     {{- include "openstack-cluster.componentLabels" (list $ "worker") | nindent 4 }}
     {{ $.Values.projectPrefix }}/node-group: {{ $nodeGroup.name }}
   annotations:
-    # Argo should manage this resource even though it has an owner ref for the cluster
-    argocd.argoproj.io/managed-resource: "true"
+    # Tell Argo to ignore the non-controller owner references for this object
+    argocd.argoproj.io/sync-options: "ControllerReferencesOnly=true"
     {{- if $nodeGroup.autoscale }}
     {{-
       $machineCountMin := $nodeGroup.machineCountMin |
diff --git a/charts/openstack-cluster/templates/node-group/machine-health-check.yaml b/charts/openstack-cluster/templates/node-group/machine-health-check.yaml
index 5bee2d2..ea02698 100644
--- a/charts/openstack-cluster/templates/node-group/machine-health-check.yaml
+++ b/charts/openstack-cluster/templates/node-group/machine-health-check.yaml
@@ -10,8 +10,8 @@ metadata:
     {{- include "openstack-cluster.componentLabels" (list $ "worker") | nindent 4 }}
     {{ $.Values.projectPrefix }}/node-group: {{ $nodeGroup.name }}
   annotations:
-    # Argo should manage this resource even though it has an owner ref for the cluster
-    argocd.argoproj.io/managed-resource: "true"
+    # Tell Argo to ignore the non-controller owner references for this object
+    argocd.argoproj.io/sync-options: "ControllerReferencesOnly=true"
 spec:
   clusterName: {{ include "openstack-cluster.clusterName" $ }}
   selector: