diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e00764a6f66a96214f7761959e34db840f208453..1d34011b7c88d0047bde1f6278aea8a261380c3b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,4 +41,15 @@ build_image:
     - docker image tag $DOCKERHUB_NAME $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
     - docker image tag $DOCKERHUB_NAME $CI_REGISTRY_IMAGE:latest
     - docker push $CI_REGISTRY_IMAGE
-  
\ No newline at end of file
+
+build_clarin_json:
+  only:
+    - clarin_json_support
+  stage: build_clarin_json
+  image: docker:18.09.7
+  services:
+    - 'docker:18.09.7-dind'
+  script:
+    - docker build -t $CI_REGISTRY_IMAGE:clarin-json .
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker push $CI_REGISTRY_IMAGE:clarin-json
\ No newline at end of file