diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1b22ce3..c318bca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,31 +1,45 @@
 stages:
   - build
-  - deploy
 
 variables:
   REGISTRY_HOST: "10.10.10.10:5050"
   IMAGE_NAME: "$REGISTRY_HOST/$CI_PROJECT_PATH"
-  DOCKER_IMAGE: "$IMAGE_NAME:$CI_COMMIT_REF_SLUG"
-  CONTAINER_NAME: "daily-briefing-running"
 
-build-image:
+docker-build:
   stage: build
-  tags:
-    - shell
+  image:
+    name: gcr.io/kaniko-project/executor:v1.23.2-debug
+    entrypoint: [""]
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH
+  before_script:
+    - mkdir -p /kaniko/.docker
+    - |
+      cat > /kaniko/.docker/config.json <<EOF
+      {
+        "auths": {
+          "$REGISTRY_HOST": {
+            "username": "$CI_REGISTRY_USER",
+            "password": "$CI_REGISTRY_PASSWORD"
+          }
+        }
+      }
+      EOF
   script:
-    - echo "$CI_REGISTRY_PASSWORD" | docker login "$REGISTRY_HOST" -u "$CI_REGISTRY_USER" --password-stdin
-    - docker build -t $DOCKER_IMAGE .
-    - docker push $DOCKER_IMAGE
+    - |
+      TAG="$CI_COMMIT_REF_SLUG"
+      DESTINATIONS="--destination=$IMAGE_NAME:$CI_COMMIT_SHA --destination=$IMAGE_NAME:$TAG"
+      if [ "$CI_COMMIT_REF_NAME" = "master" ]; then
+        DESTINATIONS="$DESTINATIONS --destination=$IMAGE_NAME:latest"
+      fi
 
-deploy-container:
-  stage: deploy
-  tags:
-    - vm-deploy
-  script:
-    - echo "$CI_REGISTRY_PASSWORD" | docker login "$REGISTRY_HOST" -u "$CI_REGISTRY_USER" --password-stdin
-    - docker pull $DOCKER_IMAGE
-    - docker stop $CONTAINER_NAME || true
-    - docker rm $CONTAINER_NAME || true
-    - docker run -d --name $CONTAINER_NAME -p 8080:8080 --restart always $DOCKER_IMAGE
-  only:
-    - master
+      echo "Building daily-briefing for ref $CI_COMMIT_REF_NAME with tag $TAG"
+      echo "Using registry image: $IMAGE_NAME"
+
+      /kaniko/executor \
+        --context "$CI_PROJECT_DIR" \
+        --dockerfile "$CI_PROJECT_DIR/Dockerfile" \
+        --insecure \
+        --insecure-registry "$REGISTRY_HOST" \
+        --skip-tls-verify-registry "$REGISTRY_HOST" \
+        $DESTINATIONS
diff --git a/static/.gitkeep b/static/.gitkeep
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/static/.gitkeep
@@ -0,0 +1 @@
+