diff --git a/.changelog/15372.txt b/.changelog/15372.txt
new file mode 100644
index 000000000000..e44c391da420
--- /dev/null
+++ b/.changelog/15372.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+csi: Fixed a bug where volumes in non-default namespaces could not be scheduled for system or sysbatch jobs
+```
diff --git a/scheduler/stack.go b/scheduler/stack.go
index d2b546107f73..3eb9fcbea90e 100644
--- a/scheduler/stack.go
+++ b/scheduler/stack.go
@@ -299,6 +299,8 @@ func (s *SystemStack) SetJob(job *structs.Job) {
 	s.distinctPropertyConstraint.SetJob(job)
 	s.binPack.SetJob(job)
 	s.ctx.Eligibility().SetJob(job)
+	s.taskGroupCSIVolumes.SetNamespace(job.Namespace)
+	s.taskGroupCSIVolumes.SetJobID(job.ID)
 
 	if contextual, ok := s.quota.(ContextualIterator); ok {
 		contextual.SetJob(job)