diff --git a/site/profiles/manifests/puppet/puppetdb.pp b/site/profiles/manifests/puppet/puppetdb.pp
index eaf2f44..9ca7a57 100644
--- a/site/profiles/manifests/puppet/puppetdb.pp
+++ b/site/profiles/manifests/puppet/puppetdb.pp
@@ -34,5 +34,6 @@ class profiles::puppet::puppetdb(
   class { 'puppetdb::server':
     database_host     => $listen_address,
     postgresql_ssl_on => false,
+    manage_firewall   => false,
   }
 }
diff --git a/site/profiles/manifests/puppet/puppetmaster.pp b/site/profiles/manifests/puppet/puppetmaster.pp
index 366317c..76a80b6 100644
--- a/site/profiles/manifests/puppet/puppetmaster.pp
+++ b/site/profiles/manifests/puppet/puppetmaster.pp
@@ -22,12 +22,17 @@
 #
 # Limitations:
 # This is designed to work on Unix-like systems.
-class profiles::puppet::puppetmaster {
+class profiles::puppet::puppetmaster (
+  String $puppetdb_host = lookup('profiles::puppet::puppetdb::puppetdb_host'),
+) {
   include profiles::puppet::r10k
   include profiles::puppet::g10k
   include profiles::puppet::enc
   include profiles::puppet::autosign
-  include puppetdb::master::config
+
+  class { 'puppetdb::master::config':
+    puppetdb_server => $puppetdb_host,
+  }
 
   class { 'profiles::puppet::server':
     vardir              => '/opt/puppetlabs/server/data/puppetserver',