diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 55e117f..d010201 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,32 @@
 stages:
+  - build-images
   - build
   - release
   - deploy
 
+Build Docker Images:
+  stage: build-images
+  when: manual
+  image: docker
+  services:
+    - docker-dind
+  parallel:
+    matrix:
+      - DISTRO:
+          - debian11
+          - ubuntu20
+          - ubuntu21
+          - ubuntu22
+          - mint20
+          - fedora34
+          - fedora35
+          - macos-x86_64
+          - macos-aarch64
+  script:
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - make docker-$DISTRO
+    - docker push $CI_REGISTRY/librewolf-community/browser/bsys5/$DISTRO:latest
+
 Build:
   stage: build
   when: manual
@@ -34,7 +58,7 @@ Build:
     - echo VERSION=$(cat version) >> variables.env
     - echo RELEASE=$(cat release) >> variables.env
     - echo SOURCE_RELEASE=$(cat source_release) >> variables.env
-    - 't=$(cat version)-$(cat source_release) ; grep 1 release ; if [ ! $? ]; then t=$(cat version)-$(cat source_release)-$(cat release); fi; echo FILEVER=$t >> variables.env'
+    - "t=$(cat version)-$(cat source_release) ; grep 1 release ; if [ ! $? ]; then t=$(cat version)-$(cat source_release)-$(cat release); fi; echo FILEVER=$t >> variables.env"
   artifacts:
     paths:
       - librewolf-*.deb