diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1feeb7067b252185d68988efc72af2253196a2d5..adb0a66e61e2adee7c3c817e689b961a1ed13d8c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ stages:
   - build
   - test
 
-backend-image:
+backend:
   stage: build
   image:
     name: gcr.io/kaniko-project/executor:debug
@@ -12,7 +12,20 @@ backend-image:
     - /kaniko/executor --context ${CI_PROJECT_DIR}/backend/ --dockerfile ${CI_PROJECT_DIR}/backend/Dockerfile --destination $CI_REGISTRY_IMAGE/backend:${CI_COMMIT_REF_NAME}
   only:
     changes:
-      - ./**/*
+      - backend/**/*
+      - .gitlab-ci.yml
+
+frontend:
+  stage: build
+  image:
+    name: gcr.io/kaniko-project/executor:debug
+    entrypoint: [""]
+  script:
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+    - /kaniko/executor --context ${CI_PROJECT_DIR}/frontend/ --dockerfile ${CI_PROJECT_DIR}/frontend/Dockerfile --destination $CI_REGISTRY_IMAGE/frontend:${CI_COMMIT_REF_NAME}
+  only:
+    changes:
+      - frontend/**/*
       - .gitlab-ci.yml
 
 backend-unittests: