diff --git a/.woodpecker/docker-develop-combine.yaml b/.woodpecker/docker-develop-combine.yaml
new file mode 100644
index 000000000..f79e6b59b
--- /dev/null
+++ b/.woodpecker/docker-develop-combine.yaml
@@ -0,0 +1,34 @@
+when:
+  - event: push
+    branch: ${CI_REPO_DEFAULT_BRANCH}
+    path: [ "*.ex", "*.eex", "*.exs", "mix.lock", ".woodpecker/**" ]
+
+depends_on:
+  - docker-develop
+
+skip_clone: true
+
+steps:
+  docker-develop-combine:
+    image: docker.io/docker:cli
+    environment:
+      BUILD_ARCHES: "amd64 arm64"
+      REGISTRY: "git.fluffytail.org"
+      IMAGE_PATH: "git.fluffytail.org/pleroma-test/pleroma"
+      REGISTRY_USER:
+        from_secret: pleroma-ci-user
+      REGISTRY_PASSWORD:
+        from_secret: pleroma-ci-password
+    commands:
+      - set +x
+      - mkdir -p ~/.docker
+      - echo "{\"auths\":{\"$REGISTRY\":{\"username\":\"$REGISTRY_USER\",\"password\":\"$REGISTRY_PASSWORD\"}}}" > ~/.docker/config.json
+      - set -x
+      - IMAGES_DEVELOP=; for arch in $BUILD_ARCHES; do IMAGES_DEVELOP="$IMAGES_DEVELOP $IMAGE_PATH:develop-$arch"; done
+      - IMAGES_LATEST=; for arch in $BUILD_ARCHES; do IMAGES_LATEST="$IMAGES_LATEST $IMAGE_PATH:latest-$arch"; done
+      - echo $IMAGES_DEVELOP
+      - echo $IMAGES_LATEST
+      - docker manifest create $IMAGE_PATH:develop $IMAGES_DEVELOP
+      - docker manifest push $IMAGE_PATH:develop
+      - docker manifest create $IMAGE_PATH:latest $IMAGES_LATEST
+      - docker manifest push $IMAGE_PATH:latest