diff --git a/.drone.jsonnet b/.drone.jsonnet
index 13cfa36..f95db29 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -42,7 +42,6 @@ local PipelineBuildContainer(arch='amd64') = {
       image: 'thegeeklab/drone-docker-buildx',
       privileged: true,
       settings: {
-        config: { from_secret: 'docker_config' },
         dry_run: true,
         dockerfile: 'Dockerfile.' + std.split(arch, '_')[0],
         platforms: [
@@ -73,42 +72,20 @@ local PipelineBuildContainer(arch='amd64') = {
     },
     {
       name: 'publish-dockerhub',
-      image: 'jdrouet/docker-with-buildx:stable',
-      commands: [
-        'docker login -u "$$DOCKER_USERNAME" -p "$$DOCKER_PASSWORD"',
-        'docker buildx create --use',
-        'docker buildx build --push --platform linux/' + std.strReplace(arch, '_', '/') + ' --tag thegeeklab/buildx-alpine:' + std.split(arch, '_')[0] + ' -f "$$DOCKERFILE" .',
-      ],
-      environment: {
-        DOCKER_PASSWORD: { from_secret: 'docker_password' },
-        DOCKER_USERNAME: { from_secret: 'docker_username' },
-        DOCKERFILE: 'Dockerfile.' + std.split(arch, '_')[0],
+      image: 'thegeeklab/drone-docker-buildx',
+      settings: {
+        auto_tag_suffix: std.split(arch, '_')[0],
+        dockerfile: 'Dockerfile.' + std.split(arch, '_')[0],
+        repo: 'thegeeklab/buildx-alpine',
+        username: { from_secret: 'docker_username' },
+        password: { from_secret: 'docker_password' },
       },
-      volumes: [{
-        name: 'dockersock-' + arch,
-        path: '/var/run',
-      }],
       when: {
         ref: ['refs/heads/main', 'refs/tags/**'],
       },
       depends_on: ['tags'],
     },
   ],
-  services: [
-    {
-      name: 'dind-' + arch,
-      image: 'docker:dind',
-      privileged: true,
-      volumes: [{
-        name: 'dockersock-' + arch,
-        path: '/var/run',
-      }],
-    },
-  ],
-  volumes: [{
-    name: 'dockersock-' + arch,
-    temp: {},
-  }],
   depends_on: [
     'test',
   ],
@@ -119,7 +96,6 @@ local PipelineBuildContainer(arch='amd64') = {
 
 local PipelineNotifications = {
   kind: 'pipeline',
-  image_pull_secrets: ['docker_config'],
   name: 'notifications',
   platform: {
     os: 'linux',
diff --git a/.drone.yml b/.drone.yml
index 3973219..1bdd295 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -37,8 +37,6 @@ steps:
 - name: dryrun
   image: thegeeklab/drone-docker-buildx
   settings:
-    config:
-      from_secret: docker_config
     dockerfile: Dockerfile.amd64
     dry_run: true
     password:
@@ -70,20 +68,15 @@ steps:
   - wait-for
 
 - name: publish-dockerhub
-  image: jdrouet/docker-with-buildx:stable
-  commands:
-  - docker login -u "$$DOCKER_USERNAME" -p "$$DOCKER_PASSWORD"
-  - docker buildx create --use
-  - docker buildx build --push --platform linux/amd64 --tag thegeeklab/buildx-alpine:amd64 -f "$$DOCKERFILE" .
-  environment:
-    DOCKERFILE: Dockerfile.amd64
-    DOCKER_PASSWORD:
+  image: thegeeklab/drone-docker-buildx
+  settings:
+    auto_tag_suffix: amd64
+    dockerfile: Dockerfile.amd64
+    password:
       from_secret: docker_password
-    DOCKER_USERNAME:
+    repo: thegeeklab/buildx-alpine
+    username:
       from_secret: docker_username
-  volumes:
-  - name: dockersock-amd64
-    path: /var/run
   when:
     ref:
     - refs/heads/main
@@ -91,18 +84,6 @@ steps:
   depends_on:
   - tags
 
-services:
-- name: dind-amd64
-  image: docker:dind
-  privileged: true
-  volumes:
-  - name: dockersock-amd64
-    path: /var/run
-
-volumes:
-- name: dockersock-amd64
-  temp: {}
-
 trigger:
   ref:
   - refs/heads/main
@@ -131,8 +112,6 @@ steps:
 - name: dryrun
   image: thegeeklab/drone-docker-buildx
   settings:
-    config:
-      from_secret: docker_config
     dockerfile: Dockerfile.arm64
     dry_run: true
     password:
@@ -164,20 +143,15 @@ steps:
   - wait-for
 
 - name: publish-dockerhub
-  image: jdrouet/docker-with-buildx:stable
-  commands:
-  - docker login -u "$$DOCKER_USERNAME" -p "$$DOCKER_PASSWORD"
-  - docker buildx create --use
-  - docker buildx build --push --platform linux/arm64/v8 --tag thegeeklab/buildx-alpine:arm64 -f "$$DOCKERFILE" .
-  environment:
-    DOCKERFILE: Dockerfile.arm64
-    DOCKER_PASSWORD:
+  image: thegeeklab/drone-docker-buildx
+  settings:
+    auto_tag_suffix: arm64
+    dockerfile: Dockerfile.arm64
+    password:
       from_secret: docker_password
-    DOCKER_USERNAME:
+    repo: thegeeklab/buildx-alpine
+    username:
       from_secret: docker_username
-  volumes:
-  - name: dockersock-arm64_v8
-    path: /var/run
   when:
     ref:
     - refs/heads/main
@@ -185,18 +159,6 @@ steps:
   depends_on:
   - tags
 
-services:
-- name: dind-arm64_v8
-  image: docker:dind
-  privileged: true
-  volumes:
-  - name: dockersock-arm64_v8
-    path: /var/run
-
-volumes:
-- name: dockersock-arm64_v8
-  temp: {}
-
 trigger:
   ref:
   - refs/heads/main
@@ -225,8 +187,6 @@ steps:
 - name: dryrun
   image: thegeeklab/drone-docker-buildx
   settings:
-    config:
-      from_secret: docker_config
     dockerfile: Dockerfile.arm
     dry_run: true
     password:
@@ -258,20 +218,15 @@ steps:
   - wait-for
 
 - name: publish-dockerhub
-  image: jdrouet/docker-with-buildx:stable
-  commands:
-  - docker login -u "$$DOCKER_USERNAME" -p "$$DOCKER_PASSWORD"
-  - docker buildx create --use
-  - docker buildx build --push --platform linux/arm/v7 --tag thegeeklab/buildx-alpine:arm -f "$$DOCKERFILE" .
-  environment:
-    DOCKERFILE: Dockerfile.arm
-    DOCKER_PASSWORD:
+  image: thegeeklab/drone-docker-buildx
+  settings:
+    auto_tag_suffix: arm
+    dockerfile: Dockerfile.arm
+    password:
       from_secret: docker_password
-    DOCKER_USERNAME:
+    repo: thegeeklab/buildx-alpine
+    username:
       from_secret: docker_username
-  volumes:
-  - name: dockersock-arm_v7
-    path: /var/run
   when:
     ref:
     - refs/heads/main
@@ -279,18 +234,6 @@ steps:
   depends_on:
   - tags
 
-services:
-- name: dind-arm_v7
-  image: docker:dind
-  privileged: true
-  volumes:
-  - name: dockersock-arm_v7
-    path: /var/run
-
-volumes:
-- name: dockersock-arm_v7
-  temp: {}
-
 trigger:
   ref:
   - refs/heads/main
@@ -355,9 +298,6 @@ steps:
     - success
     - failure
 
-image_pull_secrets:
-- docker_config
-
 trigger:
   ref:
   - refs/heads/main
@@ -373,6 +313,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: bc936a08d1294d37d13683d0135389e3caa97a0a89eba1e5f0c0e30df17a8d01
+hmac: 61b410d53ce5e55b850c334cafe82057b69f9664e2cfba6b12f008d6d1c82702
 
 ...