diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1a43b33cc131318364973f30b51b97d05fd61753..b4a3a26a0911aecc2822d887464a1e52e12bb9e8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,15 +29,16 @@ stages:          # List of stages for jobs, and their order of execution
 #    - cmake ..
 #    - make
 
-.fedora-wayland:
+.f34-ogl:
   image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/fedora:34
   before_script:
-    - dnf install -y cmake wayland-devel libxkbcommon-devel wayland-protocols-devel extra-cmake-modules glew-devel glm-devel
+    - dnf install -y cmake extra-cmake-modules glew-devel glm-devel
 
-build:fedora-wayland:
-  extends: .fedora-wayland
+build:f34-repo-wayland:
+  extends: .f34-ogl
   stage: build
   script:
+    - dnf install -y glfw-devel
     - mkdir build && cd build
     - cmake ..
     - make
@@ -45,15 +46,27 @@ build:fedora-wayland:
     paths:
       - build/fggl/
       - build/tests/
-      - build/demos/
 
-test:fedora-wayland:
-  extends: .fedora-wayland
+build:f34-fallback-wayland:
+  extends: .f34-ogl
+  stage: build
+  script:
+    - dnf install -y wayland-devel wayland-protocols-devel libxkbcommon-devel
+    - mkdir build && cd build
+    - cmake ..
+    - make
+  artifacts:
+    paths:
+      - build/fggl/
+      - build/tests/
+
+test:f34-fallback-wayland:
+  extends: .f34-ogl
   stage: test
   script:
     - cd build && ./tests/testfggl/fggl_test
   dependencies:
-    - build:fedora-wayland
+    - build:f34-fallback-wayland
 
 #unit-test-job:   # This job runs in the test stage.
 #  stage: test    # It only starts when the job in the build stage completes successfully.