diff --git a/manifests/server/config_entry.pp b/manifests/server/config_entry.pp
index d17b844a18..e6460659a2 100644
--- a/manifests/server/config_entry.pp
+++ b/manifests/server/config_entry.pp
@@ -5,6 +5,7 @@
 # @param value Defines the value for the setting.
 # @param path Path for postgresql.conf
 # @param comment Defines the comment for the setting. The # is added by default.
+# @param instance_name The name of the instance.
 #
 define postgresql::server::config_entry (
   Enum['present', 'absent']                               $ensure  = 'present',
@@ -12,6 +13,7 @@
   Optional[Variant[String[1], Numeric, Array[String[1]]]] $value   = undef,
   Stdlib::Absolutepath                                    $path    = $postgresql::server::postgresql_conf_path,
   Optional[String[1]]                                     $comment = undef,
+  String[1]                                               $instance_name = 'main',
 ) {
   # Those are the variables that are marked as "(change requires restart)"
   # on postgresql.conf.  Items are ordered as on postgresql.conf.
@@ -72,15 +74,15 @@
       versioncmp($postgresql::server::_version, $requires_restart_until[$key]) < 0
   )) {
     Postgresql_conf {
-      notify => Class['postgresql::server::reload'],
+      notify => Postgresql::Server::Instance::Reload[$instance_name],
     }
   } elsif $postgresql::server::service_restart_on_change {
     Postgresql_conf {
-      notify => Class['postgresql::server::service'],
+      notify => Postgresql::Server::Instance::Service[$instance_name],
     }
   } else {
     Postgresql_conf {
-      before => Class['postgresql::server::service'],
+      before => Postgresql::Server::Instance::Service[$instance_name],
     }
   }
 
@@ -90,6 +92,6 @@
     key     => $key,
     value   => $value,
     comment => $comment,
-    require => Class['postgresql::server::initdb'],
+    require => Postgresql::Server::Instance::Initdb[$instance_name],
   }
 }
diff --git a/manifests/server/database.pp b/manifests/server/database.pp
index 7d95e76056..48cd44103b 100644
--- a/manifests/server/database.pp
+++ b/manifests/server/database.pp
@@ -72,7 +72,7 @@
   postgresql_psql { "CREATE DATABASE \"${dbname}\"":
     command => "CREATE DATABASE \"${dbname}\" WITH ${template_option} ${encoding_option} ${locale_option} ${tablespace_option}",
     unless  => "SELECT 1 FROM pg_database WHERE datname = '${dbname}'",
-    require => Class['postgresql::server::service'],
+    require => Postgresql::Server::Instance::Service[$instance],
   }
 
   # This will prevent users from connecting to the database unless they've been
diff --git a/manifests/server/database_grant.pp b/manifests/server/database_grant.pp
index 3becf35975..c4a7c67ca1 100644
--- a/manifests/server/database_grant.pp
+++ b/manifests/server/database_grant.pp
@@ -9,6 +9,7 @@
 # @param psql_group Overrides the default postgres user group to be used for related files in the file system.
 # @param connect_settings Specifies a hash of environment variables used when connecting to a remote server.
 # @param port Port to use when connecting.
+# @param instance The name of the Postgresql database instance.
 define postgresql::server::database_grant (
   Enum['ALL', 'CREATE', 'CONNECT', 'TEMPORARY', 'TEMP', 'all', 'create', 'connect', 'temporary', 'temp'] $privilege,
   String[1]                           $db,
@@ -19,6 +20,7 @@
   Hash $connect_settings = $postgresql::server::default_connect_settings,
   String[1] $psql_group = $postgresql::server::group,
   Stdlib::Port $port = $postgresql::server::port,
+  String[1] $instance = 'main',
 ) {
   postgresql::server::grant { "database:${name}":
     ensure           => $ensure,
@@ -32,5 +34,6 @@
     group            => $psql_group,
     port             => $port,
     connect_settings => $connect_settings,
+    instance         => $instance,
   }
 }
diff --git a/manifests/server/db.pp b/manifests/server/db.pp
index 513e548ed7..9542dcc618 100644
--- a/manifests/server/db.pp
+++ b/manifests/server/db.pp
@@ -44,6 +44,7 @@
       port       => $port,
       user       => $psql_user,
       group      => $psql_group,
+      instance   => $instance,
     }
   }
 
@@ -54,6 +55,7 @@
       psql_user     => $psql_user,
       psql_group    => $psql_group,
       before        => Postgresql::Server::Database[$dbname],
+      instance      => $instance,
     }
   }
 
@@ -65,6 +67,7 @@
       port       => $port,
       psql_user  => $psql_user,
       psql_group => $psql_group,
+      instance   => $instance,
     } -> Postgresql_conn_validator<| db_name == $dbname |>
   }
 
diff --git a/manifests/server/instance/config.pp b/manifests/server/instance/config.pp
index d596d0846b..342d8fdba3 100644
--- a/manifests/server/instance/config.pp
+++ b/manifests/server/instance/config.pp
@@ -88,7 +88,7 @@
       group  => $group,
       mode   => '0640',
       warn   => true,
-      notify => Class['postgresql::server::reload'],
+      notify => Postgresql::Server::Instance::Reload[$name],
     }
 
     if $pg_hba_conf_defaults {
@@ -249,7 +249,7 @@
       group  => $group,
       mode   => '0640',
       warn   => true,
-      notify => Class['postgresql::server::reload'],
+      notify => Postgresql::Server::Instance::Reload[$name],
     }
   }
 
diff --git a/manifests/server/instance/reload.pp b/manifests/server/instance/reload.pp
index 53eb5fad99..fd0c750ab2 100644
--- a/manifests/server/instance/reload.pp
+++ b/manifests/server/instance/reload.pp
@@ -11,6 +11,6 @@
     command     => $service_reload,
     onlyif      => $service_status,
     refreshonly => true,
-    require     => Class['postgresql::server::service'],
+    require     => Postgresql::Server::Instance::Service[$name],
   }
 }
diff --git a/manifests/server/instance/systemd.pp b/manifests/server/instance/systemd.pp
index b9a46a2336..9214f2a22a 100644
--- a/manifests/server/instance/systemd.pp
+++ b/manifests/server/instance/systemd.pp
@@ -32,8 +32,8 @@
             extra_systemd_config => $extra_systemd_config,
           }
         ),
-        notify  => Class['postgresql::server::service'],
-        before  => Class['postgresql::server::reload'],
+        notify  => Postgresql::Server::Instance::Service[$name],
+        before  => Postgresql::Server::Instance::Reload[$name],
       }
     }
   }
diff --git a/manifests/server/table_grant.pp b/manifests/server/table_grant.pp
index 9168dd9ce0..719460fd22 100644
--- a/manifests/server/table_grant.pp
+++ b/manifests/server/table_grant.pp
@@ -12,6 +12,7 @@
 # @param psql_user Specifies the OS user for running psql.
 # @param connect_settings Specifies a hash of environment variables used when connecting to a remote server.
 # @param onlyif_exists Create grant only if it doesn't exist.
+# @param instance The name of the Postgresql database instance.
 define postgresql::server::table_grant (
   Enum['ALL', 'SELECT', 'INSERT', 'UPDATE', 'DELETE', 'TRUNCATE', 'REFERENCES', 'TRIGGER', 'all', 'select', 'insert', 'update', 'delete',
   'truncate', 'references', 'trigger'] $privilege,
@@ -24,6 +25,7 @@
   Optional[String[1]]                                 $psql_user        = undef,
   Optional[Hash]                                      $connect_settings = undef,
   Boolean                                             $onlyif_exists    = false,
+  String[1]                                           $instance         = 'main',
 ) {
   postgresql::server::grant { "table:${name}":
     ensure           => $ensure,
@@ -37,5 +39,6 @@
     psql_user        => $psql_user,
     onlyif_exists    => $onlyif_exists,
     connect_settings => $connect_settings,
+    instance         => $instance,
   }
 }
diff --git a/manifests/server_instance.pp b/manifests/server_instance.pp
index 49d2bbb8f7..5ef8dec527 100644
--- a/manifests/server_instance.pp
+++ b/manifests/server_instance.pp
@@ -66,6 +66,10 @@
     port => $config_settings['port'],
     user => $instance_user,
   }
+  postgresql::server::instance::reload { $instance_name:
+    service_status => $service_settings['service_status'],
+    service_reload => "systemctl reload ${service_settings['service_name']}.service",
+  }
   postgresql::server::instance::passwd { $instance_name:
     * => $passwd_settings,
   }
@@ -84,11 +88,12 @@
     $value   = $settings['value']
     $comment = $settings['comment']
     postgresql::server::config_entry { "${entry}_${$instance_name}":
-      ensure  => bool2str($value =~ Undef, 'absent', 'present'),
-      key     => $entry,
-      value   => $value,
-      comment => $comment,
-      path    => $config_settings['postgresql_conf_path'],
+      ensure        => bool2str($value =~ Undef, 'absent', 'present'),
+      key           => $entry,
+      value         => $value,
+      comment       => $comment,
+      path          => $config_settings['postgresql_conf_path'],
+      instance_name => $instance_name,
     }
   }
   $pg_hba_rules.each |String[1] $rule_name, Postgresql::Pg_hba_rule $rule| {
@@ -108,10 +113,11 @@
   }
   $databases.each |$database, $database_details| {
     postgresql::server::database { $database:
-      *     => $database_details,
-      user  => $instance_user,
-      group => $instance_group,
-      port  => $config_settings['port'],
+      *        => $database_details,
+      user     => $instance_user,
+      group    => $instance_group,
+      port     => $config_settings['port'],
+      instance => $instance_name,
     }
   }
   $database_grants.each |$db_grant_title, $dbgrants| {
@@ -120,6 +126,7 @@
       psql_user  => $instance_user,
       psql_group => $instance_group,
       port       => $config_settings['port'],
+      instance   => $instance_name,
     }
   }
   $table_grants.each |$table_grant_title, $tgrants| {
@@ -127,6 +134,7 @@
       *         => $tgrants,
       psql_user => $instance_user,
       port      => $config_settings['port'],
+      instance  => $instance_name,
     }
   }
 }
diff --git a/spec/classes/server_spec.rb b/spec/classes/server_spec.rb
index caf592d611..513c3d1760 100644
--- a/spec/classes/server_spec.rb
+++ b/spec/classes/server_spec.rb
@@ -129,7 +129,7 @@ class { 'postgresql::globals':
     it { is_expected.to contain_class('postgresql::server') }
 
     it {
-      expect(subject).to contain_Postgresql_conf('data_directory_for_instance_main').that_notifies('Class[postgresql::server::service]')
+      expect(subject).to contain_Postgresql_conf('data_directory_for_instance_main').that_notifies('Postgresql::Server::Instance::Service[main]')
     }
 
     it { is_expected.to contain_postgresql__server__config_entry('data_directory_for_instance_main') }
diff --git a/spec/defines/server/config_entry_spec.rb b/spec/defines/server/config_entry_spec.rb
index 8b13e020bd..243e2ea5e9 100644
--- a/spec/defines/server/config_entry_spec.rb
+++ b/spec/defines/server/config_entry_spec.rb
@@ -76,7 +76,7 @@
       expect(subject).to contain_postgresql_conf('unix_socket_directories')
         .with(name: 'unix_socket_directories',
               value: '/var/pgsql, /opt/postgresql, /root/')
-        .that_notifies('Class[postgresql::server::service]')
+        .that_notifies('Postgresql::Server::Instance::Service[main]')
     end
   end
 end