diff --git a/heka/files/decoder/payloadregex.toml b/heka/files/decoder/payloadregex.toml
new file mode 100644
index 0000000..81b36ab
--- /dev/null
+++ b/heka/files/decoder/payloadregex.toml
@@ -0,0 +1,5 @@
+[Payloadregex]
+type = "PayloadRegexDecoder"
+match_regex = "{{ values.match_regex }}"
+timestamp_layout = "{{ values.timestamp_layout }}"
+
diff --git a/metadata/service/server/amqp/compute.yml b/metadata/service/server/amqp/compute.yml
index 2ce7826..5ce560e 100644
--- a/metadata/service/server/amqp/compute.yml
+++ b/metadata/service/server/amqp/compute.yml
@@ -62,11 +62,11 @@
         OpenStackLog:
           engine: payloadregex
           match_regex: ^(?P<timestamp>\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}.\d{3})\s(?P<pid>\d+)\s(?P<severity>\w+)\s(?P<programname>\D+)\s\[(?P<id>.+)\]\s(?P<payload>.*)
-          timestamp_layout: 2015-10-06 11:34:37.243
+          timestamp_layout: "2015-10-06 11:34:37.243"
         OpenStackLogTrace:
           engine: payloadregex
           match_regex: ^(?P<timestamp>\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}.\d{3})\s(?P<pid>\d+)\s(?P<severity>TRACE)\s(?P<programname>.\S+)\s(?P<payload>.*)
-          timestamp_layout: 2015-10-06 11:34:37.243
+          timestamp_layout: "2015-10-06 11:34:37.243"
         libvirtd:
           engine: multidecoder
           subs: [ 'libvirtcommon', 'libvirtaudit' ]
@@ -75,11 +75,14 @@
         libvirtcommon:
           engine: payloadregex
           match_regex: ^(?P<timestamp>\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}.\d{3}\+\d{4}):\s+(?P<pid>\d+):\s+(?P<severity>\w+)\s+:\s+(?P<qemutrace>\w+:\d+)\s+:\s+(?P<payload>.*)
-          timestamp_layout: 2015-09-01 15:56:14.675+0000
+          timestamp_layout: "2015-09-01 15:56:14.675+0000"
         libvirtaudit:
           engine: payloadregex
           match_regex: ^(?P<timestamp>\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}.\d{3}\+\d{4}):\s+(?P<pid>\d+):\s+(?P<severity>\w+)\s+:\s+(?P<message>.+):\s(?P<payload>.+)
-          timestamp_layout: 2015-09-01 15:56:14.675+0000
+          timestamp_layout: "2015-09-01 15:56:14.675+0000"
+        contrail_vrouter_agent:
+          engine: payloadregex
+          match_regex: (?P<timestamp>\d{4}-\d{1,2}-\d{1,2}\s\w+\s\d{2}:\d{2}:\d{2}:\d{3}.\d{3})\s\w+\s.+\s\[Thread (\d+), Pid (?<pid>\d+)]:\s(?P<message>.+)
       output:
         rabbitmq:
           engine: amqp