diff --git a/fuel_agent/drivers/nailgun.py b/fuel_agent/drivers/nailgun.py
index 8f5f630..f5209b5 100644
--- usr/lib/python2.6/site-packages/fuel_agent/drivers/nailgun.py
+++ usr/lib/python2.6/site-packages/fuel_agent/drivers/nailgun.py
@@ -258,9 +258,9 @@ class Nailgun(BaseDataDriver):
                       disk['name'])
             parted.add_partition(size=24, flags=['bios_grub'])
             # uefi partition (for future use)
-            LOG.debug('Adding UEFI partition on disk %s: size=200' %
-                      disk['name'])
-            parted.add_partition(size=200)
+            #LOG.debug('Adding UEFI partition on disk %s: size=200' %
+            #          disk['name'])
+            #parted.add_partition(size=200)
 
             LOG.debug('Looping over all volumes on disk %s' % disk['name'])
             for volume in disk['volumes']:
@@ -480,7 +480,7 @@ class Nailgun(BaseDataDriver):

         configdrive_scheme.set_common(
             ssh_auth_keys=ssh_auth_keys,
-            hostname=data['hostname'],
+            hostname=data['hostname'].split('.')[0],
             fqdn=data['hostname'],
             name_servers=data['name_servers'],
             search_domain=data['name_servers_search'],
