diff --git a/internal/controller/postgrescluster/pgbackrest.go b/internal/controller/postgrescluster/pgbackrest.go
index cea0d3471e..48b68bcc7e 100644
--- a/internal/controller/postgrescluster/pgbackrest.go
+++ b/internal/controller/postgrescluster/pgbackrest.go
@@ -789,6 +789,7 @@ func (r *Reconciler) observeRestoreEnv(ctx context.Context,
 
 	restoreJobs := &batchv1.JobList{}
 	if err := r.Client.List(ctx, restoreJobs, &client.ListOptions{
+		Namespace:     cluster.Namespace,
 		LabelSelector: naming.PGBackRestRestoreJobSelector(cluster.GetName()),
 	}); err != nil {
 		return nil, nil, errors.WithStack(err)
@@ -836,8 +837,9 @@ func (r *Reconciler) observeRestoreEnv(ctx context.Context,
 			selector := naming.PGBackRestRestoreConfigSelector(cluster.GetName())
 			restoreConfigMaps := &corev1.ConfigMapList{}
 			if err := r.Client.List(ctx, restoreConfigMaps, &client.ListOptions{
+				Namespace:     cluster.Namespace,
 				LabelSelector: selector,
-			}, client.InNamespace(cluster.Namespace)); err != nil {
+			}); err != nil {
 				return nil, nil, errors.WithStack(err)
 			}
 			for i := range restoreConfigMaps.Items {
@@ -847,8 +849,9 @@ func (r *Reconciler) observeRestoreEnv(ctx context.Context,
 			}
 			restoreSecrets := &corev1.SecretList{}
 			if err := r.Client.List(ctx, restoreSecrets, &client.ListOptions{
+				Namespace:     cluster.Namespace,
 				LabelSelector: selector,
-			}, client.InNamespace(cluster.Namespace)); err != nil {
+			}); err != nil {
 				return nil, nil, errors.WithStack(err)
 			}
 			for i := range restoreSecrets.Items {
diff --git a/internal/controller/postgrescluster/pgbackrest_test.go b/internal/controller/postgrescluster/pgbackrest_test.go
index 3c4b434a2b..7da052e9c9 100644
--- a/internal/controller/postgrescluster/pgbackrest_test.go
+++ b/internal/controller/postgrescluster/pgbackrest_test.go
@@ -1371,6 +1371,7 @@ func TestReconcileManualBackup(t *testing.T) {
 
 					jobs := &batchv1.JobList{}
 					err := tClient.List(ctx, jobs, &client.ListOptions{
+						Namespace: postgresCluster.Namespace,
 						LabelSelector: naming.PGBackRestBackupJobSelector(clusterName,
 							tc.manual.RepoName, naming.BackupManual),
 					})
@@ -1417,6 +1418,7 @@ func TestReconcileManualBackup(t *testing.T) {
 					// just use a pgbackrest selector to check for the existence of any job since
 					// we might not have a repo name for tests within a manual backup defined
 					err := tClient.List(ctx, jobs, &client.ListOptions{
+						Namespace:     postgresCluster.Namespace,
 						LabelSelector: naming.PGBackRestSelector(clusterName),
 					})
 					assert.NilError(t, err)
@@ -3365,6 +3367,7 @@ func TestPrepareForRestore(t *testing.T) {
 
 				restoreJobs := &batchv1.JobList{}
 				assert.NilError(t, r.Client.List(ctx, restoreJobs, &client.ListOptions{
+					Namespace:     cluster.Namespace,
 					LabelSelector: naming.PGBackRestRestoreJobSelector(cluster.GetName()),
 				}))
 
diff --git a/internal/controller/postgrescluster/volumes.go b/internal/controller/postgrescluster/volumes.go
index 341b2c5c02..492f7d46dc 100644
--- a/internal/controller/postgrescluster/volumes.go
+++ b/internal/controller/postgrescluster/volumes.go
@@ -358,6 +358,7 @@ func (r *Reconciler) reconcileDirMoveJobs(ctx context.Context,
 
 		moveJobs := &batchv1.JobList{}
 		if err := r.Client.List(ctx, moveJobs, &client.ListOptions{
+			Namespace:     cluster.Namespace,
 			LabelSelector: naming.DirectoryMoveJobLabels(cluster.Name).AsSelector(),
 		}); err != nil {
 			return false, errors.WithStack(err)
diff --git a/internal/controller/postgrescluster/volumes_test.go b/internal/controller/postgrescluster/volumes_test.go
index 71bb0eb386..ac24d960ed 100644
--- a/internal/controller/postgrescluster/volumes_test.go
+++ b/internal/controller/postgrescluster/volumes_test.go
@@ -747,6 +747,7 @@ func TestReconcileMoveDirectories(t *testing.T) {
 
 	moveJobs := &batchv1.JobList{}
 	err = r.Client.List(ctx, moveJobs, &client.ListOptions{
+		Namespace:     cluster.Namespace,
 		LabelSelector: naming.DirectoryMoveJobLabels(cluster.Name).AsSelector(),
 	})
 	assert.NilError(t, err)