diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d2d1b9b..be704ad 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,15 +10,14 @@ test:
 
 container:
   stage: build
-  image: docker:latest
+  image: $CI_REGISTRY/ict/images/alpine/ci:latest
   variables:
-    IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
-    DOCKER_DRIVER: overlay2
-    DOCKER_TLS_CERTDIR: ""
-  services:
-    - docker:dind
+    BUILDAH_ISOLATION: chroot
+    IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
   before_script:
-    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - apk add buildah fuse-overlayfs
+    - buildah login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - buildah info
   script:
-    - docker build -t $IMAGE_TAG .
-    - docker push $IMAGE_TAG
+    - buildah build --tag $IMAGE_TAG -f Dockerfile
+    - buildah push --retry 3 $IMAGE_TAG
diff --git a/Dockerfile b/Dockerfile
index cfd90b4..4874d21 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,14 +6,14 @@ RUN npm i
 COPY ./client/. .
 RUN npm run build
 
-FROM azul/prime:17 as server
+FROM azul/zulu-openjdk-alpine:17 as server
 
 WORKDIR /usr/src/app/server
 COPY ./server/. .
 RUN ./gradlew clean build && bash -c "rm build/libs/*-plain.jar && mv build/libs/*.jar server.jar"
 
 # The best JVM ;)
-FROM azul/prime:17
+FROM azul/zulu-openjdk-alpine:17
 
 WORKDIR /usr/src/app
 COPY --from=server /usr/src/app/server/server.jar .