diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c20c282c9..e690d97f4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -308,8 +308,8 @@ xf86-driver-build-test:
               SHA: master
             - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-i740
               SHA: master
-            - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel
-              SHA: incubate # temporary
+            - REPO: https://gitlab.freedesktop.org/metux/xf86-video-intel
+              SHA: submit/fixes-for-xserver # temporary
             - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-mach64
               SHA: master
             - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-mga
@@ -322,8 +322,8 @@ xf86-driver-build-test:
               SHA: master
             - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-nv
               SHA: master
-            - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-qxl
-              SHA: e0bd955e18db0e53f8dce72b827ee4beb4afc79d # no release yet
+            - REPO: https://gitlab.freedesktop.org/metux/xf86-video-qxl
+              SHA: incubate # metux -- no release yet
             - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-r128
               SHA: master
             - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-rendition
@@ -332,8 +332,8 @@ xf86-driver-build-test:
               SHA: master
             - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-savage
               SHA: master
-            - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-siliconmotion
-              SHA: master
+            - REPO: https://gitlab.freedesktop.org/metux/xf86-video-siliconmotion
+              SHA: wip/ci
             - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis
               SHA: master
             - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-sisusb
@@ -354,8 +354,8 @@ xf86-driver-build-test:
               SHA: master
             - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-trident
               SHA: master
-            - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-v4l
-              SHA: master
+            - REPO: https://gitlab.freedesktop.org/metux/xf86-video-v4l
+              SHA: incubate
             - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-vbox
               SHA: master
             - REPO: https://gitlab.freedesktop.org/xorg/driver/xf86-video-vesa