diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 40daa8d03991339c24d6e09cebb30e542ce01ef1..01b7866429c1cb6ff2807d5fb2ae3989f8001856 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,31 @@
 stages:
-    - run-opc-ua-test
-
-
+ - image
+ - run-opc-ua-test
+docker-build:
+  stage: image
+  image: docker:latest
+  tags:
+    - privileged
+  only:
+    refs:
+      - master
+  services:
+    - docker:dind
+  variables:
+    DOCKER_TLS_CERTDIR: "/certs"
+  before_script:
+    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+  script:
+    - |
+      if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then
+        tag=""
+        echo "Running on default branch '$CI_DEFAULT_BRANCH': tag = 'latest'"
+      else
+        tag=":$CI_COMMIT_REF_SLUG"
+        echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
+      fi
+    - docker build --pull -t "$CI_REGISTRY_IMAGE${tag}" .
+    - docker push "$CI_REGISTRY_IMAGE${tag}"
 run-opc-ua-test:
     tags: 
         - sdptr
@@ -10,6 +34,3 @@ run-opc-ua-test:
         - echo "Running OPC UA tests"
         - sleep 60
         - echo "Done"
-
-
-