diff --git a/extras/ci/gitlab-ci.yml b/extras/ci/gitlab-ci.yml
index 9fde07d557941ef7793ab501f1fdb05ad917ec41..b7d03a6b912c5c2b095b944f76f7793694dc5ca6 100644
--- a/extras/ci/gitlab-ci.yml
+++ b/extras/ci/gitlab-ci.yml
@@ -51,7 +51,7 @@ variables:
         HOST_ARCH: x86_64
         TRIPLET: $HOST_ARCH-w64-mingw32
 
-.variables-uwp-arm64: &variables-uwp-arm64
+.variables-win64-arm: &variables-win64-arm
         SHORTARCH: arm64
         HOST_ARCH: aarch64
         TRIPLET: $HOST_ARCH-w64-mingw32
@@ -164,30 +164,21 @@ win64-llvm:
         name: $VLC_WIN_LLVM_IMAGE
     variables: *variables-win64
 
-win64-ucrt-llvm:
+win64-arm-llvm:
     extends: .win-common
     image:
         name: $VLC_UWP_LLVM_IMAGE
     variables:
-        <<: *variables-win64
-        TRIPLET: $HOST_ARCH-ucrt-w64-mingw32
-        UWP_EXTRA_BUILD_FLAGS: -u -x -S 0x0A000006
-
-uwp64-libvlc-llvm:
-    extends: .win-common
-    image:
-        name: $VLC_UWP_LLVM_IMAGE
-    variables:
-        <<: *variables-win64
+        <<: *variables-win64-arm
         LIBVLC_EXTRA_BUILD_FLAGS: -z
         UWP_EXTRA_BUILD_FLAGS: -u -w -x
 
-uwp-arm64-libvlc-llvm:
+uwp64-libvlc-llvm:
     extends: .win-common
     image:
         name: $VLC_UWP_LLVM_IMAGE
     variables:
-        <<: *variables-uwp-arm64
+        <<: *variables-win64
         LIBVLC_EXTRA_BUILD_FLAGS: -z
         UWP_EXTRA_BUILD_FLAGS: -u -w -x