diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 22feec6..7ee8bc5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,14 +14,13 @@ build_pycar_docker:
   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} -t vato.ddns.net:8083/pycar:latest pycar
+  except:
+    - tags
 
 deploy_pycar:
-  image: vato.ddns.net:8083/docker
+  extends: build_pycar_docker
   stage: deploy
-  script:
-    - echo ${DOCKER_PASSWORD} | docker login vato.ddns.net:8083 --username ${DOCKER_USERNAME} --password-stdin
+  after_script:
     - docker push vato.ddns.net:8083/pycar:latest
-  needs:
-    - build_pycar_docker
   only:
     - tags