diff --git a/.github/workflows/nfr.yml b/.github/workflows/nfr.yml
index 1a4e454b1..cf21801b9 100644
--- a/.github/workflows/nfr.yml
+++ b/.github/workflows/nfr.yml
@@ -134,7 +134,7 @@ jobs:
         uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
         with:
           name: results-${{ matrix.type }}
-          path: tests/results/
+          path: tests/results/**/*-${{ matrix.type }}.*
 
       - name: Cleanup
         working-directory: ./tests
diff --git a/tests/framework/results.go b/tests/framework/results.go
index f24bcf422..ac65569d1 100644
--- a/tests/framework/results.go
+++ b/tests/framework/results.go
@@ -35,7 +35,7 @@ func CreateResultsFile(filename string) (*os.File, error) {
 
 // CreateResultsFilename returns the name of the results file.
 func CreateResultsFilename(ext, base string, plusEnabled bool) string {
-	name := fmt.Sprintf("%s.%s", base, ext)
+	name := fmt.Sprintf("%s-oss.%s", base, ext)
 	if plusEnabled {
 		name = fmt.Sprintf("%s-plus.%s", base, ext)
 	}
diff --git a/tests/results/dp-perf/edge/edge.md b/tests/results/dp-perf/edge/edge-oss.md
similarity index 100%
rename from tests/results/dp-perf/edge/edge.md
rename to tests/results/dp-perf/edge/edge-oss.md
diff --git a/tests/results/ngf-upgrade/edge/edge.md b/tests/results/ngf-upgrade/edge/edge-oss.md
similarity index 100%
rename from tests/results/ngf-upgrade/edge/edge.md
rename to tests/results/ngf-upgrade/edge/edge-oss.md
diff --git a/tests/results/ngf-upgrade/edge/http.png b/tests/results/ngf-upgrade/edge/http-oss.png
similarity index 100%
rename from tests/results/ngf-upgrade/edge/http.png
rename to tests/results/ngf-upgrade/edge/http-oss.png
diff --git a/tests/results/ngf-upgrade/edge/https.png b/tests/results/ngf-upgrade/edge/https-oss.png
similarity index 100%
rename from tests/results/ngf-upgrade/edge/https.png
rename to tests/results/ngf-upgrade/edge/https-oss.png
diff --git a/tests/results/scale/edge/TestScale_HTTPRoutes/cpu.png b/tests/results/scale/edge/TestScale_HTTPRoutes/cpu-oss.png
similarity index 100%
rename from tests/results/scale/edge/TestScale_HTTPRoutes/cpu.png
rename to tests/results/scale/edge/TestScale_HTTPRoutes/cpu-oss.png
diff --git a/tests/results/scale/edge/TestScale_HTTPRoutes/memory.png b/tests/results/scale/edge/TestScale_HTTPRoutes/memory-oss.png
similarity index 100%
rename from tests/results/scale/edge/TestScale_HTTPRoutes/memory.png
rename to tests/results/scale/edge/TestScale_HTTPRoutes/memory-oss.png
diff --git a/tests/results/scale/edge/TestScale_HTTPRoutes/ttr.png b/tests/results/scale/edge/TestScale_HTTPRoutes/ttr-oss.png
similarity index 100%
rename from tests/results/scale/edge/TestScale_HTTPRoutes/ttr.png
rename to tests/results/scale/edge/TestScale_HTTPRoutes/ttr-oss.png
diff --git a/tests/results/scale/edge/TestScale_HTTPSListeners/cpu.png b/tests/results/scale/edge/TestScale_HTTPSListeners/cpu-oss.png
similarity index 100%
rename from tests/results/scale/edge/TestScale_HTTPSListeners/cpu.png
rename to tests/results/scale/edge/TestScale_HTTPSListeners/cpu-oss.png
diff --git a/tests/results/scale/edge/TestScale_HTTPSListeners/memory.png b/tests/results/scale/edge/TestScale_HTTPSListeners/memory-oss.png
similarity index 100%
rename from tests/results/scale/edge/TestScale_HTTPSListeners/memory.png
rename to tests/results/scale/edge/TestScale_HTTPSListeners/memory-oss.png
diff --git a/tests/results/scale/edge/TestScale_HTTPSListeners/ttr.png b/tests/results/scale/edge/TestScale_HTTPSListeners/ttr-oss.png
similarity index 100%
rename from tests/results/scale/edge/TestScale_HTTPSListeners/ttr.png
rename to tests/results/scale/edge/TestScale_HTTPSListeners/ttr-oss.png
diff --git a/tests/results/scale/edge/TestScale_Listeners/cpu.png b/tests/results/scale/edge/TestScale_Listeners/cpu-oss.png
similarity index 100%
rename from tests/results/scale/edge/TestScale_Listeners/cpu.png
rename to tests/results/scale/edge/TestScale_Listeners/cpu-oss.png
diff --git a/tests/results/scale/edge/TestScale_Listeners/memory.png b/tests/results/scale/edge/TestScale_Listeners/memory-oss.png
similarity index 100%
rename from tests/results/scale/edge/TestScale_Listeners/memory.png
rename to tests/results/scale/edge/TestScale_Listeners/memory-oss.png
diff --git a/tests/results/scale/edge/TestScale_Listeners/ttr.png b/tests/results/scale/edge/TestScale_Listeners/ttr-oss.png
similarity index 100%
rename from tests/results/scale/edge/TestScale_Listeners/ttr.png
rename to tests/results/scale/edge/TestScale_Listeners/ttr-oss.png
diff --git a/tests/results/scale/edge/TestScale_UpstreamServers/cpu.png b/tests/results/scale/edge/TestScale_UpstreamServers/cpu-oss.png
similarity index 100%
rename from tests/results/scale/edge/TestScale_UpstreamServers/cpu.png
rename to tests/results/scale/edge/TestScale_UpstreamServers/cpu-oss.png
diff --git a/tests/results/scale/edge/TestScale_UpstreamServers/memory.png b/tests/results/scale/edge/TestScale_UpstreamServers/memory-oss.png
similarity index 100%
rename from tests/results/scale/edge/TestScale_UpstreamServers/memory.png
rename to tests/results/scale/edge/TestScale_UpstreamServers/memory-oss.png
diff --git a/tests/results/scale/edge/edge.md b/tests/results/scale/edge/edge-oss.md
similarity index 100%
rename from tests/results/scale/edge/edge.md
rename to tests/results/scale/edge/edge-oss.md