diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 42747a1..aed8f2f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,9 +10,15 @@ test:
 
 container:
   stage: build
-  image: $CI_REGISTRY/ict/images/buildah:latest
+  image: docker:latest
   variables:
     IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
+    DOCKER_DRIVER: overlay2
+    DOCKER_TLS_CERTDIR: ""
+  services:
+    - docker:dind
+  before_script:
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
   script:
-    - buildah build --squash --tag $IMAGE_TAG .
-    - buildah push $IMAGE_TAG
+    - docker build -t $CI_REGISTRY_IMAGE/$IMAGE_TAG .
+    - docker push $CI_REGISTRY_IMAGE/$IMAGE_TAG