diff --git a/meta-arm/.gitlab-ci.yml b/meta-arm/.gitlab-ci.yml
index a2af871..4a786f6 100644
--- a/meta-arm/.gitlab-ci.yml
+++ b/meta-arm/.gitlab-ci.yml
@@ -104,6 +104,14 @@
 #  VIRT: [none, xen]
 #  TESTING: testimage
 
+corstone500:
+  extends: .build
+  parallel:
+    matrix:
+      - TESTING: testimage
+  tags:
+    - x86_64
+
 corstone1000-fvp:
   extends: .build
   parallel:
@@ -154,7 +162,6 @@
   parallel:
     matrix:
       - TS: [none, n1sdp-ts]
-      - OPTEE: [none, n1sdp-optee]
 
 qemu-generic-arm64:
   extends: .build