diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e28f0de..972b03c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -87,3 +87,15 @@ build-documentation:
       - master@openlp/runners
     changes:
       - Dockerfile.documentation
+
+build-all:
+  stage: build
+  script:
+    - |
+      for NAME in debian ubuntu fedora arch angular documentation; do
+        docker pull $IMAGE_BASE/$NAME || true
+        docker build --cache-from $IMAGE_BASE/$NAME --tag $IMAGE_BASE/$NAME:$CI_COMMIT_SHA --tag $IMAGE_BASE/$NAME:latest -f Dockerfile.$NAME .
+        docker push $IMAGE_BASE/$NAME:$CI_COMMIT_SHA
+        docker push $IMAGE_BASE/$NAME:latest
+      done
+  when: manual