diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index be704ad..1be5820 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,16 +8,14 @@ test:
   script:
     - cd server && ./gradlew test
 
-container:
+build:
   stage: build
-  image: $CI_REGISTRY/ict/images/alpine/ci:latest
+  image: docker:24.0.5
+  services:
+    - docker:24.0.5-dind
   variables:
-    BUILDAH_ISOLATION: chroot
     IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
-  before_script:
-    - apk add buildah fuse-overlayfs
-    - buildah login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - buildah info
   script:
-    - buildah build --tag $IMAGE_TAG -f Dockerfile
-    - buildah push --retry 3 $IMAGE_TAG
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker build -t $IMAGE_TAG .
+    - docker push $IMAGE_TAG
diff --git a/Dockerfile b/Dockerfile
index 24cd09a..cfd90b4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ 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
 
 WORKDIR /usr/src/app