diff --git a/.drone.yml b/.drone.yml
index b3cb5f7..a8cf265 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -13,12 +13,11 @@ steps:
   - name: docker
     image: plugins/docker
     settings:
-      registry: quay.io
       username:
-        from_secret: docker_username
+        from_secret: hub_username
       password:
-        from_secret: docker_password
-      repo: quay.io/kontena/weave-flying-shuttle-amd64
+        from_secret: hub_password
+      repo: docker.io/kontenapharos/weave-flying-shuttle-amd64
       dockerfile: Dockerfile
       auto_tag: true
     when:
@@ -39,13 +38,35 @@ steps:
   - name: docker
     image: plugins/docker
     settings:
-      registry: quay.io
       username:
-        from_secret: docker_username
+        from_secret: hub_username
       password:
-        from_secret: docker_password
-      repo: quay.io/kontena/weave-flying-shuttle-arm64
+        from_secret: hub_password
+      repo: docker.io/kontenapharos/weave-flying-shuttle-arm64
       dockerfile: Dockerfile
       auto_tag: true
     when:
       event: [tag, push]
+---
+kind: pipeline
+name: manifest
+platform:
+  os: linux
+  arch: amd64
+steps:
+  - name: manifest
+    image: plugins/manifest
+    settings:
+      username:
+        from_secret: hub_username
+      password:
+        from_secret: hub_password
+      target: docker.io/kontenapharos/weave-flying-shuttle:${DRONE_TAG##v}
+      template: docker.io/kontenapharos/weave-flying-shuttle-ARCH:${DRONE_TAG##v}
+      platforms:
+        - linux/amd64
+        - linux/arm64
+      ignore_missing: true
+depends_on:
+  - amd64
+  - arm64
diff --git a/Dockerfile b/Dockerfile
index 6ca04a8..2a3edfa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,8 @@ FROM alpine:3.8
 LABEL maintainer="Kontena, Inc. <info@kontena.io>"
 
 RUN apk update && apk --update add tzdata ruby ruby-irb ruby-bigdecimal \
-    ruby-io-console ruby-json ca-certificates openssl iptables iproute2
+    ruby-io-console ruby-json ruby-etc \
+    ca-certificates openssl iptables iproute2
 
 ADD Gemfile /app/
 ADD Gemfile.lock /app/
diff --git a/lib/flying_shuttle.rb b/lib/flying_shuttle.rb
index 41d43e9..90cfc84 100644
--- a/lib/flying_shuttle.rb
+++ b/lib/flying_shuttle.rb
@@ -3,7 +3,7 @@
 require 'concurrent'
 
 module FlyingShuttle
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
   REGION_LABEL = 'failure-domain.beta.kubernetes.io/region'
 end