diff --git a/.drone.jsonnet b/.drone.jsonnet
index cb9786a..4c22850 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -160,7 +160,7 @@ local PipelineBuildContainer(arch='amd64') = {
     },
     {
       name: 'dryrun',
-      image: 'plugins/docker:19',
+      image: 'thegeeklab/drone-docker:19',
       settings: {
         config: { from_secret: 'docker_config' },
         dry_run: true,
@@ -176,7 +176,7 @@ local PipelineBuildContainer(arch='amd64') = {
     },
     {
       name: 'publish-dockerhub',
-      image: 'plugins/docker:19',
+      image: 'thegeeklab/drone-docker:19',
       settings: {
         config: { from_secret: 'docker_config' },
         auto_tag: true,
@@ -193,7 +193,7 @@ local PipelineBuildContainer(arch='amd64') = {
     },
     {
       name: 'publish-quay',
-      image: 'plugins/docker:19',
+      image: 'thegeeklab/drone-docker:19',
       settings: {
         config: { from_secret: 'docker_config' },
         auto_tag: true,
diff --git a/.drone.yml b/.drone.yml
index 5ad78c4..afc278e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -128,7 +128,7 @@ steps:
   - go build -v -ldflags "-X main.version=$BUILD_VERSION" -a -tags netgo -o release/amd64/drone-github-comment ./cmd/drone-github-comment
 
 - name: dryrun
-  image: plugins/docker:19
+  image: thegeeklab/drone-docker:19
   settings:
     config:
       from_secret: docker_config
@@ -146,7 +146,7 @@ steps:
   - build
 
 - name: publish-dockerhub
-  image: plugins/docker:19
+  image: thegeeklab/drone-docker:19
   settings:
     auto_tag: true
     auto_tag_suffix: amd64
@@ -166,7 +166,7 @@ steps:
   - dryrun
 
 - name: publish-quay
-  image: plugins/docker:19
+  image: thegeeklab/drone-docker:19
   settings:
     auto_tag: true
     auto_tag_suffix: amd64
@@ -214,7 +214,7 @@ steps:
   - go build -v -ldflags "-X main.version=$BUILD_VERSION" -a -tags netgo -o release/arm64/drone-github-comment ./cmd/drone-github-comment
 
 - name: dryrun
-  image: plugins/docker:19
+  image: thegeeklab/drone-docker:19
   settings:
     config:
       from_secret: docker_config
@@ -232,7 +232,7 @@ steps:
   - build
 
 - name: publish-dockerhub
-  image: plugins/docker:19
+  image: thegeeklab/drone-docker:19
   settings:
     auto_tag: true
     auto_tag_suffix: arm64
@@ -252,7 +252,7 @@ steps:
   - dryrun
 
 - name: publish-quay
-  image: plugins/docker:19
+  image: thegeeklab/drone-docker:19
   settings:
     auto_tag: true
     auto_tag_suffix: arm64
@@ -300,7 +300,7 @@ steps:
   - go build -v -ldflags "-X main.version=$BUILD_VERSION" -a -tags netgo -o release/arm/drone-github-comment ./cmd/drone-github-comment
 
 - name: dryrun
-  image: plugins/docker:19
+  image: thegeeklab/drone-docker:19
   settings:
     config:
       from_secret: docker_config
@@ -318,7 +318,7 @@ steps:
   - build
 
 - name: publish-dockerhub
-  image: plugins/docker:19
+  image: thegeeklab/drone-docker:19
   settings:
     auto_tag: true
     auto_tag_suffix: arm
@@ -338,7 +338,7 @@ steps:
   - dryrun
 
 - name: publish-quay
-  image: plugins/docker:19
+  image: thegeeklab/drone-docker:19
   settings:
     auto_tag: true
     auto_tag_suffix: arm
@@ -468,6 +468,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: 86fcc05f5bcfb7375d23185103d52209232fa92edd680298bd92a313d7eafb8c
+hmac: 35066688a49368c27562e5ed2fab53936806fb923de6920b1195e4bd3d6d8e99
 
 ...
diff --git a/README.md b/README.md
index f822bbb..65fec8c 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 Drone plugin to add comments to GitHub Issues/PRs
 
-[![Build Status](https://img.shields.io/drone/build/thegeeklab/drone-github-comment?logo=drone)](https://cloud.drone.io/thegeeklab/drone-github-comment)
+[![Build Status](https://img.shields.io/drone/build/thegeeklab/drone-github-comment?logo=drone&server=https%3A%2F%2Fdrone.thegeeklab.de)](https://drone.thegeeklab.de/thegeeklab/drone-github-comment)
 [![Docker Hub](https://img.shields.io/badge/dockerhub-latest-blue.svg?logo=docker&logoColor=white)](https://hub.docker.com/r/thegeeklab/drone-github-comment)
 [![Quay.io](https://img.shields.io/badge/quay-latest-blue.svg?logo=docker&logoColor=white)](https://quay.io/repository/thegeeklab/drone-github-comment)
 [![Go Report Card](https://goreportcard.com/badge/github.com/thegeeklab/drone-github-comment)](https://goreportcard.com/report/github.com/thegeeklab/drone-github-comment)