diff --git a/.gitlab-ci/vkd3d-proton/run.sh b/.gitlab-ci/vkd3d-proton/run.sh
index 203e0e18225..6f5ceb49da2 100755
--- a/.gitlab-ci/vkd3d-proton/run.sh
+++ b/.gitlab-ci/vkd3d-proton/run.sh
@@ -67,8 +67,8 @@ then
     grep "Test failed" "$RESULTS"/vkd3d-proton.log > "$RESULTSFILE"
 
     # Gather the list expected failures
-    if [ -f "$INSTALL/$VKD3D_PROTON_RESULTS.txt" ]; then
-        cp "$INSTALL/$VKD3D_PROTON_RESULTS.txt" \
+    if [ -f "$INSTALL/$VKD3D_PROTON_RESULTS-vkd3d.txt" ]; then
+        cp "$INSTALL/$VKD3D_PROTON_RESULTS-vkd3d.txt" \
            ".gitlab-ci/vkd3d-proton/$VKD3D_PROTON_RESULTS.txt.baseline"
     else
         touch ".gitlab-ci/vkd3d-proton/$VKD3D_PROTON_RESULTS.txt.baseline"
diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml
index 81a37630355..8d8a1185ae0 100644
--- a/src/amd/ci/gitlab-ci-inc.yml
+++ b/src/amd/ci/gitlab-ci-inc.yml
@@ -391,4 +391,4 @@
     - .kabini-test-valve
     - .radv-valve-manual-rules
   variables:
-    VKD3D_PROTON_RESULTS: radv-kabini-vkd3d
+    VKD3D_PROTON_RESULTS: radv-kabini
diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml
index 181d87b5102..5f34adfdfe4 100644
--- a/src/amd/ci/gitlab-ci.yml
+++ b/src/amd/ci/gitlab-ci.yml
@@ -320,7 +320,7 @@ vkd3d-tahiti-valve:
     - .tahiti-test-valve
     - .radv-valve-manual-rules
   variables:
-    VKD3D_PROTON_RESULTS: radv-tahiti-vkd3d
+    VKD3D_PROTON_RESULTS: radv-tahiti
     # These vkd3d-proton tests are skipped because they trigger GPU hangs.
     VKD3D_TEST_EXCLUDE: test_execute_indirect_state,test_execute_indirect_state_predication,test_undefined_descriptor_heap_mismatch_types
 
@@ -330,7 +330,7 @@ vkd3d-polaris10-valve:
     - .polaris10-test-valve-kws
     - .radv-valve-manual-rules
   variables:
-    VKD3D_PROTON_RESULTS: radv-polaris10-vkd3d
+    VKD3D_PROTON_RESULTS: radv-polaris10
 
 vkd3d-vega10-valve:
   extends:
@@ -338,7 +338,7 @@ vkd3d-vega10-valve:
     - .vega10-test-valve
     - .radv-valve-manual-rules
   variables:
-    VKD3D_PROTON_RESULTS: radv-vega10-vkd3d
+    VKD3D_PROTON_RESULTS: radv-vega10
 
 vkd3d-renoir-valve:
   extends:
@@ -346,7 +346,7 @@ vkd3d-renoir-valve:
     - .renoir-test-valve
     - .radv-valve-manual-rules
   variables:
-    VKD3D_PROTON_RESULTS: radv-renoir-vkd3d
+    VKD3D_PROTON_RESULTS: radv-renoir
 
 vkd3d-navi10-valve:
   extends:
@@ -354,7 +354,7 @@ vkd3d-navi10-valve:
     - .navi10-test-valve-mupuf
     - .radv-valve-manual-rules
   variables:
-    VKD3D_PROTON_RESULTS: radv-navi10-vkd3d
+    VKD3D_PROTON_RESULTS: radv-navi10
 
 vkd3d-navi21-valve:
   extends:
@@ -362,7 +362,7 @@ vkd3d-navi21-valve:
     - .navi21-test-valve
     - .radv-valve-manual-rules
   variables:
-    VKD3D_PROTON_RESULTS: radv-navi21-vkd3d
+    VKD3D_PROTON_RESULTS: radv-navi21
 
 vkd3d-vangogh-valve:
   extends:
@@ -370,7 +370,7 @@ vkd3d-vangogh-valve:
     - .vangogh-test-valve
     - .radv-valve-manual-rules
   variables:
-    VKD3D_PROTON_RESULTS: radv-vangogh-vkd3d
+    VKD3D_PROTON_RESULTS: radv-vangogh
 
 vkd3d-navi31-valve:
   extends:
@@ -378,4 +378,4 @@ vkd3d-navi31-valve:
     - .navi31-test-valve
     - .radv-valve-manual-rules
   variables:
-    VKD3D_PROTON_RESULTS: radv-navi31-vkd3d
+    VKD3D_PROTON_RESULTS: radv-navi31