diff --git a/.drone.yml b/.drone.yml
index dd30987..0920e52 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -8,22 +8,18 @@ steps:
     commands:
       - ./gradlew build -x test
 
-  - name: build_container
-    image: docker:stable-dind
-    volumes:
-      - name: dockersock
-        path: /var/run
-    environment:
-      DOCKER_USERNAME:
+  - name: kaniko
+    image: banzaicloud/drone-kaniko
+    settings:
+      registry: registry.kmlabz.com
+      repo: birbnetes/${DRONE_REPO_NAME}
+      username:
         from_secret: DOCKER_USERNAME
-      DOCKER_PASSWORD:
+      password:
         from_secret: DOCKER_PASSWORD
-    commands:
-      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin registry.kmlabz.com
-      - docker build -t="registry.kmlabz.com/birbnetes/$DRONE_REPO_NAME" .
-      - docker build -t="registry.kmlabz.com/birbnetes/$DRONE_REPO_NAME:$DRONE_BUILD_NUMBER" .
-      - docker push "registry.kmlabz.com/birbnetes/$DRONE_REPO_NAME"
-      - docker push "registry.kmlabz.com/birbnetes/$DRONE_REPO_NAME:$DRONE_BUILD_NUMBER"
+      tags:
+        - latest
+        - ${DRONE_BUILD_NUMBER}
 
   - name: ms-teams
     image: kuperiu/drone-teams
@@ -32,15 +28,3 @@ steps:
         from_secret: TEAMS_WEBHOOK
     when:
       status: [ failure ]
-
-services:
-  - name: docker
-    image: docker:stable-dind
-    privileged: true
-    volumes:
-      - name: dockersock
-        path: /var/run
-
-volumes:
-  - name: dockersock
-    temp: {}