diff --git a/roles/kubernetes-apps/meta/main.yml b/roles/kubernetes-apps/meta/main.yml
index fd53ec03fa4bd0c0ca15e522ea846d3ee54b1a11..bbfceb7105083e865c4d0215294c127faccdf1b5 100644
--- a/roles/kubernetes-apps/meta/main.yml
+++ b/roles/kubernetes-apps/meta/main.yml
@@ -35,6 +35,7 @@ dependencies:
     tags:
       - apps
       - cinder-csi-driver
+      - csi-driver
 
   - role: kubernetes-apps/persistent_volumes
     when:
diff --git a/upgrade-cluster.yml b/upgrade-cluster.yml
index 5e92c8d3df6dcbd4e2913eee78a7626fde454e59..497e271fd2b85ad5b1f836d6a6e9096e3445b392 100644
--- a/upgrade-cluster.yml
+++ b/upgrade-cluster.yml
@@ -92,7 +92,7 @@
     - { role: kubernetes/client, tags: client }
     - { role: kubernetes/node-label, tags: node-label }
     - { role: kubernetes-apps/cluster_roles, tags: cluster-roles }
-    - { role: kubernetes-apps, tags: cinder-csi-driver }
+    - { role: kubernetes-apps, tags: csi-driver }
     - { role: upgrade/post-upgrade, tags: post-upgrade }
   environment: "{{ proxy_env }}"