diff --git a/.woodpecker.yml b/.woodpecker.yml
index 5d7ae2e40..9bdcbd6ac 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -157,94 +157,29 @@ pipeline:
     # when:
     #   platform: linux/amd64
 
+  publish_release_docker:
+    image: woodpeckerci/plugin-docker-buildx
+    secrets: [docker_username, docker_password]
+    settings:
+      repo: dessalines/lemmy
+      dockerfile: docker/Dockerfile
+      platforms: linux/amd64
+      build_args: RUST_RELEASE_MODE=release
+      auto_tag: true
+    when:
+      event: tag
+
   nightly_build:
     image: woodpeckerci/plugin-docker-buildx
+    secrets: [docker_username, docker_password]
     settings:
       repo: dessalines/lemmy
       dockerfile: docker/Dockerfile
       platforms: linux/amd64
       build_args: RUST_RELEASE_MODE=release
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-      # add_host: github.com:140.82.112.3,static.crates.io:18.154.227.73,crates.io:108.138.64.68,dl-cdn.alpinelinux.org:146.75.30.133
       tag: dev
     when:
-      event:
-        - cron
-          #platform: linux/amd64
-
-  publish_release_docker_image_amd:
-    image: woodpeckerci/plugin-docker-buildx
-    settings:
-      repo: dessalines/lemmy
-      dockerfile: docker/Dockerfile
-      platforms: linux/amd64
-      build_args: RUST_RELEASE_MODE=release
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-      # add_host: github.com:140.82.112.3,static.crates.io:18.154.227.73,crates.io:108.138.64.68,dl-cdn.alpinelinux.org:146.75.30.133
-      auto_tag: true
-      # auto_tag_suffix: linux-amd64
-    when:
-      event:
-        tag
-        #platform: linux/amd64
-
-  publish_release_docker_image_arm:
-    image: woodpeckerci/plugin-docker-buildx
-    settings:
-      repo: dessalines/lemmy
-      dockerfile: docker/Dockerfile
-      platforms: linux/arm64
-      build_args: RUST_RELEASE_MODE=release
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-      # add_host: github.com:140.82.112.3,static.crates.io:18.154.227.73,crates.io:108.138.64.68,dl-cdn.alpinelinux.org:146.75.30.133
-      auto_tag: true
-      # auto_tag_suffix: linux-arm64
-    when:
-      event:
-        tag
-        #platform: linux/arm64
-
-  #publish_release_docker_manifest:
-  #  image: plugins/manifest
-  #  settings:
-  #    username:
-  #      from_secret: docker_username
-  #    password:
-  #      from_secret: docker_password
-  #    target: "dessalines/lemmy:${CI_COMMIT_TAG}"
-  #    template: "dessalines/lemmy:${CI_COMMIT_TAG}-OS-ARCH"
-  #    platforms:
-  #      - linux/amd64
-  #      - linux/arm64
-  #    ignore_missing: true
-  #  when:
-  #    event: tag
-
-  #publish_latest_release_docker_manifest:
-  #  image: plugins/manifest
-  #  settings:
-  #    username:
-  #      from_secret: docker_username
-  #    password:
-  #      from_secret: docker_password
-  #    target: "dessalines/lemmy:latest"
-  #    template: "dessalines/lemmy:${CI_COMMIT_TAG}-OS-ARCH"
-  #    platforms:
-  #      - linux/amd64
-  #      - linux/arm64
-  #    ignore_missing: true
-  #  when:
-  #    event: tag
-  #      #platform: linux/amd64
+      event: cron
 
   # using https://github.com/pksunkara/cargo-workspaces
   publish_to_crates_io: