diff --git a/playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/tasks/main.yml b/playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/tasks/main.yml
index e1f92bb4e..ff11feff0 100644
--- a/playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/tasks/main.yml
+++ b/playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/tasks/main.yml
@@ -83,7 +83,7 @@
 - name: Install trident services
   command: tridentctl -n {{ trident_namespace }} install --use-custom-yaml {{ trident_install_extra_params }}
   args:
-    chdir: "{{ trident_setup_dir }}/setup"
+    chdir: "{{ trident_setup_dir }}"
   environment:
     KUBECONFIG: "/etc/kubernetes/admin.conf"
   when: (tridentctl_rest_response.rc is defined and
diff --git a/playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/templates/trident-daemonset.yaml.j2 b/playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/templates/trident-daemonset.yaml.j2
index 585f3bb66..202e9069c 100644
--- a/playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/templates/trident-daemonset.yaml.j2
+++ b/playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/templates/trident-daemonset.yaml.j2
@@ -14,6 +14,8 @@ spec:
     metadata:
       labels:
         app: node.csi.trident.netapp.io
+        # STX_change: add label component
+        app.starlingx.io/component: platform
     spec:
       serviceAccount: trident-node-linux
       hostNetwork: true
diff --git a/playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/templates/trident-deployment.yaml.j2 b/playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/templates/trident-deployment.yaml.j2
index 28ff572ae..921f5e1f8 100644
--- a/playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/templates/trident-deployment.yaml.j2
+++ b/playbookconfig/src/playbooks/roles/k8s-storage-backends/netapp/templates/trident-deployment.yaml.j2
@@ -17,6 +17,8 @@ spec:
     metadata:
       labels:
         app: controller.csi.trident.netapp.io
+        # STX_change: add label component
+        app.starlingx.io/component: platform
     spec:
       serviceAccount: trident-controller
       containers: