diff --git a/.github/actions/deploy-charts/action.yaml b/.github/actions/deploy-charts/action.yaml
index 6879c619..7be4dde3 100644
--- a/.github/actions/deploy-charts/action.yaml
+++ b/.github/actions/deploy-charts/action.yaml
@@ -86,7 +86,8 @@ runs:
         .drivers |=
         with_entries(
           .value.enabled = (.value.name == strenv(DRIVER_NAME)) |
-          .value.deployCsiAddons = (.value.name == "rbd.csi.ceph.com")
+          .value.deployCsiAddons = (.value.name == "rbd.csi.ceph.com") |
+          .value.generateOMapInfo = ((.value.name == "cephfs.csi.ceph.com") or (.value.name == "rbd.csi.ceph.com"))
         )
         ' ./deploy/charts/ceph-csi-drivers/values.yaml
 
diff --git a/internal/controller/driver_controller.go b/internal/controller/driver_controller.go
index 4cda382e..a4ab2409 100644
--- a/internal/controller/driver_controller.go
+++ b/internal/controller/driver_controller.go
@@ -866,7 +866,7 @@ func (r *driverReconcile) reconcileControllerPluginDeployment() error {
 							})
 						}
 						// OMap Generator Sidecar Container
-						if r.isRbdDriver() && ptr.Deref(r.driver.Spec.GenerateOMapInfo, false) {
+						if (r.isRbdDriver() || r.isCephFsDriver()) && ptr.Deref(r.driver.Spec.GenerateOMapInfo, false) {
 							containers = append(containers, corev1.Container{
 								Name:            "csi-omap-generator",
 								Image:           r.images["plugin"],