diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 09d5f73..c5e5fa7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,29 +10,34 @@ stages:
 
 build:
   stage: build
+  image: $CI_REGISTRY/$CI_PROJECT_ROOT_NAMESPACE/ci-tools/docker/ci-tools-docker-node-14:1.0.0
+  variables:
+    MODULE_DIRS: lang styles
+    MODULE_ZIP_DIRS: elements lang styles
+  extends: .build
+
+.build:
+  stage: build
+  image: $CI_REGISTRY/$CI_PROJECT_ROOT_NAMESPACE/ci-tools/docker/ci-tools-docker-node-14:1.0.0
   before_script:
-    - apt update
-    - apt install -y zip
-  script:
     - npm ci
     - npm run build
-    - mkdir -p dist/lang
-    - mkdir -p dist/styles
-    - cp lang/* dist/lang/
-    - cp styles/* dist/styles/
+  script:
+    - cp -r $MODULE_DIRS dist/
     - cp module.json dist
     - cd dist
-    - zip wfrp4e-actor-sheet-print.zip -r *.* elements lang styles -x ".*"
+    - zip $CI_COMMIT_REF_NAME.zip -r *.* $MODULE_ZIP_DIRS -x ".*"
   artifacts:
-    name: wfrp4e-actor-sheet-print
+    name: $CI_COMMIT_REF_NAME
     when: on_success
     paths:
-      - dist/wfrp4e-actor-sheet-print.zip
+      - dist/$CI_COMMIT_REF_NAME.zip
       - dist/module.json
     expire_in: 1 day
   only:
     - tags
     - master
+    - main
 
 release:
   stage: release