diff --git a/cumulus/etc/quagga/Quagga.conf b/cumulus/etc/quagga/Quagga.conf
deleted file mode 100644
index a0b3ee0cfb..0000000000
--- a/cumulus/etc/quagga/Quagga.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-log file /var/log/quagga/quagga.log
-log timestamp precision 6
-
diff --git a/cumulus/etc/quagga/bgpd.conf b/cumulus/etc/quagga/bgpd.conf
new file mode 100644
index 0000000000..7c9c5ae286
--- /dev/null
+++ b/cumulus/etc/quagga/bgpd.conf
@@ -0,0 +1,3 @@
+hostname bgpd
+log timestamp precision 6
+log file /var/log/quagga/bgpd.log
diff --git a/cumulus/etc/quagga/ospf6d.conf b/cumulus/etc/quagga/ospf6d.conf
new file mode 100644
index 0000000000..408ca1af1e
--- /dev/null
+++ b/cumulus/etc/quagga/ospf6d.conf
@@ -0,0 +1,3 @@
+hostname ospfd
+log timestamp precision 6
+log file /var/log/quagga/ospf6d.log
diff --git a/cumulus/etc/quagga/ospfd.conf b/cumulus/etc/quagga/ospfd.conf
new file mode 100644
index 0000000000..8f2e53e030
--- /dev/null
+++ b/cumulus/etc/quagga/ospfd.conf
@@ -0,0 +1,3 @@
+hostname ospfd
+log timestamp precision 6
+log file /var/log/quagga/ospfd.log
diff --git a/cumulus/etc/quagga/pimd.conf b/cumulus/etc/quagga/pimd.conf
new file mode 100644
index 0000000000..8aa1e7f5f0
--- /dev/null
+++ b/cumulus/etc/quagga/pimd.conf
@@ -0,0 +1,5 @@
+hostname pimd
+password cn321
+enable password cn321
+log timestamp precision 6
+log file /var/log/quagga/pimd.log
diff --git a/cumulus/etc/quagga/zebra.conf b/cumulus/etc/quagga/zebra.conf
new file mode 100644
index 0000000000..67e4799413
--- /dev/null
+++ b/cumulus/etc/quagga/zebra.conf
@@ -0,0 +1,2 @@
+hostname zebra
+log file /var/log/quagga/zebra.log