diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d481f91a838872ae3140857babd8a467f2925045..5d769d22fab938657df13723d857e11f9743b80f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 variables:
-#  DOCKER_HOST: "${DOCKER_PORT}"
-#  DOCKER_TLS_CERTDIR: ""
-#  DOCKER_TLS_VERIFY: 0
+  DOCKER_HOST: "${DOCKER_PORT}"
+  DOCKER_TLS_CERTDIR: ""
+  DOCKER_TLS_VERIFY: 0
   TAG: "${TAG:-latest}"
   TRIVY_NO_PROGRESS: "true"
   TRIVY_CACHE_DIR: ".trivycache/"
@@ -31,7 +31,7 @@ build-analyse-service:
   image: python:3.9-slim
   stage: build-backend
   script:
-    - "pip3 install -r ./dbrepo-analyse-service/requirements.txt"
+    - "pip install -r ./dbrepo-analyse-service/requirements.txt"
 
 build-search-sync-agent:
   image: maven:3-openjdk-17
@@ -48,16 +48,21 @@ build-frontend:
     - "yarn --cwd ./dbrepo-ui run build"
 
 build-docker:
-  image: docker:24-dind
+  image:
+    name: gcr.io/kaniko-project/executor:v1.15.0-debug
+    entrypoint: [""]
   stage: build-docker
   needs:
     - build-metadata-service
     - build-analyse-service
   script:
-    - 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"
+    - /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
 
 test-metadata-service:
   stage: test-backend
@@ -99,7 +104,7 @@ test-analyse-service:
   needs:
     - build-analyse-service
   script:
-    - "pip3 install -r ./dbrepo-analyse-service/requirements.txt"
+    - "pip install -r ./dbrepo-analyse-service/requirements.txt"
     - "cd ./dbrepo-analyse-service/ && coverage run -m pytest test/test_determine_dt.py test/test_determine_pk.py --junitxml=report.xml && coverage html && coverage report > ./coverage.txt"
     - "cat ./dbrepo-analyse-service/coverage.txt | grep -o 'TOTAL[^%]*%'"
   artifacts:
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..9b28b0c04650d31fce8cb8ac519af657b218cef1
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,7 @@
+FROM gcr.io/kaniko-project/executor:v1.15.0-debug
+
+ENTRYPOINT [""]
+
+COPY ./dbrepo-metadata-service ./dbrepo-metadata-service
+
+RUN /kaniko/executor --context ./dbrepo-metadata-service --dockerfile "./dbrepo-metadata-service/Dockerfile" --no-push
\ No newline at end of file
diff --git a/dbrepo-metadata-db/Dockerfile b/dbrepo-metadata-db/Dockerfile
index 68c1a96a1f67d0ba1b14e82da95bb0c9f2406838..8f7f568fc20857d06ca99e841c0aee4de9e6f9e4 100644
--- a/dbrepo-metadata-db/Dockerfile
+++ b/dbrepo-metadata-db/Dockerfile
@@ -6,10 +6,4 @@ ENV METADATA_PASSWORD=dbrepo
 ENV MARIADB_DATABASE="${METADATA_DB}"
 ENV MARIADB_ROOT_PASSWORD="${METADATA_PASSWORD}"
 
-# force lower-case table names
-COPY ./51-dbrepo.cnf /opt/bitnami/mariadb/conf/my_custom.cnf
-
-# Scripts are copied to /docker-entrypoint-initdb.d/ in docker-compose from analyze service
-HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD mysqladmin ping --user="$METADATA_USERNAME" --password="$METADATA_PASSWORD" --silent
-
 COPY ./setup-schema.sql /docker-entrypoint-initdb.d/setup-schema.sql
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index e99659865465b2b4382dc6e9734d5a88f8a60e83..119b529af9a53583e8ae87b5b365be9adb5584b6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -33,8 +33,7 @@ services:
     restart: "no"
     container_name: dbrepo-metadata-db
     hostname: metadata-db
-    build: ./dbrepo-metadata-db
-    image: dbrepo-metadata-db
+    image: bitnami/mariadb:10.5
     networks:
       core:
     volumes:
@@ -57,7 +56,7 @@ services:
     restart: "no"
     container_name: dbrepo-data-db
     hostname: data-db
-    image: mariadb:10.5
+    image: bitnami/mariadb:10.5
     networks:
       core:
     volumes: