diff --git a/.woodpecker/publish_docker.yml b/.woodpecker/publish_docker.yml
deleted file mode 100644
index aa0c2c9..0000000
--- a/.woodpecker/publish_docker.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-###################################
-# build and publish docker images #
-###################################
-# branch: master
-# event: tag
-
-depends_on:
-  - tests
-
-clone:
-  git:
-    when:
-      #branch: master
-      event: tag
-    image: woodpeckerci/plugin-git
-
-pipeline:
-
-  # build and publish docker image for amd64 - x86
-  build-amd64:
-    when:
-      #branch: master
-      event: tag
-    image: woodpeckerci/plugin-docker-buildx
-    pull: true
-    settings:
-      repo: olofvndrhr/manga-dlp
-      platforms: linux/amd64
-      dockerfile: docker/Dockerfile.amd64
-      auto_tag: true
-      auto_tag_suffix: linux-amd64
-      build_args: BUILD_VERSION=${CI_COMMIT_TAG}
-      username:
-        from_secret: cr-dhub-username
-      password:
-        from_secret: cr-dhub-key
-
-  # build and publish docker image for arm64
-  build-arm64:
-    when:
-      #branch: master
-      event: tag
-    image: woodpeckerci/plugin-docker-buildx
-    pull: true
-    settings:
-      repo: olofvndrhr/manga-dlp
-      platforms: linux/arm64
-      dockerfile: docker/Dockerfile.arm64
-      auto_tag: true
-      auto_tag_suffix: linux-arm64
-      build_args: BUILD_VERSION=${CI_COMMIT_TAG}
-      username:
-        from_secret: cr-dhub-username
-      password:
-        from_secret: cr-dhub-key
-
-  # publish docker manifest for automatic multi arch pulls
-  publish-manifest:
-    when:
-      #branch: master
-      event: tag
-    image: plugins/manifest
-    pull: true
-    settings:
-      spec: docker/manifest.tmpl
-      auto_tag: true
-      ignore_missing: true
-      username:
-        from_secret: cr-dhub-username
-      password:
-        from_secret: cr-dhub-key
diff --git a/.woodpecker/publish_docker_amd64.yml b/.woodpecker/publish_docker_amd64.yml
new file mode 100644
index 0000000..b3b4356
--- /dev/null
+++ b/.woodpecker/publish_docker_amd64.yml
@@ -0,0 +1,38 @@
+#########################################
+# build and publish docker images amd64 #
+#########################################
+# branch: master
+# event: tag
+
+platform: linux/amd64
+
+depends_on:
+  - tests
+
+clone:
+  git:
+    when:
+      #branch: master
+      event: tag
+    image: woodpeckerci/plugin-git
+
+pipeline:
+
+  # build and publish docker image for amd64 - x86
+  build-amd64:
+    when:
+      #branch: master
+      event: tag
+    image: woodpeckerci/plugin-docker-buildx
+    pull: true
+    settings:
+      repo: olofvndrhr/manga-dlp
+      platforms: linux/amd64
+      dockerfile: docker/Dockerfile.amd64
+      auto_tag: true
+      auto_tag_suffix: linux-amd64
+      build_args: BUILD_VERSION=${CI_COMMIT_TAG}
+      username:
+        from_secret: cr-dhub-username
+      password:
+        from_secret: cr-dhub-key
diff --git a/.woodpecker/publish_docker_arm64.yml b/.woodpecker/publish_docker_arm64.yml
new file mode 100644
index 0000000..8788375
--- /dev/null
+++ b/.woodpecker/publish_docker_arm64.yml
@@ -0,0 +1,38 @@
+#########################################
+# build and publish docker images arm64 #
+#########################################
+# branch: master
+# event: tag
+
+platform: linux/arm64
+
+depends_on:
+  - tests
+
+clone:
+  git:
+    when:
+      #branch: master
+      event: tag
+    image: woodpeckerci/plugin-git
+
+pipeline:
+
+  # build and publish docker image for arm64
+  build-arm64:
+    when:
+      #branch: master
+      event: tag
+    image: woodpeckerci/plugin-docker-buildx
+    pull: true
+    settings:
+      repo: olofvndrhr/manga-dlp
+      platforms: linux/arm64
+      dockerfile: docker/Dockerfile.arm64
+      auto_tag: true
+      auto_tag_suffix: linux-arm64
+      build_args: BUILD_VERSION=${CI_COMMIT_TAG}
+      username:
+        from_secret: cr-dhub-username
+      password:
+        from_secret: cr-dhub-key
diff --git a/.woodpecker/publish_docker_manifest.yml b/.woodpecker/publish_docker_manifest.yml
new file mode 100644
index 0000000..cdac93d
--- /dev/null
+++ b/.woodpecker/publish_docker_manifest.yml
@@ -0,0 +1,36 @@
+###########################
+# publish docker manifest #
+###########################
+# branch: master
+# event: tag
+
+platform: linux/amd64
+
+depends_on:
+  - publish_docker_amd64
+  - publish_docker_arm64
+
+clone:
+  git:
+    when:
+      #branch: master
+      event: tag
+    image: woodpeckerci/plugin-git
+
+pipeline:
+
+  # publish docker manifest for automatic multi arch pulls
+  publish-manifest:
+    when:
+      #branch: master
+      event: tag
+    image: plugins/manifest
+    pull: true
+    settings:
+      spec: docker/manifest.tmpl
+      auto_tag: true
+      ignore_missing: true
+      username:
+        from_secret: cr-dhub-username
+      password:
+        from_secret: cr-dhub-key
diff --git a/.woodpecker/test_docker.yml b/.woodpecker/test_docker_amd64.yml
similarity index 54%
rename from .woodpecker/test_docker.yml
rename to .woodpecker/test_docker_amd64.yml
index 8aea5fa..292ba2a 100644
--- a/.woodpecker/test_docker.yml
+++ b/.woodpecker/test_docker_amd64.yml
@@ -1,9 +1,11 @@
-############################
-# test build docker images #
-############################
+##################################
+# test build docker images amd64 #
+##################################
 # branch: master
 # event: pull_request
 
+platform: linux/amd64
+
 depends_on:
   - tests
 
@@ -31,19 +33,3 @@ pipeline:
       auto_tag: true
       auto_tag_suffix: linux-amd64-test
       build_args: BUILD_VERSION=2.1.11
-
-  # build docker image for arm64
-  test-build-arm64:
-    when:
-      branch: master
-      event: pull_request
-    image: woodpeckerci/plugin-docker-buildx
-    pull: true
-    settings:
-      dry_run: true
-      repo: olofvndrhr/manga-dlp
-      platforms: linux/arm64
-      dockerfile: docker/Dockerfile.arm64
-      auto_tag: true
-      auto_tag_suffix: linux-arm64-test
-      build_args: BUILD_VERSION=2.1.11
diff --git a/.woodpecker/test_docker_arm64.yml b/.woodpecker/test_docker_arm64.yml
new file mode 100644
index 0000000..da0b8df
--- /dev/null
+++ b/.woodpecker/test_docker_arm64.yml
@@ -0,0 +1,35 @@
+##################################
+# test build docker images arm64 #
+##################################
+# branch: master
+# event: pull_request
+
+platform: linux/arm64
+
+depends_on:
+  - tests
+
+clone:
+  git:
+    when:
+      branch: master
+      event: pull_request
+    image: woodpeckerci/plugin-git
+
+pipeline:
+
+  # build docker image for arm64
+  test-build-arm64:
+    when:
+      branch: master
+      event: pull_request
+    image: woodpeckerci/plugin-docker-buildx
+    pull: true
+    settings:
+      dry_run: true
+      repo: olofvndrhr/manga-dlp
+      platforms: linux/arm64
+      dockerfile: docker/Dockerfile.arm64
+      auto_tag: true
+      auto_tag_suffix: linux-arm64-test
+      build_args: BUILD_VERSION=2.1.11
diff --git a/.woodpecker/test_tox_amd64.yml b/.woodpecker/test_tox_amd64.yml
index 84eceff..413c689 100644
--- a/.woodpecker/test_tox_amd64.yml
+++ b/.woodpecker/test_tox_amd64.yml
@@ -4,6 +4,8 @@
 # branch: master
 # event: pull_request
 
+platform: linux/amd64
+
 depends_on:
   - tests
 
diff --git a/.woodpecker/test_tox_arm64.yml b/.woodpecker/test_tox_arm64.yml
index ec80fbb..d0b1609 100644
--- a/.woodpecker/test_tox_arm64.yml
+++ b/.woodpecker/test_tox_arm64.yml
@@ -4,6 +4,8 @@
 # branch: master
 # event: pull_request
 
+platform: linux/arm64
+
 depends_on:
   - tests
 
diff --git a/.woodpecker/tests.yml b/.woodpecker/tests.yml
index 27beef5..6c766a2 100644
--- a/.woodpecker/tests.yml
+++ b/.woodpecker/tests.yml
@@ -4,6 +4,8 @@
 # branch: all
 # event: all
 
+platform: linux/amd64
+
 clone:
   git:
     image: woodpeckerci/plugin-git