diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ce3b29c..2203cb0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,6 +16,7 @@ stages:
   - prepare
   - build
   - test
+  - deploy
   
 prepare:
   stage: prepare
@@ -49,3 +50,17 @@ test_job:
     - build_job
   tags:
     - docker
+
+deploy:docker:
+  stage: deploy
+  script:
+    - docker build -t ${DOCKER_IMAGE} -f packaging/docker/Dockerfile .
+    - docker tag villas/web:${DOCKER_TAG} villas/web:latest
+    - docker push villas/web:${DOCKER_TAG}
+    - docker push villas/web:latest
+  tags:
+    - shell
+    - linux
+  only:
+    refs:
+      - master