diff --git a/Vagrantfile b/Vagrantfile
index aac1cf616663d8f0020aa0d8a5cf0f3e7d911a44..d388c51ee4a4cfd8cd7bf87cf1b28480421c72cc 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -93,7 +93,7 @@ Vagrant.configure("2") do |config|
           instance_config.vm.provision :shell, :path => "test/services/#{host["service_name"]}/install.sh", env: {"REPO_ROOT" => "/vagrant"}
     
           # CLMC agent install
-          instance_config.vm.provision :shell, :path => "scripts/clmc-agent/install.sh", :args => "/vagrant/scripts/clmc-agent/telegraf_template.conf /vagrant/test/services/#{host["service_name"]}/telegraf_template.conf #{host["location"]} #{host["sfc_id"]} #{host["sfc_id_instance"]} #{host["sf_id"]} #{host["sf_id_instance"]} #{host["ipendpoint_id"]} #{host["influxdb_url"]} #{host["database_name"]}"
+          instance_config.vm.provision :shell, :path => "scripts/clmc-agent/install.sh", :args => "/vagrant/scripts/clmc-agent/telegraf_template.conf /vagrant/test/services/#{host["service_name"]}/telegraf_#{host["service_name"]}.conf #{host["location"]} #{host["sfc_id"]} #{host["sfc_id_instance"]} #{host["sf_id"]} #{host["sf_id_instance"]} #{host["ipendpoint_id"]} #{host["influxdb_url"]} #{host["database_name"]}"
       end
 
       
diff --git a/test/services/apache/telegraf_template.conf b/test/services/apache/telegraf_template.conf
deleted file mode 100644
index dd614108a27146a226b508c8095c6ab1be6eb86d..0000000000000000000000000000000000000000
--- a/test/services/apache/telegraf_template.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-[[inputs.apache]]
-  ## An array of URLs to gather from, must be directed at the machine
-  ## readable version of the mod_status page including the auto query string.
-  ## Default is "http://localhost/server-status?auto".
-  urls = ["http://localhost:8890/server-status?auto"]
-
-  ## Credentials for basic HTTP authentication.
-  # username = "myuser"
-  # password = "mypassword"
-
-  ## Maximum time to receive response.
-  # response_timeout = "5s"
-
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
-  # insecure_skip_verify = false
\ No newline at end of file
diff --git a/test/services/mongo/telegraf_template.conf b/test/services/mongo/telegraf_template.conf
deleted file mode 100644
index 80a6a6964394ca33a50e1389121ea142e273bcc2..0000000000000000000000000000000000000000
--- a/test/services/mongo/telegraf_template.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-[[inputs.mongodb]]
-  ## An array of URLs of the form:
-  ##   "mongodb://" [user ":" pass "@"] host [ ":" port]
-  ## For example:
-  ##   mongodb://user:auth_key@10.10.3.30:27017,
-  ##   mongodb://10.10.3.33:18832,
-  servers = ["mongodb://127.0.0.1:27017"]
-  gather_perdb_stats = false
-
-  ## Optional SSL Config
-  # ssl_ca = "/etc/telegraf/ca.pem"
-  # ssl_cert = "/etc/telegraf/cert.pem"
-  # ssl_key = "/etc/telegraf/key.pem"
-  ## Use SSL but skip chain & host verification
-  # insecure_skip_verify = false
\ No newline at end of file
diff --git a/test/services/nginx/telegraf_template.conf b/test/services/nginx/telegraf_template.conf
deleted file mode 100644
index c91cdeb3265bf703a6438456d12942956938c96d..0000000000000000000000000000000000000000
--- a/test/services/nginx/telegraf_template.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# Read Nginx's basic status information (ngx_http_stub_status_module)
-[[inputs.nginx]]
-  ## An array of Nginx stub_status URI to gather stats.
-  urls = ["http://localhost:80/nginx_status"]
-
-  ## HTTP response timeout (default: 5s)
-#  response_timeout = "5s"
\ No newline at end of file