diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 74bc0f7b069d825d5259dde1c41f3df4300df8e4..0543cbc6774481f984612455c462b1cee68893d6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,7 @@
 stages:
   - test
   - build
+  - deploy
 
 test_api:
   stage: test
@@ -56,3 +57,17 @@ pages:
     - develop
   tags:
     - docker
+
+docker_image:
+  stage: test
+  before_script:
+    - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
+    - cd api
+  script:
+    - docker build -t funkwhale/funkwhale:$CI_COMMIT_REF_NAME .
+    - docker push funkwhale/funkwhale:$CI_COMMIT_REF_NAME
+  only:
+    - develop
+    - master
+  tags:
+    - dind