diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 67a6660..5082014 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,23 +1,27 @@
 pages:
-    image: agners/archlinuxarm-arm64v8:latest
+    image: archlinux:latest
     interruptible: true
-    only:
-        - master
+    rules:
+        - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
     before_script:
         - pacman --needed --noconfirm -Syu zola
     script:
         - zola build
-        # Fall back to GitLab pages 404 site and delete unwanted robot pages
-        - rm public/404.html public/sitemap.xml public/robots.txt
     artifacts:
         paths:
             - public
+        exclude:
+            - public/404.html
+            - public/sitemap.xml
+            - public/robots.txt
 
 basic-zola-test:
-    image: agners/archlinuxarm-arm64v8:latest
+    image: archlinux:latest
     interruptible: true
-    except:
-        - master
+    rules:
+        - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+        - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+          when: never
     before_script:
         - pacman --needed --noconfirm -Syu zola
     script: