diff --git a/.drone.yml b/.drone.yml
index 4669bbd..bd54f7e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,15 +1,12 @@
 pipeline:
   build:
-    image: docker
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    commands:
-      - docker build --no-cache --pull -t busybox-dev .
+    image: spritsail/docker-build
+    volumes: [ '/var/run/docker.sock:/var/run/docker.sock' ]
+    repo: busybox-dev
 
   test:
     image: docker
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
+    volumes: [ '/var/run/docker.sock:/var/run/docker.sock' ]
     commands:
       - docker run --rm busybox-dev /bin/sh -xec 'true'
       - docker run --rm busybox-dev /bin/sh -xec 'test -f /lib/libc-*.so'
@@ -19,28 +16,26 @@ pipeline:
       - test "$(docker run --rm busybox-dev /bin/sh -xec 'echo This is a test string | md5sum | cut -f1 -d\ ' | tee /dev/stderr)" = 'b584c39f97dfe71ebceea3fdb860ed6c'
 
   publish:
-    image: docker
-    secrets: [ DOCKER_USER, DOCKER_PASS ]
-    when:
-      event: [push, tag, deployment]
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    commands:
-      - docker login -u $DOCKER_USER -p $DOCKER_PASS
-      - docker tag busybox-dev adamant/busybox:latest
-      - docker tag busybox-dev adamant/busybox:1.1
-      - docker push adamant/busybox
-      - docker rmi busybox-dev adamant/busybox
-  
+    image: spritsail/docker-publish
+    when: { branch: [ master ], event: [ push, tag, deployment ] }
+    volumes: [ '/var/run/docker.sock:/var/run/docker.sock' ]
+    secrets: [ docker_username, docker_password, microbadger_token ]
+    from: busybox-dev
+    repo: spritsail/busybox
+
   downstream:
     image: plugins/downstream
-    when:
-      event: [push, tag, deployment]
-    secrets: [ DOWNSTREAM_TOKEN ]
-    server: https://drone.adam-ant.co.uk
+    when: { status: [ success ], event: [ push, tag, deployment ] }
+    secrets: [ downstream_token ]
+    server: https://drone.spritsail.io
     fork: true
     repositories:
-      - Adam-Ant/docker-busybox@libressl
-    when:
-      event:  [ push, tag, deployment]
-      status: [ success ]
+      - spritsail/busybox@libressl
+
+  notify:
+    image: appleboy/drone-telegram
+    when: { status: [ success, failure ] }
+    secrets: [ telegram_token, telegram_to ]
+    message: |
+      *{{repo.owner}}/{{repo.name}} [{{commit.branch}}]*: Build #{{build.number}}: *{{uppercase build.status}}*
+      {{build.link}}
diff --git a/Dockerfile b/Dockerfile
index 59ba1b5..cf21253 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,12 @@
-FROM frebib/debian-builder as builder
+FROM spritsail/debian-builder as builder
 
 ARG ARCH=x86_64
 ARG ARCH_ALT=i686
 
 ARG GLIBC_VER=2.27
-ARG BUSYB_VER=1.28.0
+ARG BUSYB_VER=1.28.1
 ARG SU_EXEC_VER=v0.3
-ARG TINI_VER=v0.16.1
+ARG TINI_VER=v0.17.0
 
 ARG PREFIX=/output
 WORKDIR $PREFIX
diff --git a/README.md b/README.md
index b215623..369cd1c 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,16 @@
-[hub]: https://hub.docker.com/r/adamant/busybox
+[hub]: https://hub.docker.com/r/spritsail/busybox
+[git]: https://github.com/spritsail/busybox
+[drone]: https://drone.spritsail.io/spritsail/busybox
 [musl]: https://www.musl-libc.org/
 [uclibc]: https://www.uclibc.org/
 
-# [adamant/busybox][hub] - A tiny image, nurtured from source
-[![](https://images.microbadger.com/badges/image/adamant/busybox.svg)](https://microbadger.com/images/adamant/busybox) [![](https://images.microbadger.com/badges/version/adamant/busybox.svg)][hub] [![Docker Stars](https://img.shields.io/docker/stars/adamant/busybox.svg)][hub] [![Docker Pulls](https://img.shields.io/docker/pulls/adamant/busybox.svg)][hub]
+# [spritsail/busybox][hub] - A tiny image, nurtured from source
+[![](https://images.microbadger.com/badges/image/spritsail/busybox.svg)](https://microbadger.com/images/spritsail/busybox)
+[![](https://images.microbadger.com/badges/version/spritsail/busybox.svg)][hub]
+[![](https://images.microbadger.com/badges/commit/spritsail/busybox.svg)][git]
+[![Docker Stars](https://img.shields.io/docker/stars/spritsail/busybox.svg)][hub]
+[![Docker Pulls](https://img.shields.io/docker/pulls/spritsail/busybox.svg)][hub]
+[![Build Status](https://drone.spritsail.io/api/badges/spritsail/busybox/status.svg)][drone]
 
 This Docker base image has been custom crafted from source to provide just enough functionality in the tiniest footprint. Included in the image are the following:
  - GNU libc6 (glibc) - _C standard library, found in most linux distributions_ | https://www.gnu.org/software/libc/
@@ -11,15 +18,15 @@ This Docker base image has been custom crafted from source to provide just enoug
  - LibreSSL - _An OpenSSL fork aiming to modernise code and improve security_ | https://www.libressl.org/
 
 Additionally, the following small utilities have been included for convenience and good container practice:
- - su-exec - _A convenient utility for changing user and dropping privilege_ | https://github.com/ncopa/su-exec
+ - su-exec - _A convenient utility for changing user and dropping privilege_ | https://github.com/frebib/su-exec
  - tini - _A tiny but valid `init` for containers_ | https://github.com/krallin/tini
 
 ## Supported tags and respective `Dockerfile` links
 
 There are two main streams of this image: with and without LibreSSL. You can find the dockerfiles below
 
-* `1.0`, `latest` - [(master/dockerfile)](https://github.com/Adam-Ant/docker-busybox/blob/master/Dockerfile)
-* `1.0-libressl`, `libressl` - [(libressl/dockerfile)](https://github.com/Adam-Ant/docker-busybox/blob/libressl/Dockerfile)
+* `1.0`, `latest` - [(master/dockerfile)](https://github.com/spritsail/busybox/blob/master/Dockerfile)
+* `1.0-libressl`, `libressl` - [(libressl/dockerfile)](https://github.com/spritsail/busybox/blob/libressl/Dockerfile)
 
 ## Goals for a base image