diff --git a/deployment_scripts/puppet/modules/opendaylight/manifests/install.pp b/deployment_scripts/puppet/modules/opendaylight/manifests/install.pp
index b229757..3547a35 100644
--- a/deployment_scripts/puppet/modules/opendaylight/manifests/install.pp
+++ b/deployment_scripts/puppet/modules/opendaylight/manifests/install.pp
@@ -18,8 +18,9 @@ class opendaylight::install (
     ensure  => installed,
   }
 
-  package {'opnfv-quagga':
-    ensure => installed,
+  # quagga
+  class { 'opendaylight::quagga':
+    before => Service['opendaylight']
   }
 
   firewall {'215 odl':
diff --git a/deployment_scripts/puppet/modules/opendaylight/manifests/quagga.pp b/deployment_scripts/puppet/modules/opendaylight/manifests/quagga.pp
new file mode 100644
index 0000000..f68d9af
--- /dev/null
+++ b/deployment_scripts/puppet/modules/opendaylight/manifests/quagga.pp
@@ -0,0 +1,19 @@
+class opendaylight::quagga (
+){
+  package { ['opnfv-quagga', 'libcapnp-0.5.99', 'python-pycapnp', 'python-thriftpy']:
+     ensure => installed,
+  }
+  service {'opnfv-quagga':
+    ensure => running
+  }
+
+  $config_path  = /usr/lib/quagga/qthrift/bgpd.conf
+  ini_setting { 'bgp_password':
+    ensure  => present,
+    setting => 'password',
+    value   => 'sdncbgpc',
+    path    => $config_path,
+    require => Package['opnfv-quagga']
+    notify => Service['opnfv-quagga']
+  }
+}
diff --git a/pre_build_hook b/pre_build_hook
index 04ee7c1..cf00563 100755
--- a/pre_build_hook
+++ b/pre_build_hook
@@ -37,7 +37,7 @@ NETWORKING_ODL_BRANCH=${NETWORKING_ODL_BRANCH:-stable/mitaka}
 
 #Opnfv-quagga-packaging
 OPNFV_QUAGGE_PACKAGING_REPO=${OPNFV_QUAGGE_PACKAGING_REPO:-https://github.com/nikolas-hermanns/opnfv-quagga-packaging}
-OPNFV_QUAGGE_PACKAGING_BRANCH=stable/brahmaputra
+OPNFV_QUAGGE_PACKAGING_BRANCH=stable/colorado
 
 # For which systems odl package should be build
 BUILD_FOR=${BUILD_FOR:-ubuntu}
@@ -68,9 +68,9 @@ function add_opnfv_quagga {
         git clone $OPNFV_QUAGGE_PACKAGING_REPO opnfv-quagga
         pushd opnfv-quagga
             git checkout $OPNFV_QUAGGE_PACKAGING_BRANCH
-            if [ ! -e debian_package/*.deb ];then
+            if [ ! -e debian_package/ ];then
                 sudo apt-get -y install `cat requirements.txt`
-                make
+                make -j6
             fi
             cp debian_package/* $path
         popd