diff --git a/scripts/ci/config/devices.yaml b/scripts/ci/config/devices.yaml
index ea23cd59cec3c70d0e99f6ff3e126980f9564e85..46c183372cab5e6b8596e6d788ba50986ae15ba6 100644
--- a/scripts/ci/config/devices.yaml
+++ b/scripts/ci/config/devices.yaml
@@ -32,12 +32,6 @@
     DEVICE_ID: "mi100"
     TARGET: "HIP"
 
-
-.x862630v4:
-  variables:
-    DEVICE_ID: "x862630v4"
-    TARGET: "CPU"
-
 .epyc7502:
   variables:
     DEVICE_ID: "epyc7502"
diff --git a/scripts/ci/config/main.yaml b/scripts/ci/config/main.yaml
index bd8fa2dd88c4eeb92d5f0506055555bb813fbe9a..f5ecfdbebeb1f645396c988d8a8013460b9afd0c 100644
--- a/scripts/ci/config/main.yaml
+++ b/scripts/ci/config/main.yaml
@@ -56,25 +56,19 @@ mi100:
     - .mi100
     - .run_job
 
-x862630v4:
+epyc7502:
   extends:
-    - .x862630v4
+    - .epyc7502
     - .run_job
-x862630v4-run-changes:
+epyc7502-run-changes:
   extends:
-    - .x862630v4
+    - .epyc7502
     - .run_toggle_run_changes
   stage: run
-
-epyc7502:
-  extends:
-    - .epyc7502
-    - .run_job
-
+  
 .device-jobs:
   dependencies:
     - epyc7502
-    - x862630v4
     - mi100
     - a6000
     - a5000
@@ -98,7 +92,7 @@ run-changes:
     - .test_run_changes
     - .default_rules_always_run
   dependencies:
-    - x862630v4-run-changes
+    - epyc7502-run-changes
     - geforcertx2080ti-run-changes
   # FIXME! Remove as soon as indeterminate behaviour can be fixed.
   allow_failure: 
@@ -190,25 +184,19 @@ HIP:
 
 
 # CPU
-x862630v4-full:
+epyc7502-full:
   extends:
-    - .x862630v4
+    - .epyc7502
     - .run_jobs_full
     - .cpu_run_job
-x862630v4-full-run-changes:
+epyc7502-full-run-changes:
   extends:
-    - .x862630v4
+    - .epyc7502
     - .run_toggle_run_changes
     - .default_rules_always_run
     - .cpu_run_job
   stage: "run full"
 
-epyc7502-full:
-  extends:
-    - .epyc7502
-    - .run_jobs_full
-    - .cpu_run_job
-
 
 # GPU / CUDA
 geforcertx3090-full:
@@ -265,7 +253,6 @@ mi100-full:
   # is 50. See https://docs.gitlab.com/ee/ci/yaml/#changing-the-needs-job-limit
   dependencies:
     # CPU
-    - x862630v4-full
     - epyc7502-full
 
     # HIP
@@ -300,7 +287,7 @@ run-changes-full:
     - .default_rules_always_run
   dependencies:
     # add run changes jobs here
-    - x862630v4-full-run-changes
+    - epyc7502-full-run-changes
     - geforcertx2080ti-full-run-changes
   # FIXME! Remove once the intederminate behaviour is fixed.
   allow_failure: