diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8d42da6..9519ade 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,35 @@
+.docker-build:
+  stage: build
+  image:
+    name: gcr.io/kaniko-project/executor:v1.23.2-debug
+    entrypoint: [ "" ]
+  script:
+  - /kaniko/executor --context "${CI_PROJECT_DIR}" --build-arg "GITLAB_USER=${CI_DEPLOY_USER}" --build-arg "GITLAB_PASSWORD=${CI_DEPLOY_PASSWORD}" --dockerfile "${CI_PROJECT_DIR}/Dockerfile" --destination "${IMAGE_TAG}" --cache=true --cache-ttl 24h
+  allow_failure: false
+
+docker-build:staging:
+  extends: .docker-build
+  variables:
+    IMAGE_TAG: "${CI_REGISTRY_IMAGE}:s-${CI_COMMIT_SHA}"
+  rules:
+  - if: $CI_COMMIT_BRANCH == "trunk"
+    when: manual
+    allow_failure: true
+
+docker-build:latest:
+  extends: .docker-build
+  variables:
+    IMAGE_TAG: "${CI_REGISTRY_IMAGE}:p-${CI_COMMIT_SHA}"
+  rules:
+  - if: $CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "master"
+    when: manual
+    allow_failure: true
+
 include:
-  - project: "ldc-web/shared-ci"
-    ref: "main"
-    file: "build/docker-multistage.yml"
-  - project: "ldc-web/shared-ci"
-    ref: "main"
-    file: "deploy/deploy.yml"
+- project: 'ldc-web/shared-ci'
+  ref: 'main'
+  file: 'deploy/deploy.yml'
 
 stages:
-  - build
-  - deploy
+- build
+- deploy