diff --git a/chart/drupal-operations/templates/clear-cache.yaml b/chart/drupal-operations/templates/clear-cache.yaml
index 05ab110017ec19d68ad29feed723eb3e0fcb4fbe..32acc84ee5454a690a9c18036bd3c0a6ce5a5d4b 100644
--- a/chart/drupal-operations/templates/clear-cache.yaml
+++ b/chart/drupal-operations/templates/clear-cache.yaml
@@ -2,8 +2,10 @@ apiVersion: tekton.dev/v1beta1
 kind: ClusterTask
 metadata:
   name: clear-cache
-  annotations:
+  labels:
     app: drupal
+  annotations:
+    argocd.argoproj.io/compare-options: IgnoreExtraneous
 spec:
   params:
     - name: drupalSite
diff --git a/chart/drupal-operations/templates/database-restore.yaml b/chart/drupal-operations/templates/database-restore.yaml
index 3fdf7ebd986836a029a8c99f1e78aba1d5010e25..3e9f4ed71e67572b85d7ab94af65a03053506af2 100644
--- a/chart/drupal-operations/templates/database-restore.yaml
+++ b/chart/drupal-operations/templates/database-restore.yaml
@@ -2,8 +2,10 @@ apiVersion: tekton.dev/v1beta1
 kind: ClusterTask
 metadata:
   name: database-restore
-  annotations:
+  labels:
     app: drupal
+  annotations:
+    argocd.argoproj.io/compare-options: IgnoreExtraneous
 spec:
   params:
     - name: drupalSite
diff --git a/chart/drupal-operations/templates/drupalsite-backup.yaml b/chart/drupal-operations/templates/drupalsite-backup.yaml
index 27e9b414a0dd611541441453987b9218fb5b43d5..964d32a393cc3b6f4534201e493123bbb2a00842 100644
--- a/chart/drupal-operations/templates/drupalsite-backup.yaml
+++ b/chart/drupal-operations/templates/drupalsite-backup.yaml
@@ -2,8 +2,10 @@ apiVersion: tekton.dev/v1beta1
 kind: ClusterTask
 metadata:
   name: drupalsite-backup
-  annotations:
+  labels:
     app: drupal
+  annotations:
+    argocd.argoproj.io/compare-options: IgnoreExtraneous
 spec:
   params:
     - name: drupalSite
diff --git a/chart/drupal-operations/templates/drupalsite-restore.yaml b/chart/drupal-operations/templates/drupalsite-restore.yaml
index e7d3de33f6a9833e122f705c9346d11f3b035fb1..8fe740f64584a7f507cb508f76f1455d0b1c27ef 100644
--- a/chart/drupal-operations/templates/drupalsite-restore.yaml
+++ b/chart/drupal-operations/templates/drupalsite-restore.yaml
@@ -2,8 +2,10 @@ apiVersion: tekton.dev/v1beta1
 kind: ClusterTask
 metadata:
   name: drupalsite-restore
-  annotations:
+  labels:
     app: drupal
+  annotations:
+    argocd.argoproj.io/compare-options: IgnoreExtraneous
 spec:
   params:
     - name: drupalSite
diff --git a/examples/clear-cache-taskrun.yaml b/examples/clear-cache-taskrun.yaml
index b8c8e30e9c108b4fdf1eb9ae450d05b2e909fd92..dd0257c273c9c6321de61e7424233ace15fdcb91 100644
--- a/examples/clear-cache-taskrun.yaml
+++ b/examples/clear-cache-taskrun.yaml
@@ -2,13 +2,6 @@ apiVersion: tekton.dev/v1beta1
 kind: TaskRun
 metadata:
   generateName: clear-cache-
-  ownerReferences:
-    - apiVersion: tekton.dev/v1beta1
-      blockOwnerDeletion: true
-      controller: true
-      kind: Pipeline
-      name: build-test
-      uid: my-uid
 spec:
   taskRef:
     name: clear-cache
diff --git a/examples/database-restore-taskrun.yaml b/examples/database-restore-taskrun.yaml
index 08af4baf62ee06429ba6413e0111a5270ba14960..80accf0289f88fd69888b5f0ee8792f9fd4bae72 100644
--- a/examples/database-restore-taskrun.yaml
+++ b/examples/database-restore-taskrun.yaml
@@ -2,13 +2,6 @@ apiVersion: tekton.dev/v1beta1
 kind: TaskRun
 metadata:
   generateName: database-restore-
-  ownerReferences:
-    - apiVersion: tekton.dev/v1beta1
-      blockOwnerDeletion: true
-      controller: true
-      kind: Pipeline
-      name: build-test
-      uid: my-uid
 spec:
   taskRef:
     name: database-restore
diff --git a/examples/drupalsite-backup-taskrun.yaml b/examples/drupalsite-backup-taskrun.yaml
index 904ee1f9f119d5982feeec4928e826e7e8df221d..67745ab6334592c51c2fe7562e192b62ea661904 100644
--- a/examples/drupalsite-backup-taskrun.yaml
+++ b/examples/drupalsite-backup-taskrun.yaml
@@ -2,13 +2,6 @@ apiVersion: tekton.dev/v1beta1
 kind: TaskRun
 metadata:
   generateName: drupalsite-backup-
-  ownerReferences:
-    - apiVersion: tekton.dev/v1beta1
-      blockOwnerDeletion: true
-      controller: true
-      kind: ClusterTask
-      name: build-test
-      uid: my-uid
 spec:
   taskRef:
     name: drupalsite-backup
diff --git a/examples/drupalsite-restore-taskrun.yaml b/examples/drupalsite-restore-taskrun.yaml
index bafc0266abde53b3313c89568dbd5e28347269c9..a26a6ed325cdc08f149cca9ec2c43ebf4b72d7e1 100644
--- a/examples/drupalsite-restore-taskrun.yaml
+++ b/examples/drupalsite-restore-taskrun.yaml
@@ -2,13 +2,6 @@ apiVersion: tekton.dev/v1beta1
 kind: TaskRun
 metadata:
   generateName: drupalsite-restore-
-  ownerReferences:
-    - apiVersion: tekton.dev/v1beta1
-      blockOwnerDeletion: true
-      controller: true
-      kind: ClusterTask
-      name: build-test
-      uid: my-uid
 spec:
   taskRef:
     name: drupalsite-restore