diff --git a/manifests/master/report_processor.pp b/manifests/master/report_processor.pp
index c715c10..41312b7 100644
--- a/manifests/master/report_processor.pp
+++ b/manifests/master/report_processor.pp
@@ -9,7 +9,7 @@
   if $masterless {
     $puppet_conf_section = 'main'
   } else {
-    $puppet_conf_section = 'master'
+    $puppet_conf_section = 'server'
   }
 
   $puppetdb_ensure = $enable ? {
diff --git a/manifests/master/storeconfigs.pp b/manifests/master/storeconfigs.pp
index b22f24b..effa0ba 100644
--- a/manifests/master/storeconfigs.pp
+++ b/manifests/master/storeconfigs.pp
@@ -9,7 +9,7 @@
   if $masterless {
     $puppet_conf_section = 'main'
   } else {
-    $puppet_conf_section = 'master'
+    $puppet_conf_section = 'server'
   }
 
   $storeconfigs_ensure = $enable ? {
diff --git a/spec/unit/classes/master/report_processor_spec.rb b/spec/unit/classes/master/report_processor_spec.rb
index 4473f69..fb1dd04 100644
--- a/spec/unit/classes/master/report_processor_spec.rb
+++ b/spec/unit/classes/master/report_processor_spec.rb
@@ -24,7 +24,7 @@
             .with(
               'ensure'                => 'absent',
               'path'                  => '/etc/puppet/puppet.conf',
-              'section'               => 'master',
+              'section'               => 'server',
               'setting'               => 'reports',
               'subsetting'            => 'puppetdb',
               'subsetting_separator'  => ',',
@@ -44,7 +44,7 @@
             .with(
               'ensure'                => 'present',
               'path'                  => '/etc/puppet/puppet.conf',
-              'section'               => 'master',
+              'section'               => 'server',
               'setting'               => 'reports',
               'subsetting'            => 'puppetdb',
               'subsetting_separator'  => ',',
diff --git a/spec/unit/classes/master/storeconfigs_spec.rb b/spec/unit/classes/master/storeconfigs_spec.rb
index 7e36af0..80bec62 100644
--- a/spec/unit/classes/master/storeconfigs_spec.rb
+++ b/spec/unit/classes/master/storeconfigs_spec.rb
@@ -12,7 +12,7 @@
   end
 
   let(:param_ensure) { params[:enable] ? 'present' : 'absent' }
-  let(:puppet_conf_section) { params[:masterless] ? 'main' : 'master' }
+  let(:puppet_conf_section) { params[:masterless] ? 'main' : 'server' }
   let(:puppet_conf) { File.join(Puppet[:confdir], 'puppet.conf') }
 
   context 'with default parameters' do