diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fd2d60e..612d067 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,10 +4,12 @@ build_zeo:
     - shell
     - ubuntu
   variables:
-    IMAGE_TAG: $CI_REGISTRY/andreas/scraper/zeo:latest
+    IMAGE_TAG: $CI_REGISTRY_IMAGE/zeo:$CI_COMMIT_REF_SLUG
+    RELEASE_TAG: $CI_REGISTRY_IMAGE/zeo:latest
   script:
+    - cd src/zeo
+    - docker build -t $IMAGE_TAG .
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - docker build -t $IMAGE_TAG src/zeo
     - docker push $IMAGE_TAG
 
 build_flask:
@@ -16,12 +18,12 @@ build_flask:
     - shell
     - ubuntu
   variables:
-    IMAGE_TAG: $CI_REGISTRY/andreas/scraper/webui:latest
-#    IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+    IMAGE_TAG: $CI_REGISTRY_IMAGE/webui:$CI_COMMIT_REF_SLUG
+    RELEASE_TAG: $CI_REGISTRY_IMAGE/webui:latest
   script:
-    - export
+    - cd src/webui
+    - docker build -t $IMAGE_TAG .
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - docker build -t $IMAGE_TAG src/webui
     - docker push $IMAGE_TAG
 
 build_api:
@@ -31,4 +33,17 @@ build_api:
     - ubuntu
   script:
     - echo "Build api image"
+    - export
 
+unit_test:
+  stage: test
+  services:
+    - $CI_REGISTRY_IMAGE/zeo:$CI_COMMIT_REF_SLUG
+  image: $CI_REGISTRY_IMAGE/webui:$CI_COMMIT_REF_SLUG
+  tags:
+    - docker
+    - ubuntu
+  script:
+    - echo "Run locally, then test"
+    - export
+