diff --git a/tuskar_ui/api/node.py b/tuskar_ui/api/node.py
index 31e967756..ff86cbb9f 100644
--- a/tuskar_ui/api/node.py
+++ b/tuskar_ui/api/node.py
@@ -128,11 +128,11 @@ class Node(base.APIResourceWrapper):
                 'ipmi_password': ipmi_password
             }
         driver_info.update(
-            pxe_deploy_kernel=deployment_kernel,
-            pxe_deploy_ramdisk=deployment_ramdisk
+            deploy_kernel=deployment_kernel,
+            deploy_ramdisk=deployment_ramdisk
         )
 
-        properties = {}
+        properties = {'capabilities': 'boot_option:local', }
         if cpus:
             properties.update(cpus=cpus)
         if memory_mb:
diff --git a/tuskar_ui/infrastructure/nodes/tabs.py b/tuskar_ui/infrastructure/nodes/tabs.py
index c30ef4ee3..1b8f81b6c 100644
--- a/tuskar_ui/infrastructure/nodes/tabs.py
+++ b/tuskar_ui/infrastructure/nodes/tabs.py
@@ -319,11 +319,11 @@ class DetailOverviewTab(tabs.Tab):
             context['role'] = resource.role
             context['stack'] = resource.stack
 
-        kernel_id = node.driver_info.get('pxe_deploy_kernel')
+        kernel_id = node.driver_info.get('deploy_kernel')
         if kernel_id:
             context['kernel_image'] = api.node.image_get(request, kernel_id)
 
-        ramdisk_id = node.driver_info.get('pxe_deploy_ramdisk')
+        ramdisk_id = node.driver_info.get('deploy_ramdisk')
         if ramdisk_id:
             context['ramdisk_image'] = api.node.image_get(request, ramdisk_id)
 
diff --git a/tuskar_ui/test/test_data/node_data.py b/tuskar_ui/test/test_data/node_data.py
index 0b92e9846..7b54b0795 100644
--- a/tuskar_ui/test/test_data/node_data.py
+++ b/tuskar_ui/test/test_data/node_data.py
@@ -29,8 +29,8 @@ def data(TEST):
              'ipmi_username': 'admin',
              'ipmi_password': 'password',
              'ip_address': '1.2.2.2',
-             'pxe_deploy_kernel': 'deploy-kernel-uuid',
-             'pxe_deploy_ramdisk': 'deploy-ramdisk-uuid',
+             'deploy_kernel': 'deploy-kernel-uuid',
+             'deploy_ramdisk': 'deploy-ramdisk-uuid',
          },
          'properties': {
              'cpus': '8',
@@ -56,8 +56,8 @@ def data(TEST):
              'ipmi_username': 'admin',
              'ipmi_password': 'password',
              'ip_address': '1.2.2.3',
-             'pxe_deploy_kernel': 'deploy-kernel-uuid',
-             'pxe_deploy_ramdisk': 'deploy-ramdisk-uuid',
+             'deploy_kernel': 'deploy-kernel-uuid',
+             'deploy_ramdisk': 'deploy-ramdisk-uuid',
          },
          'properties': {
              'cpus': '16',
@@ -83,8 +83,8 @@ def data(TEST):
              'ipmi_username': 'admin',
              'ipmi_password': 'password',
              'ip_address': '1.2.2.4',
-             'pxe_deploy_kernel': 'deploy-kernel-uuid',
-             'pxe_deploy_ramdisk': 'deploy-ramdisk-uuid',
+             'deploy_kernel': 'deploy-kernel-uuid',
+             'deploy_ramdisk': 'deploy-ramdisk-uuid',
          },
          'properties': {
              'cpus': '32',
@@ -110,8 +110,8 @@ def data(TEST):
              'ipmi_username': 'admin',
              'ipmi_password': 'password',
              'ip_address': '1.2.2.5',
-             'pxe_deploy_kernel': 'deploy-kernel-uuid',
-             'pxe_deploy_ramdisk': 'deploy-ramdisk-uuid',
+             'deploy_kernel': 'deploy-kernel-uuid',
+             'deploy_ramdisk': 'deploy-ramdisk-uuid',
          },
          'properties': {
              'cpus': '8',
@@ -137,8 +137,8 @@ def data(TEST):
              'ipmi_username': 'admin',
              'ipmi_password': 'password',
              'ip_address': '1.2.2.6',
-             'pxe_deploy_kernel': 'deploy-kernel-uuid',
-             'pxe_deploy_ramdisk': 'deploy-ramdisk-uuid',
+             'deploy_kernel': 'deploy-kernel-uuid',
+             'deploy_ramdisk': 'deploy-ramdisk-uuid',
          },
          'properties': {
              'cpus': '8',
@@ -164,8 +164,8 @@ def data(TEST):
              'ipmi_username': 'admin',
              'ipmi_password': 'password',
              'ip_address': '1.2.2.6',
-             'pxe_deploy_kernel': 'deploy-kernel-uuid',
-             'pxe_deploy_ramdisk': 'deploy-ramdisk-uuid',
+             'deploy_kernel': 'deploy-kernel-uuid',
+             'deploy_ramdisk': 'deploy-ramdisk-uuid',
          },
          'properties': {
              'cpus': '8',
@@ -191,8 +191,8 @@ def data(TEST):
              'ipmi_username': 'admin',
              'ipmi_password': 'password',
              'ip_address': '1.2.2.7',
-             'pxe_deploy_kernel': 'deploy-kernel-uuid',
-             'pxe_deploy_ramdisk': 'deploy-ramdisk-uuid',
+             'deploy_kernel': 'deploy-kernel-uuid',
+             'deploy_ramdisk': 'deploy-ramdisk-uuid',
          },
          'properties': {
              'cpus': '8',
@@ -218,8 +218,8 @@ def data(TEST):
              'ipmi_username': 'admin',
              'ipmi_password': 'password',
              'ip_address': '1.2.2.8',
-             'pxe_deploy_kernel': 'deploy-kernel-uuid',
-             'pxe_deploy_ramdisk': 'deploy-ramdisk-uuid',
+             'deploy_kernel': 'deploy-kernel-uuid',
+             'deploy_ramdisk': 'deploy-ramdisk-uuid',
          },
          'properties': {
              'cpus': '8',
@@ -245,8 +245,8 @@ def data(TEST):
              'ipmi_username': 'admin',
              'ipmi_password': 'password',
              'ip_address': '1.2.2.9',
-             'pxe_deploy_kernel': 'deploy-kernel-uuid',
-             'pxe_deploy_ramdisk': 'deploy-ramdisk-uuid',
+             'deploy_kernel': 'deploy-kernel-uuid',
+             'deploy_ramdisk': 'deploy-ramdisk-uuid',
          },
          'properties': {
              'cpus': '16',