diff --git a/infrastructure-playbooks/filestore-to-bluestore.yml b/infrastructure-playbooks/filestore-to-bluestore.yml
index 72bdd3a4c..4a435702e 100644
--- a/infrastructure-playbooks/filestore-to-bluestore.yml
+++ b/infrastructure-playbooks/filestore-to-bluestore.yml
@@ -100,7 +100,9 @@
           with_together:
             - "{{ simple_scan.results }}"
             - "{{ partlabel.results }}"
-          when: item.1.stdout == 'ceph data'
+          when:
+            - item.1.stdout == 'ceph data'
+            - (item.0.stdout | from_json).encrypted | default(False) | bool
 
         - name: ensure dmcrypt for data device is closed
           command: cryptsetup close "{{ (item.0.stdout | from_json).data.uuid }}"
@@ -111,7 +113,7 @@
           changed_when: false
           when:
             - item.1.stdout == 'ceph data'
-            - (item.0.stdout | from_json).encrypted | default(False)
+            - (item.0.stdout | from_json).encrypted | default(False) | bool
 
         - name: ensure dmcrypt for journal device is closed
           command: cryptsetup close "{{ (item.0.stdout | from_json).journal.uuid }}"
@@ -122,7 +124,7 @@
           changed_when: false
           when:
             - item.1.stdout == 'ceph data'
-            - (item.0.stdout | from_json).encrypted | default(False)
+            - (item.0.stdout | from_json).encrypted | default(False) | bool
 
         - name: zap data devices
           command: "{{ container_run_cmd }} --cluster {{ cluster }} lvm zap --destroy {{ (item.0.stdout | from_json).data.path }}"
@@ -235,12 +237,17 @@
 
     - name: remove gpt header
       command: parted -s "{{ item }}" mklabel msdos
-      with_items: "{{ devices + dedicated_devices | default([]) }}"
+      with_items: "{{ (devices + dedicated_devices + ceph_disk_osds_devices | default([])) | unique }}"
+
+    - name: refresh ansible devices fact
+      setup:
+        filter: ansible_devices
+      when: osd_auto_discovery | bool
 
-    - import_role:
-        name: ceph-facts
     - import_role:
         name: ceph-defaults
+    - import_role:
+        name: ceph-facts
     - import_role:
         name: ceph-handler
     - import_role:
diff --git a/tests/functional/filestore-to-bluestore/container/hosts b/tests/functional/filestore-to-bluestore/container/hosts
index 170ea69cb..9c458f7d0 100644
--- a/tests/functional/filestore-to-bluestore/container/hosts
+++ b/tests/functional/filestore-to-bluestore/container/hosts
@@ -6,4 +6,5 @@ osd0 osd_objectstore=filestore lvm_volumes="[{'data': 'data-lv1', 'journal': '/d
 osd1 osd_objectstore=filestore lvm_volumes="[{'data': 'data-lv1', 'journal': '/dev/sdc1', 'data_vg': 'test_group'},{'data': 'data-lv2', 'data_vg': 'test_group', 'journal': 'journal1', 'journal_vg': 'journals'}]" dmcrypt=true
 osd2 osd_objectstore=filestore devices="['/dev/sda', '/dev/sdb']" dedicated_devices="['/dev/sdc']" journal_size=1024
 osd3 osd_objectstore=filestore lvm_volumes="[{'data': '/dev/sda', 'journal': '/dev/sdc1'},{'data': '/dev/sdb', 'journal': '/dev/sdc2'}]"
-osd4 osd_objectstore=filestore lvm_volumes="[{'data': '/dev/sda', 'journal': '/dev/sdc1'},{'data': '/dev/sdb', 'journal': '/dev/sdc2'}]" dmcrypt=true
\ No newline at end of file
+osd4 osd_objectstore=filestore lvm_volumes="[{'data': '/dev/sda', 'journal': '/dev/sdc1'},{'data': '/dev/sdb', 'journal': '/dev/sdc2'}]" dmcrypt=true
+osd5 osd_objectstore=filestore osd_auto_discovery=true journal_size=1024
\ No newline at end of file
diff --git a/tests/functional/filestore-to-bluestore/container/vagrant_variables.yml b/tests/functional/filestore-to-bluestore/container/vagrant_variables.yml
index dc8d321ce..bebd61780 100644
--- a/tests/functional/filestore-to-bluestore/container/vagrant_variables.yml
+++ b/tests/functional/filestore-to-bluestore/container/vagrant_variables.yml
@@ -5,7 +5,7 @@ docker: true
 
 # DEFINE THE NUMBER OF VMS TO RUN
 mon_vms: 1
-osd_vms: 5
+osd_vms: 6
 mds_vms: 0
 rgw_vms: 0
 nfs_vms: 0
diff --git a/tests/functional/filestore-to-bluestore/hosts b/tests/functional/filestore-to-bluestore/hosts
index 170ea69cb..9c458f7d0 100644
--- a/tests/functional/filestore-to-bluestore/hosts
+++ b/tests/functional/filestore-to-bluestore/hosts
@@ -6,4 +6,5 @@ osd0 osd_objectstore=filestore lvm_volumes="[{'data': 'data-lv1', 'journal': '/d
 osd1 osd_objectstore=filestore lvm_volumes="[{'data': 'data-lv1', 'journal': '/dev/sdc1', 'data_vg': 'test_group'},{'data': 'data-lv2', 'data_vg': 'test_group', 'journal': 'journal1', 'journal_vg': 'journals'}]" dmcrypt=true
 osd2 osd_objectstore=filestore devices="['/dev/sda', '/dev/sdb']" dedicated_devices="['/dev/sdc']" journal_size=1024
 osd3 osd_objectstore=filestore lvm_volumes="[{'data': '/dev/sda', 'journal': '/dev/sdc1'},{'data': '/dev/sdb', 'journal': '/dev/sdc2'}]"
-osd4 osd_objectstore=filestore lvm_volumes="[{'data': '/dev/sda', 'journal': '/dev/sdc1'},{'data': '/dev/sdb', 'journal': '/dev/sdc2'}]" dmcrypt=true
\ No newline at end of file
+osd4 osd_objectstore=filestore lvm_volumes="[{'data': '/dev/sda', 'journal': '/dev/sdc1'},{'data': '/dev/sdb', 'journal': '/dev/sdc2'}]" dmcrypt=true
+osd5 osd_objectstore=filestore osd_auto_discovery=true journal_size=1024
\ No newline at end of file
diff --git a/tests/functional/filestore-to-bluestore/vagrant_variables.yml b/tests/functional/filestore-to-bluestore/vagrant_variables.yml
index 08fa705db..df6851c17 100644
--- a/tests/functional/filestore-to-bluestore/vagrant_variables.yml
+++ b/tests/functional/filestore-to-bluestore/vagrant_variables.yml
@@ -5,7 +5,7 @@ docker: false
 
 # DEFINE THE NUMBER OF VMS TO RUN
 mon_vms: 1
-osd_vms: 5
+osd_vms: 6
 mds_vms: 0
 rgw_vms: 0
 nfs_vms: 0