diff --git a/LTA/LTAIngest/LTAIngestServer/LTAIngestAdminServer/lib/ingestjobmanagementserver.py b/LTA/LTAIngest/LTAIngestServer/LTAIngestAdminServer/lib/ingestjobmanagementserver.py
index 925ed8829ba08086fb944cc7b94251439c781a09..953436f3feee12504123160da5be4ccf03c2ea8b 100644
--- a/LTA/LTAIngest/LTAIngestServer/LTAIngestAdminServer/lib/ingestjobmanagementserver.py
+++ b/LTA/LTAIngest/LTAIngestServer/LTAIngestAdminServer/lib/ingestjobmanagementserver.py
@@ -214,14 +214,12 @@ class IngestJobManager:
                                retry_attempt=job_admin_dict.get('retry_attempt', 1))
 
         base_dir = self.jobStatusBaseDir(job_status)
+        group_dir = '%s_%s' % (job_type, job_group_id)
 
         if job_status == JobRetry and retry_attempt != None:
-            return os.path.join(base_dir, str(retry_attempt))
-        elif job_status in [JobProduced, JobRemoved, JobFailed]:
-            group_dir = '%s_%s' % (job_type, job_group_id)
-            return os.path.join(base_dir, group_dir)
+            return os.path.join(base_dir, group_dir, str(retry_attempt))
 
-        return base_dir
+        return os.path.join(base_dir, group_dir)
 
     def jobPath(self, job_admin_dict):
         dir = self.jobDir(job_admin_dict)