diff --git a/pkg/artifactstore/store_memory.go b/pkg/artifactstore/store_memory.go
index f626863..3f73528 100644
--- a/pkg/artifactstore/store_memory.go
+++ b/pkg/artifactstore/store_memory.go
@@ -39,7 +39,7 @@ func (store *InMemoryArtifactStore) SaveQueryPack(sessionId int, data []byte) (A
 	store.mu.Lock()
 	defer store.mu.Unlock()
 
-	key := fmt.Sprintf("%d", sessionId)
+	key := fmt.Sprintf("%d-packs", sessionId)
 	store.packs[key] = data
 
 	location := ArtifactLocation{
@@ -80,7 +80,7 @@ func (store *InMemoryArtifactStore) SaveResult(jobSpec common.JobSpec, data []by
 	store.mu.Lock()
 	defer store.mu.Unlock()
 
-	key := fmt.Sprintf("%d-%s", jobSpec.SessionID, jobSpec.NameWithOwner)
+	key := fmt.Sprintf("%d-results-%s", jobSpec.SessionID, jobSpec.NameWithOwner)
 	store.results[key] = data
 
 	location := ArtifactLocation{
diff --git a/pkg/artifactstore/store_minio.go b/pkg/artifactstore/store_minio.go
index 2e0abb3..96414d6 100644
--- a/pkg/artifactstore/store_minio.go
+++ b/pkg/artifactstore/store_minio.go
@@ -40,7 +40,7 @@ func (store *MinIOArtifactStore) GetQueryPack(location ArtifactLocation) ([]byte
 }
 
 func (store *MinIOArtifactStore) SaveQueryPack(jobId int, data []byte) (ArtifactLocation, error) {
-	key := fmt.Sprintf("%d", jobId)
+	key := fmt.Sprintf("%d-packs", jobId)
 	return store.saveArtifact(AF_BUCKETNAME_PACKS, key, data, "application/gzip")
 }
 
@@ -64,7 +64,7 @@ func (store *MinIOArtifactStore) GetResultSize(location ArtifactLocation) (int,
 	return int(objectInfo.Size), nil
 }
 func (store *MinIOArtifactStore) SaveResult(jobSpec common.JobSpec, data []byte) (ArtifactLocation, error) {
-	key := fmt.Sprintf("%d-%s", jobSpec.SessionID, jobSpec.NameWithOwner)
+	key := fmt.Sprintf("%d-results-%s", jobSpec.SessionID, jobSpec.NameWithOwner)
 	return store.saveArtifact(AF_BUCKETNAME_RESULTS, key, data, "application/zip")
 }
 
diff --git a/pkg/server/server.go b/pkg/server/server.go
index f4658a7..13e91e1 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -326,11 +326,13 @@ func (c *CommanderSingle) MRVAStatus(w http.ResponseWriter, r *http.Request) {
 }
 
 // Download artifacts
-func (c *CommanderSingle) MRVADownloadArtifactCommon(w http.ResponseWriter, r *http.Request, jobRepoId int, jobSpec common.JobSpec) {
+func (c *CommanderSingle) MRVADownloadArtifactCommon(w http.ResponseWriter,
+	r *http.Request, jobRepoId int, jobSpec common.JobSpec) {
 	slog.Debug("MRVA artifact download",
 		"codeql_variant_analysis_id", jobSpec.SessionID,
 		"repo_owner", jobSpec.NameWithOwner.Owner,
 		"repo_name", jobSpec.NameWithOwner.Repo,
+		"jobRepoId", jobRepoId,
 	)
 
 	c.sendArtifactDownloadResponse(w, jobRepoId, jobSpec)
@@ -424,7 +426,8 @@ func (c *CommanderSingle) MRVADownloadArtifact(w http.ResponseWriter, r *http.Re
 	c.MRVADownloadArtifactCommon(w, r, -1, jobSpec)
 }
 
-func (c *CommanderSingle) sendArtifactDownloadResponse(w http.ResponseWriter, jobRepoId int, jobSpec common.JobSpec) {
+func (c *CommanderSingle) sendArtifactDownloadResponse(w http.ResponseWriter,
+	jobRepoId int, jobSpec common.JobSpec) {
 	var response common.DownloadResponse
 
 	slog.Debug("Forming download response", "job", jobSpec)
@@ -511,6 +514,8 @@ func (c *CommanderSingle) sendArtifactDownloadResponse(w http.ResponseWriter, jo
 		return
 	}
 
+	slog.Debug("MRVA: Sending download response", "responseJson", responseJson)
+
 	// Send analysisReposJSON via ResponseWriter
 	w.Header().Set("Content-Type", "application/json")
 	w.Write(responseJson)