diff --git a/.woodpecker.yml b/.woodpecker.yml
index c0040b7..d50d488 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,26 +1,21 @@
 when:
   event: tag
 steps:
-  prep:
-    image: alpine
-    commands: |
-      wget http://repo-default.voidlinux.org/static/xbps-static-latest.x86_64-musl.tar.xz
-
   build:
     image: gcc
     environment:
-      - BUILD_DEPS="pkgconf libxcb-util-dev"
+      - BUILD_DEPS=libxcb-util-dev
     commands: |
-      apt install -y $${BUILD_DEPS}
+      apt-get update
+      apt-get install -y $${BUILD_DEPS}
       make install DESTDIR="$${CI_WORKSPACE}/pkg" PREFIX="/usr"
 
   package-xbps:
-    image: alpine
+    image: ghcr.io/void-linux/void-musl-busybox
     environment:
       - LICENSE="GPL-2.0"
       - SHORT_DESCRIPTION="Customized dwmblocks-async"
     commands: |
-      tar xvf xbps-static-latest.x86_64-musl.tar.xz -C /
       xbps-create -A x86_64 \
                   -H "$${CI_REPO_URL}" \
                   -l "$${LICENSE}" \
@@ -40,13 +35,13 @@ steps:
     settings:
       base_url: https://git.snaile.de
       files:
-        - "$${CI_REPO_NAME}-$${CI_COMMIT_TAG}.tar.gz"
+        - "${CI_REPO_NAME}-${CI_COMMIT_TAG}.tar.gz"
       api_key:
         from_secret: gitea_release
       target: main
 
   publish-xbps:
-    image: alpine
+    image: ghcr.io/void-linux/void-musl-busybox
     environment:
       - XBPS_TARGET_ARCH="x86_64"
     secrets: 
@@ -57,7 +52,6 @@ steps:
       - /etc/woodpecker/:/etc/woodpecker:ro
     commands: |
       export XBPS_TARGET_ARCH
-      tar xvf xbps-static-latest.x86_64-musl.tar.xz -C /
       mv $${CI_REPO_NAME}-$${CI_COMMIT_TAG}.x86_64.xbps /target
-      xbps-rindex -daf /target/$${CI_REPO_NAME}-$${CI_COMMIT_TAG}.x86_64.xbps
-      xbps-rindex -dS --signedby "$${CI_COMMIT_AUTHOR} <$${CI_COMMIT_AUTHOR_EMAIL}>" --privkey /etc/woodpecker/privkey.pem /target/$${CI_REPO_NAME}-$${CI_COMMIT_TAG}.x86_64.xbps
+      xbps-rindex -a /target/$${CI_REPO_NAME}-$${CI_COMMIT_TAG}.x86_64.xbps
+      xbps-rindex -S --signedby "$${CI_COMMIT_AUTHOR} <$${CI_COMMIT_AUTHOR_EMAIL}>" --privkey /etc/woodpecker/privkey.pem /target/$${CI_REPO_NAME}-$${CI_COMMIT_TAG}.x86_64.xbps