diff --git a/manifests/setup/legacy_compiler_group.pp b/manifests/setup/legacy_compiler_group.pp
index dcad98e5..870297ad 100644
--- a/manifests/setup/legacy_compiler_group.pp
+++ b/manifests/setup/legacy_compiler_group.pp
@@ -16,9 +16,7 @@
     ],
     classes => {
       'puppet_enterprise::profile::master'   => {
-        # lint:ignore:single_quote_string_with_variables
-        'puppetdb_host' => ['${trusted[\'certname\']}'],
-        # lint:endignore
+        'puppetdb_host' => [$internal_compiler_a_pool_address, $internal_compiler_a_pool_address].filter |$_| { $_ },
         'puppetdb_port' => [8081],
       },
     },
@@ -34,9 +32,7 @@
     ],
     classes => {
       'puppet_enterprise::profile::master'   => {
-        # lint:ignore:single_quote_string_with_variables
-        'puppetdb_host' => ['${trusted[\'certname\']}', $internal_compiler_b_pool_address].filter |$_| { $_ },
-        # lint:endignore
+        'puppetdb_host' => [$internal_compiler_b_pool_address, $internal_compiler_a_pool_address].filter |$_| { $_ },
         'puppetdb_port' => [8081],
       },
     },
@@ -58,9 +54,7 @@
     ],
     classes => {
       'puppet_enterprise::profile::master'   => {
-        # lint:ignore:single_quote_string_with_variables
-        'puppetdb_host' => ['${trusted[\'certname\']}', $internal_compiler_a_pool_address].filter |$_| { $_ },
-        # lint:endignore
+        'puppetdb_host' => [$internal_compiler_a_pool_address, $internal_compiler_b_pool_address].filter |$_| { $_ },
         'puppetdb_port' => [8081],
       },
     },
diff --git a/manifests/setup/node_manager.pp b/manifests/setup/node_manager.pp
index e7074b63..f74cb217 100644
--- a/manifests/setup/node_manager.pp
+++ b/manifests/setup/node_manager.pp
@@ -209,9 +209,7 @@
     ],
     classes => {
       'puppet_enterprise::profile::master'   => {
-        # lint:ignore:single_quote_string_with_variables
-        'puppetdb_host' => ['${trusted[\'certname\']}'],
-        # lint:endignore
+        'puppetdb_host' => [$internal_compiler_a_pool_address, $internal_compiler_b_pool_address].filter |$_| { $_ },
         'puppetdb_port' => [8081],
       },
     },
@@ -229,9 +227,7 @@
     ],
     classes => {
       'puppet_enterprise::profile::master'   => {
-        # lint:ignore:single_quote_string_with_variables
-        'puppetdb_host' => ['${trusted[\'certname\']}', $internal_compiler_b_pool_address].filter |$_| { $_ },
-        # lint:endignore
+        'puppetdb_host' => [$internal_compiler_b_pool_address, $internal_compiler_a_pool_address].filter |$_| { $_ },
         'puppetdb_port' => [8081],
       },
     },
@@ -255,9 +251,7 @@
     ],
     classes => {
       'puppet_enterprise::profile::master'   => {
-        # lint:ignore:single_quote_string_with_variables
-        'puppetdb_host' => ['${trusted[\'certname\']}', $internal_compiler_a_pool_address].filter |$_| { $_ },
-        # lint:endignore
+        'puppetdb_host' => [$internal_compiler_a_pool_address, $internal_compiler_a_pool_address].filter |$_| { $_ },
         'puppetdb_port' => [8081],
       },
     },