diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9340773cc818c9ea58086fae534f21fd9d0cee34..a93b35b73e55278eb1ce037b4a365708fb9ff4b7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,33 @@
 stages:
   - lint
+  - build
+  - deploy
 
 flake8:
   image: "python:latest"
   stage: lint
   script:
     - pip install flake8
-    - flake8
\ No newline at end of file
+    - flake8
+
+build-docker-image:
+  stage: build
+  image:
+    name: gitlab-registry.cern.ch/ci-tools/docker-image-builder
+    entrypoint: [""]
+  script:
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+    - /kaniko/executor
+      --context "${CI_PROJECT_DIR}"
+      --dockerfile "${CI_PROJECT_DIR}/Dockerfile"
+      --destination "${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG}"
+
+deploy:
+  stage: deploy
+  variables:
+    APP_NAME: data-management-updater
+    OPENSHIFT_SERVER: https://api.paas.okd.cern.ch
+    NAMESPACE: caimira-data-service
+  image: gitlab-registry.cern.ch/paas-tools/openshift-client:latest
+  script:
+    - oc tag --source=docker ${CI_REGISTRY_IMAGE}:latest ${APP_NAME}:latest --token ${DEPLOY_TOKEN} --server=${OPENSHIFT_SERVER} -n ${NAMESPACE}