diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 425a2fd67c262c587136e274478af260665a4327..e62c9d4b917e0013c9108b8821e9cc24bbfd9a29 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,23 +20,33 @@ stages:          # List of stages for jobs, and their order of execution
   - test
   - deploy
 
-build-job:       # This job runs in the build stage, which runs first.
+#build-job:       # This job runs in the build stage, which runs first.
+#  stage: build
+#  before_script:
+#    - apk update && apk --update add build-base g++ libstdc++ cmake extra-cmake-modules bash mesa-gl mesa-egl mesa-gles wayland-dev wayland-protocols libxkbcommon-dev
+#  script:
+#    - mkdir build && cd build
+#    - cmake ..
+#    - make
+
+build:
   stage: build
+  image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/fedora:34
   before_script:
-    - apk update && apk --update add build-base g++ libstdc++ cmake extra-cmake-modules bash mesa-gl mesa-egl mesa-gles wayland-dev wayland-protocols libxkbcommon-dev
+    - dnf install -y cmake wayland-devel libxkbcommon-devel wayland-protocols-devel extra-cmake-modules glew-devel glm-devel
   script:
     - mkdir build && cd build
     - cmake ..
     - make
 
-unit-test-job:   # This job runs in the test stage.
-  stage: test    # It only starts when the job in the build stage completes successfully.
-  before_script:
-    - apk update && apk --update add build-base g++ libstdc++ cmake extra-cmake-modules bash mesa-gl wayland-dev wayland-protocols
-  script:
-    - mkdir build && cd build
-    - cmake .. && make # TODO cache build from previous step
-    - ./tests/testfggl/fggl_test
+#unit-test-job:   # This job runs in the test stage.
+#  stage: test    # It only starts when the job in the build stage completes successfully.
+#  before_script:
+#    - apk update && apk --update add build-base g++ libstdc++ cmake extra-cmake-modules bash mesa-gl wayland-dev wayland-protocols
+#  script:
+#    - mkdir build && cd build
+#    - cmake .. && make # TODO cache build from previous step
+#    - ./tests/testfggl/fggl_test
 
 #lint-test-job:   # This job also runs in the test stage.
 #  stage: test    # It can run at the same time as unit-test-job (in parallel).