diff --git a/templates/microservice.yaml b/templates/microservice.yaml
index 30e2e2f..12aa9b2 100644
--- a/templates/microservice.yaml
+++ b/templates/microservice.yaml
@@ -1,28 +1,23 @@
 variables:
-  DOCKER_HOST: tcp://docker:2376
-  DOCKER_TLS_CERTDIR: "/certs"
-  DOCKER_TLS_VERIFY: 1
-  DOCKER_CERT_PATH: "$DOCKER_TLS_CERTDIR/client"
-  DOCKER_DRIVER: vfs
   NAMESPACE: "default"
 
 default:
   image: dtzar/helm-kubectl:latest
   tags:
     - docker
-
-
-services:
-  - docker:20.10.16-dind
-
+    
 stages:         
   - build
   - deploy
   - production
 
 build-dev:
-  image: docker:20.10.16    
   stage: build
+  image: quay.io/buildah/stable:v1.31.0
+  variables:
+    STORAGE_DRIVER: vfs
+    BUILDAH_FORMAT: docker
+    BUILDAH_ISOLATION: chroot
   only:
     - master
   script: