diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 176b32f0f..ac68b88e7 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -1488,12 +1488,6 @@
 #                            SERVICE INPUT PLUGINS                            #
 ###############################################################################
 
-# # A Github Webhook Event collector
-# [[inputs.github_webhooks]]
-#   ## Address and port to host Webhook listener on
-#   service_address = ":1618"
-
-
 # # Read metrics from Kafka topic(s)
 # [[inputs.kafka_consumer]]
 #   ## topic(s) to consume
@@ -1570,12 +1564,6 @@
 #   data_format = "influx"
 
 
-# # A Rollbar Webhook Event collector
-# [[inputs.rollbar_webhooks]]
-#   ## Address and port to host Webhook listener on
-#   service_address = ":1619"
-
-
 # # Statsd Server
 # [[inputs.statsd]]
 #   ## Address and port to host UDP listener on
@@ -1670,3 +1658,14 @@
 #   ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_INPUT.md
 #   data_format = "influx"
 
+
+# # A Webhooks Event collector
+# [[inputs.webhooks]]
+#  ## Address and port to host Webhook listener on
+#  service_address = ":1619"
+#
+#  [inputs.webhooks.github]
+#    path = "/github"
+#
+#  [inputs.webhooks.rollbar]
+#    path = "/rollbar"