diff --git a/ceph-osd/Chart.yaml b/ceph-osd/Chart.yaml
index 2f3a576a5..be891b3f3 100644
--- a/ceph-osd/Chart.yaml
+++ b/ceph-osd/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph OSD
 name: ceph-osd
-version: 0.1.16
+version: 0.1.17
 home: https://github.com/ceph/ceph
 ...
diff --git a/ceph-osd/templates/bin/osd/ceph-volume/_init-with-ceph-volume.sh.tpl b/ceph-osd/templates/bin/osd/ceph-volume/_init-with-ceph-volume.sh.tpl
index 5dacde20b..2442620b5 100644
--- a/ceph-osd/templates/bin/osd/ceph-volume/_init-with-ceph-volume.sh.tpl
+++ b/ceph-osd/templates/bin/osd/ceph-volume/_init-with-ceph-volume.sh.tpl
@@ -207,7 +207,7 @@ function prep_device {
     fi
     logical_volumes="$(lvs --noheadings -o lv_name ${VG} | xargs)"
     for volume in ${logical_volumes}; do
-      data_volume=$(echo ${volume} | sed -E -e 's/db|wal/lv/g')
+      data_volume=$(echo ${volume} | sed -E -e 's/-db-|-wal-/-lv-/g')
       if [[ -z $(lvs --noheadings -o lv_name -S "lv_name=${data_volume}") ]]; then
         # DB or WAL volume without a corresponding data volume, remove it
         lvremove -y /dev/${VG}/${volume}