diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a9e277698..851a5a9df 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,9 @@ variables:
   PREFIX: /usr/
   RSYNC_OPTS: --recursive --ignore-missing-args --chown ${DEPLOY_USER}:${DEPLOY_USER}
   CRITERION_OPTS: --ignore-warnings
+  DOCKER_TAG: $CI_COMMIT_TAG
   DOCKER_TAG_DEV: ${CI_COMMIT_REF_NAME}
+  DOCKER_IMAGE: villas/node
   DOCKER_IMAGE_DEV: villas/node-dev
 
 stages:
@@ -194,13 +196,10 @@ deploy:packages:
 
 docker:
   stage: docker
-  variables:
-    DOCKER_IMAGE: villas/node
-    DOCKER_TAG: $CI_COMMIT_TAG
   script:
-    - mkdir -p build && cd build
-    - cmake ..
-    - make deploy-docker deploy-docker-dev
+    - docker build -f packaging/docker/Dockerfile.app -t ${DOCKER_IMAGE}:${DOCKER_TAG} .
+    - docker push ${DOCKER_IMAGE}:${DOCKER_TAG}
+    - docker push ${DOCKER_IMAGE_DEV}:${DOCKER_TAG_DEV}
   tags:
     - shell
     - linux