diff --git a/.woodpecker.yml b/.woodpecker.yml
index c8f3ac4..33ab790 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -32,8 +32,8 @@ steps:
       - echo "Building on $HOSTNAME"
       - echo "$${DOCKER_REGISTRY_PASSWORD}" | docker login -u "$${DOCKER_REGISTRY_USER}" --password-stdin
       - echo "$${REGISTRY_PASSWORD}" | docker login -u "$${REGISTRY_USER}" --password-stdin git.nixc.us
-      - docker compose -f docker-compose.staging.yml build --no-cache
-      - docker compose -f docker-compose.staging.yml push
+      - docker buildx create --use
+      - docker buildx bake --file docker-bake.hcl --set *.platform=linux/amd64 --push
     when:
       branch: main
       event: push
@@ -96,11 +96,11 @@ steps:
       - echo "Building on $HOSTNAME"
       - echo "$${DOCKER_REGISTRY_PASSWORD}" | docker login -u "$${DOCKER_REGISTRY_USER}" --password-stdin
       - echo "$${REGISTRY_PASSWORD}" | docker login -u "$${REGISTRY_USER}" --password-stdin git.nixc.us
-      - docker compose -f docker-compose.production.yml build --no-cache
-      - docker compose -f docker-compose.production.yml push
+      - docker buildx create --use
+      - docker buildx bake --file docker-bake.hcl --set *.platform=linux/amd64 --push
     when:
       branch: main
-      event: [push, cron]
+      event: push
 
   # Deploy Production
   deploy-production: