diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js
index 0a002fb649..4bf8dd70df 100644
--- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js
+++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js
@@ -205,8 +205,6 @@
         // REQUIRED for JS logic
         hide_create_volume: false,
         vol_create: false,
-        // May be null
-        vol_device_name: 'vda',
         vol_delete_on_instance_delete: false,
         vol_size: 1
       };
@@ -750,10 +748,10 @@
           setFinalSpecBootImageToVolume(finalSpec);
           break;
         case bootSourceTypes.VOLUME:
-          setFinalSpecBootFromVolumeDevice(finalSpec, 'vol');
+          setFinalSpecBootFromVolumeDevice(finalSpec, 'volume');
           break;
         case bootSourceTypes.VOLUME_SNAPSHOT:
-          setFinalSpecBootFromVolumeDevice(finalSpec, 'snap');
+          setFinalSpecBootFromVolumeDevice(finalSpec, 'snapshot');
           break;
         default:
           $log.error("Unknown source type: " + finalSpec.source_type);
@@ -765,7 +763,6 @@
       // at launch time.
       delete finalSpec.source_type;
       delete finalSpec.vol_create;
-      delete finalSpec.vol_device_name;
       delete finalSpec.vol_delete_on_instance_delete;
       delete finalSpec.vol_size;
     }
@@ -789,14 +786,16 @@
     }
 
     function setFinalSpecBootFromVolumeDevice(finalSpec, sourceType) {
-      finalSpec.block_device_mapping = {};
-      finalSpec.block_device_mapping[finalSpec.vol_device_name] = [
-        finalSpec.source_id,
-        ':',
-        sourceType,
-        '::',
-        finalSpec.vol_delete_on_instance_delete
-      ].join('');
+      finalSpec.block_device_mapping_v2 = [];
+      finalSpec.block_device_mapping_v2.push(
+        {
+          'source_type': sourceType,
+          'destination_type': bootSourceTypes.VOLUME,
+          'delete_on_termination': finalSpec.vol_delete_on_instance_delete,
+          'uuid': finalSpec.source_id,
+          'boot_index': '0'
+        }
+      );
 
       // Source ID must be empty for API
       finalSpec.source_id = '';
diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.spec.js b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.spec.js
index f131d181dc..f922c46258 100644
--- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.spec.js
+++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.spec.js
@@ -841,7 +841,7 @@
         // This is here to ensure that as people add/change items, they
         // don't forget to implement tests for them.
         it('has the right number of properties', function() {
-          expect(Object.keys(model.newInstanceSpec).length).toBe(23);
+          expect(Object.keys(model.newInstanceSpec).length).toBe(22);
         });
 
         it('sets availability zone to null', function() {