diff --git a/conf/os_field/string.conf b/conf/os_field/string.conf
new file mode 100644
index 00000000..48b6673b
--- /dev/null
+++ b/conf/os_field/string.conf
@@ -0,0 +1 @@
+NAME = 'string'
diff --git a/conf/os_metadata/general.conf b/conf/os_metadata/general.conf
index 49460098..1f36e15a 100644
--- a/conf/os_metadata/general.conf
+++ b/conf/os_metadata/general.conf
@@ -57,7 +57,7 @@ METADATA = {
         'ntp_server': {
             '_self': {
                 'is_required': True,
-                'field': 'general',
+                'field': 'string',
 		'default_callback': default_ntp_server,
                 'options_callback': ntp_server_options,
                 'mapping_to': 'ntp_server'
@@ -105,7 +105,7 @@ METADATA = {
         },
         'repo_name': {
             '_self': {
-                'field': 'general',
+                'field': 'string',
                 'is_required': True,
                 'mapping_to': 'repo_name'
             }
@@ -114,6 +114,10 @@ METADATA = {
             '_self': {
                 'field': 'general',
                 'is_required': True,
+                'default_value': 'baremetal',
+                'options': [
+                    'baremetal', 'virtul'
+                 ],
                 'mapping_to': 'deploy_type'
             }
         },