diff --git a/deployment_scripts/puppet/manifests/congress.pp b/deployment_scripts/puppet/manifests/congress.pp
index c87a7b5..9cc2635 100644
--- a/deployment_scripts/puppet/manifests/congress.pp
+++ b/deployment_scripts/puppet/manifests/congress.pp
@@ -2,8 +2,6 @@ notice('MODULAR: congress.pp')
 
 $management_vip = hiera('management_vip')
 $public_vip     = hiera('public_vip')
-$network_scheme = hiera_hash('network_scheme', {})
-prepare_network_config($network_scheme)
 
 $plugin_hash = hiera_hash('congress', {})
 $debug       = $plugin_hash['debug']
diff --git a/deployment_scripts/puppet/manifests/server.pp b/deployment_scripts/puppet/manifests/server.pp
index d76e727..fa1b3ba 100644
--- a/deployment_scripts/puppet/manifests/server.pp
+++ b/deployment_scripts/puppet/manifests/server.pp
@@ -2,6 +2,8 @@ notice('MODULAR: congress/server.pp')
 
 $management_vip = hiera('management_vip')
 $public_vip     = hiera('public_vip')
+$network_scheme = hiera_hash('network_scheme', {})
+prepare_network_config($network_scheme)
 
 $plugin_hash = hiera_hash('congress', {})
 $congress_hash = $plugin_hash['metadata']
@@ -36,12 +38,12 @@ class { 'congress::keystone::authtoken':
 
 }
 
-class {'congress::server':
-  enabled             => $service_enabled,
-  bing_host           => $bind_host,
-  bind_port           => $bind_port
-}
-
 class {'congress::policy':
   policies            => $policies
-}
\ No newline at end of file
+}
+
+class {'congress::server':
+  enabled             => $service_enabled,
+  bind_host           => $bind_host,
+  bind_port           => $bind_port
+}
diff --git a/pre_build_hook b/pre_build_hook
index f4f29e7..f6bbf25 100755
--- a/pre_build_hook
+++ b/pre_build_hook
@@ -63,7 +63,8 @@ git_download "${CONGRESS_REPO}" "${CONGRESS_BRANCH}" "${CONGRESS_DST_DIR}"
 
 git_download "${CONGRESS_CLI_REPO}" "${CONGRESS_CLI_BRANCH}" "${CONGRESS_CLI_DST_DIR}"
 
-build_deb
+# FIXME: make building deb packages optional
+# build_deb
 
 clean