diff --git a/gitlab/build.yml b/gitlab/build.yml
index 49e69d57..c10d64a6 100644
--- a/gitlab/build.yml
+++ b/gitlab/build.yml
@@ -25,5 +25,15 @@
     paths:
       - artifacts
 
-build:
+build-radv:
   extends: .build
+  tags:
+    - amd-gpu
+  variables:
+    VK_LOADER_DRIVERS_SELECT: 'radeon_*'
+
+build-llvmpipe:
+  extends: .build
+  allow_failure: true
+  variables:
+    VK_LOADER_DRIVERS_SELECT: 'lvp_*'
diff --git a/gitlab/image.docker b/gitlab/image.docker
index afc0dd1b..dd6923cb 100644
--- a/gitlab/image.docker
+++ b/gitlab/image.docker
@@ -35,6 +35,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
     cd ../.. && \
     rm -rf wine && \
     apt-get clean && \
-    useradd -m gitlab
+    groupadd host-render -g 800 && \
+    useradd -m gitlab -G host-render
 
 USER gitlab