diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 231ba7b50069cd97d3ef24536910347cfd126119..ac9fc92507c3388b48518cb73d0c16019cc0aaf1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,23 +50,18 @@ build-frontend:
     - "yarn --cwd ./dbrepo-ui run build"
 
 build-docker:
-  image:
-    name: gcr.io/kaniko-project/executor:v1.15.0-debug
-    entrypoint: [""]
   stage: build-docker
   needs:
     - build-metadata-service
     - build-analyse-service
   script:
-    - /kaniko/executor --context ./dbrepo-analyse-service --dockerfile "./dbrepo-analyse-service/Dockerfile" --no-push
-    - /kaniko/executor --context ./dbrepo-authentication-service --dockerfile "./dbrepo-authentication-service/Dockerfile" --no-push
-    - /kaniko/executor --context ./dbrepo-broker-service --dockerfile "./dbrepo-broker-service/Dockerfile" --no-push
-    - /kaniko/executor --context ./dbrepo-metadata-db --dockerfile "./dbrepo-metadata-db/Dockerfile" --no-push
-    - /kaniko/executor --context ./dbrepo-metadata-service --dockerfile "./dbrepo-metadata-service/Dockerfile" --no-push
-    - /kaniko/executor --context ./dbrepo-search-sync-agent --dockerfile "./dbrepo-search-sync-agent/Dockerfile" --no-push
-    - /kaniko/executor --context ./dbrepo-ui --dockerfile "./dbrepo-ui/Dockerfile" --no-push
+    - "cp .env.unix.example .env"
+    - "docker build -t dbrepo-metadata-service:build --target build dbrepo-metadata-service"
+    - "docker build -t dbrepo-search-sync-agent:build --target build dbrepo-search-sync-agent"
+    - "docker compose build --parallel"
 
 test-metadata-service:
+  image: maven:3-openjdk-17
   stage: test-backend
   needs:
     - build-metadata-service
@@ -84,6 +79,7 @@ test-metadata-service:
   coverage: '/Total.*?([0-9]{1,3})%/'
 
 test-search-sync-agent:
+  image: maven:3-openjdk-17
   stage: test-backend
   needs:
     - build-search-sync-agent
@@ -119,6 +115,7 @@ test-analyse-service:
   coverage: '/TOTAL.*?([0-9]{1,3})%/'
 
 test-frontend:
+  image: node:14-alpine
   stage: test-frontend
   needs:
     - build-frontend