diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7c68b80..1f32fba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,16 +13,13 @@ build_pycar_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} -t vato.ddns.net:8083/pycar:latest pycar
-  except:
-    - tags
+    - docker build -f pycar/Dockerfile --build-arg PYPI_USERNAME=${PYPI_USERNAME} --build-arg PYPI_PASSWORD=${PYPI_PASSWORD} -t vato.ddns.net:8082/pycar:latest pycar
 
 deploy_pycar:
-  extends: build_pycar_docker
   stage: deploy
-  after_script:
-    - docker push vato.ddns.net:8083/pycar:latest
-  except:
-    - branches
+  script:
+    - docker push vato.ddns.net:8082/pycar:latest
+  needs:
+    - build_pycar_docker
   only:
     - tags