diff --git a/common/scylla_configure.py b/common/scylla_configure.py
index 354fc94d..2b8cdc4c 100755
--- a/common/scylla_configure.py
+++ b/common/scylla_configure.py
@@ -133,6 +133,9 @@ def start_scylla_on_first_boot(self):
             subprocess.run("/usr/bin/systemctl stop scylla-server.service", shell=True, check=True)
 
     def create_devices(self):
+        if self.cloud_instance.is_dev_instance_type():
+            LOGGER.info("Skipping setup data devices")
+            return
         device_type = self.instance_user_data.get("data_device", self.CONF_DEFAULTS['data_device'])
         raid_level = self.instance_user_data.get("raid_level", self.CONF_DEFAULTS['raid_level'])
         cmd_create_devices = f"/opt/scylladb/scylla-machine-image/scylla_create_devices --data-device {device_type} --raid-level {raid_level}"
diff --git a/common/scylla_image_setup b/common/scylla_image_setup
index 943896f8..676c45da 100755
--- a/common/scylla_image_setup
+++ b/common/scylla_image_setup
@@ -45,6 +45,6 @@ if __name__ == '__main__':
                 # some distro has fstrim enabled by default, since we are using XFS with online discard, we don't need fstrim
                 run('systemctl is-active -q fstrim.timer && systemctl disable fstrim.timer', shell=True, check=True)
 
-        if not os.path.ismount('/var/lib/scylla'):
+        if not os.path.ismount('/var/lib/scylla') and not cloud_instance.is_dev_instance_type():
             print('Failed to initialize RAID volume!')
         machine_image_configured.touch()