diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml
index 807b33375..0c5d4a2ff 100644
--- a/.woodpecker/.build.yml
+++ b/.woodpecker/.build.yml
@@ -3,7 +3,6 @@ matrix:
     - "8.1"
   platform:
     - linux/arm64
-    - linux/riscv64
 
 platform: ${platform}
 
diff --git a/.woodpecker/.deploy-docker.yml b/.woodpecker/.deploy-docker.yml
new file mode 100644
index 000000000..ab05f722d
--- /dev/null
+++ b/.woodpecker/.deploy-docker.yml
@@ -0,0 +1,31 @@
+platform: linux/arm64
+
+clone:
+  git:
+    when:
+      event:
+        - tag
+        - push
+    image: woodpeckerci/plugin-git:v1.5.0
+    settings:
+      depth: 1
+      lfs: false
+      recursive: false
+      tags: true
+
+pipeline:
+  variants:
+    image: docker:cli
+    secrets: [docker_username, docker_password]
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    commands:
+      - apk add bash
+      - tests/docker.sh deploy
+    when:
+      event:
+        - tag
+        - push
+
+depends_on:
+  - build
\ No newline at end of file
diff --git a/tests/docker.sh b/tests/docker.sh
index bf26408ea..711647508 100755
--- a/tests/docker.sh
+++ b/tests/docker.sh
@@ -56,13 +56,13 @@ for f in alpine debian; do
 
 	join_images $f next-$f
 
-	if [ "$CI_COMMIT_TAG" != "" ]; then
+	if [ "$1" == "deploy" ]; then
 		join_images $f $f
 	fi
 done
 
 join_images alpine next
 
-if [ "$CI_COMMIT_TAG" != "" ]; then
+if [ "$1" == "deploy" ]; then
 	join_images alpine latest
 fi