diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1caef68..9de3257 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,26 @@
+stages:
+  - build
+  - deploy
 
-build:
+build_pycar:
+  image: vato.ddns.net:8083/python:3
+  stage: build
+  script:
+    - cd pycar && python setup.py bdist_wheel && cd ..
+
+build_pycar_docker:
   image: vato.ddns.net:8083/docker
   stage: build
   script:
     - echo ${DOCKER_PASSWORD} | docker login vato.ddns.net:8083 --username ${DOCKER_USERNAME} --password-stdin
-    - docker build -f pycar/Dockerfile --build-arg PYPI_USERNAME=${PYPI_USERNAME} --build-arg PYPI_PASSWORD=${PYPI_PASSWORD} pycar
+    - docker build -f pycar/Dockerfile --build-arg PYPI_USERNAME=${PYPI_USERNAME} --build-arg PYPI_PASSWORD=${PYPI_PASSWORD} -t vato.ddns.net:8083/pycar:latest pycar
+
+deploy_pycar:
+  image: vato.ddns.net:8083/docker
+  stage: deploy
+  script:
+    - docker publish vato.ddns.net:8083/pycar:latest
+  needs:
+    - build_pycar_docker
+  only:
+    - tags