diff --git a/dbutils.c b/dbutils.c
index 8aee424f..0f3727d3 100644
--- a/dbutils.c
+++ b/dbutils.c
@@ -214,7 +214,7 @@ check_cluster_schema(PGconn *conn)
 	char		sqlquery[QUERY_STR_LEN];
 
 	sqlquery_snprintf(sqlquery,
-					  "SELECT 1 FROM pg_namespace WHERE nspname = '%s'",
+					  "SELECT 1 FROM pg_catalog.pg_namespace WHERE nspname = '%s'",
 					  get_repmgr_schema());
 
 	log_verbose(LOG_DEBUG, "check_cluster_schema(): %s\n", sqlquery);
@@ -409,7 +409,7 @@ guc_set(PGconn *conn, const char *parameter, const char *op,
 	int			retval = 1;
 
 	sqlquery_snprintf(sqlquery,
-					  "SELECT true FROM pg_settings "
+					  "SELECT true FROM pg_catalog.pg_settings "
 					  " WHERE name = '%s' AND setting %s '%s'",
 					  parameter, op, value);
 
@@ -445,7 +445,7 @@ guc_set_typed(PGconn *conn, const char *parameter, const char *op,
 	int			retval = 1;
 
 	sqlquery_snprintf(sqlquery,
-					  "SELECT true FROM pg_settings "
+					  "SELECT true FROM pg_catalog.pg_settings "
 					  " WHERE name = '%s' AND setting::%s %s '%s'::%s",
 					  parameter, datatype, op, value, datatype);
 
@@ -477,7 +477,7 @@ get_cluster_size(PGconn *conn, char *size)
 
 	sqlquery_snprintf(sqlquery,
 					  "SELECT pg_catalog.pg_size_pretty(SUM(pg_catalog.pg_database_size(oid))::bigint) "
-					  "	 FROM pg_database ");
+					  "	 FROM pg_catalog.pg_database ");
 
 	log_verbose(LOG_DEBUG, "get_cluster_size():\n%s\n", sqlquery);
 
@@ -508,7 +508,7 @@ get_pg_setting(PGconn *conn, const char *setting, char *output)
 
 	sqlquery_snprintf(sqlquery,
 					  "SELECT name, setting "
-					  " FROM pg_settings WHERE name = '%s'",
+					  "  FROM pg_catalog.pg_settings WHERE name = '%s'",
 					  setting);
 
 	log_verbose(LOG_DEBUG, "get_pg_setting(): %s\n", sqlquery);
@@ -986,13 +986,13 @@ create_replication_slot(PGconn *conn, char *slot_name, int server_version_num)
 	if (server_version_num >= 90600)
 	{
 		sqlquery_snprintf(sqlquery,
-						  "SELECT * FROM pg_create_physical_replication_slot('%s', TRUE)",
+						  "SELECT * FROM pg_catalog.pg_create_physical_replication_slot('%s', TRUE)",
 						  slot_name);
 	}
 	else
 	{
 		sqlquery_snprintf(sqlquery,
-						  "SELECT * FROM pg_create_physical_replication_slot('%s')",
+						  "SELECT * FROM pg_catalog.pg_create_physical_replication_slot('%s')",
 						  slot_name);
 	}
 
@@ -1022,7 +1022,7 @@ get_slot_record(PGconn *conn, char *slot_name, t_replication_slot *record)
 
 	sqlquery_snprintf(sqlquery,
 					  "SELECT slot_name, slot_type, active "
-                      "  FROM pg_replication_slots "
+                      "  FROM pg_catalog.pg_replication_slots "
 					  " WHERE slot_name = '%s' ",
 					  slot_name);
 
diff --git a/repmgr.c b/repmgr.c
index 501c9907..f37bc8db 100644
--- a/repmgr.c
+++ b/repmgr.c
@@ -1561,7 +1561,7 @@ get_tablespace_data(PGconn *upstream_conn, TablespaceDataList *list)
 
 	sqlquery_snprintf(sqlquery,
 					  " SELECT spcname, oid, pg_tablespace_location(oid) AS spclocation "
-					  "   FROM pg_tablespace "
+					  "   FROM pg_catalog.pg_tablespace "
 					  "  WHERE spcname NOT IN ('pg_default', 'pg_global')");
 
 	res = PQexec(upstream_conn, sqlquery);
@@ -2195,7 +2195,7 @@ do_standby_clone(void)
 			{
 				sqlquery_snprintf(sqlquery,
 								  "SELECT spcname "
-								  "  FROM pg_tablespace "
+								  "  FROM pg_catalog.pg_tablespace "
 								  " WHERE pg_tablespace_location(oid) = '%s'",
 								  cell->old_dir);
 				res = PQexec(source_conn, sqlquery);
@@ -2230,7 +2230,7 @@ do_standby_clone(void)
 		sqlquery_snprintf(sqlquery,
 						  "  WITH dd AS ( "
 						  "    SELECT setting "
-						  "      FROM pg_settings "
+						  "      FROM pg_catalog.pg_settings "
 						  "     WHERE name = 'data_directory' "
 						  "  ) "
 						  "    SELECT ps.name, ps.setting, "
@@ -4516,15 +4516,15 @@ do_standby_archive_config(void)
 					  "WITH files AS ( "
 					  "  WITH dd AS ( "
 					  "    SELECT setting "
-					  "     FROM pg_settings "
+					  "     FROM pg_catalog.pg_settings "
 					  "    WHERE name = 'data_directory') "
 					  " SELECT distinct(sourcefile) AS config_file"
-					  "   FROM dd, pg_settings ps "
+					  "   FROM dd, pg_catalog.pg_settings ps "
 					  "  WHERE ps.sourcefile IS NOT NULL "
 					  "    AND ps.sourcefile ~ ('^' || dd.setting) "
 					  "     UNION "
 					  "  SELECT ps.setting  AS config_file"
-					  "    FROM dd, pg_settings ps "
+					  "    FROM dd, pg_catalog.pg_settings ps "
 					  "   WHERE ps.name IN ( 'config_file', 'hba_file', 'ident_file') "
 					  "     AND ps.setting ~ ('^' || dd.setting) "
 					  ") "