diff --git a/deployment_scripts/puppet/manifests/hiera.pp b/deployment_scripts/puppet/manifests/hiera.pp
index e67ae01..4c44e4b 100644
--- a/deployment_scripts/puppet/manifests/hiera.pp
+++ b/deployment_scripts/puppet/manifests/hiera.pp
@@ -111,9 +111,19 @@ $rabbit_password = $rabbit_info['password']
 $rabbit_user     = $rabbit_info['user']
 $amqp_url        = "amqp://${rabbit_user}:${rabbit_password}@${amqp_host}:${amqp_port}/"
 
-$metadata_fields   = join(['status deleted container_format min_ram updated_at ',
+# metadata_fields defitition
+$metadata_fields_default   = join(['status deleted container_format min_ram updated_at ',
   'min_disk is_public size checksum created_at disk_format protected instance_host ',
-  'host  display_name instance_id instance_type status state'])
+  'host  display_name instance_id instance_type status state user_metadata.stack'])
+$metadata_fields_plugin = $plugin_data['metadata_fields']
+
+if ( $metadata_fields_plugin != '') {
+  $metadata_fields = concat([$plugin_data['metadata_fields']], " ",${metadata_fields_default}")
+}
+else {
+  $metadata_fields = $metadata_fields_default
+}
+
 
 # Kafka
 $kafka_port     = 9092
diff --git a/environment_config.yaml b/environment_config.yaml
index 3334998..954c6ee 100644
--- a/environment_config.yaml
+++ b/environment_config.yaml
@@ -191,24 +191,21 @@ attributes:
 
   metadata_ceilo:
     type: "radio"
-    value: 'yes'
+    value: 'no'
     weight: 60
-    label: 'Metadata for Ceilometer samples'
+    label: 'Extra Metadata for Ceilometer samples'
     values:
       - data: 'yes'
         label: "yes"
-        description: ""
+        description: "Extra Metadata can be added if set"
       - data: 'no'
         label: "no"
-        description: ""
+        description: "Default values for 'metadata' will be used if set"
 
   metadata_fields:
-    value: 'status deleted container_format min_ram updated_at
-            min_disk is_public size checksum created_at disk_format
-            protected instance_host host  display_name instance_id
-            instance_type status state'
-    label: 'metadata_fields'
-    description: 'Please specify all needed metadata you want to be kept along with Ceilometer samples. This field is very important if you are going to do metadata-based Ceilometer queries'
+    value: ''
+    label: 'Extra Metadata'
+    description: 'Please use SPACE as a separator; Please specify extra metadata you want to be kept along with Ceilometer samples. This field is very important if you are going to do metadata-based Ceilometer queries'
     weight: 61
     type: "text"
     restrictions: