diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d3637a084c85cd5667096d2ccac4e94f5dbfa742..819c77868e1ea05902a15fde06922f1023edd92b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +1,21 @@
 build:
-  image: docker
-  services: 
-    - docker:dind
   stage: build
+  image: quay.io/buildah/stable
+
   variables:
+    STORAGE_DRIVER: vfs
+    BUILDAH_FORMAT: docker
     IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+
+  before_script:
+    - echo "$CI_REGISTRY_PASSWORD" | buildah login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
+
   script:
     - echo "IMAGE_TAG=" $IMAGE_TAG
     - echo "CI_REGISTRY=" $CI_REGISTRY
     - echo "CI_REGISTRY_USER=" $CI_REGISTRY_USER
-    - echo "CI_REGISTRY_PASSWORD=" $CI_REGISTRY_PASSWORD
-    - docker ps -a
+    - buildah images
+    - buildah build -t IMAGE_TAG
+    - buildah images
+    - buildah push $IMAGE_TAG
+