diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 03be815d4b4b190cefb88b85ecc9f254203c5b42..544751772ac6f89af6bca3bce62ae18c202daa4c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,13 +9,13 @@ application-image:
     entrypoint: [""]
   script:
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
-    - /kaniko/executor --context ${CI_PROJECT_DIR} --dockerfile ${CI_PROJECT_DIR}/Dockerfile --destination $CI_REGISTRY_IMAGE:${CI_COMMIT_REF_NAME}
+    - /kaniko/executor --context ${CI_PROJECT_DIR}/backend/ --dockerfile ${CI_PROJECT_DIR}/backend/Dockerfile --destination $CI_REGISTRY_IMAGE/backend:${CI_COMMIT_REF_NAME}
   only:
     changes:
       - ./**/*
       - .gitlab-ci.yml
 
-unittests:
+backend-unittests:
   stage: test
   variables:
     DATABASE_USER: postgres
@@ -26,7 +26,7 @@ unittests:
   services:
     - name: postgres:11
       alias: postgres
-  image: ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}
+  image: ${CI_REGISTRY_IMAGE}/backend:${CI_COMMIT_REF_NAME}
   script:
     - python3 -m unittest discover
   only: