diff --git a/.drone.yml b/.drone.yml
index f5ac111..3fa7fc3 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -60,6 +60,54 @@ steps:
     when:
       event: tag
 
+  - name: push image - arm
+    image: plugins/docker
+    settings:
+      repo: iamthefij/resticscheduler
+      auto_tag: true
+      auto_tag_suffix: linux-arm
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      build_args:
+        - ARCH=arm
+
+  - name: push image - arm64
+    image: plugins/docker
+    settings:
+      repo: iamthefij/resticscheduler
+      auto_tag: true
+      auto_tag_suffix: linux-arm64
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      build_args:
+        - ARCH=arm64
+
+  - name: push image - amd64
+    image: plugins/docker
+    settings:
+      repo: iamthefij/resticscheduler
+      auto_tag: true
+      auto_tag_suffix: linux-amd64
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+
+  - name: publish manifest
+    image: plugins/manifest
+    settings:
+      spec: docker-manifest.tmpl
+      auto_tag: true
+      ignore_missing: true
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+
 ---
 kind: pipeline
 name: notify
diff --git a/Makefile b/Makefile
index 5f6617a..86487d1 100644
--- a/Makefile
+++ b/Makefile
@@ -56,3 +56,6 @@ $(TARGETS): $(GOFILES)
 .PHONY: $(TARGET_ALIAS)
 $(TARGET_ALIAS):
 	$(MAKE) $(addprefix dist/,$@)
+
+$(addprefix docker-,$(TARGET_ALIAS)):
+	docker build --build-arg BIN=dist/$(@:docker-%=%) .