diff --git a/.woodpecker.yml b/.woodpecker.yml
index 9d75a5e..92a2b0f 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -4,24 +4,17 @@ when:
 
 steps:
   build:
-    image: gcc
+    image: ghcr.io/void-linux/void-glibc
+    environment:
+      - DEPENDENCIES=bash findutils base-devel libX11-devel libXft-devel libXinerama-devel pango-devel
     commands: |
-      apt-get update
-      apt-get install -y \
-        libx11-dev libx11-xcb-dev libxcb1-dev \
-        libxcb-res0-dev libxft-dev libxinerama-dev \
-        libfreetype6-dev libfontconfig1-dev \
-        libpango1.0-dev
+      xbps-install -Syu xbps $${DEPENDENCIES}
       cp -f config.mk patches.h dwm-flexipatch/
-      flexipatch-finalizer/flexipatch-finalizer.sh -r -d dwm-flexipatch -o dwm-final
-      # for patch in patches/*.diff; do
-      #     patch -d dwm-final <"$patch"
-      # done
+      bash flexipatch-finalizer/flexipatch-finalizer.sh -r -d dwm-flexipatch -o dwm-final
       cp -f config.h dwm-final/
       cd dwm-final || exit 1
       make clean install DESTDIR="$${CI_WORKSPACE}/pkg" PREFIX="/usr"
 
-
   package-xbps:
     image: ghcr.io/void-linux/void-musl-busybox
     environment:
diff --git a/config.mk b/config.mk
index 6f4603f..dc99a37 100644
--- a/config.mk
+++ b/config.mk
@@ -7,8 +7,8 @@ VERSION = 6.4
 PREFIX = /usr/local
 MANPREFIX = ${PREFIX}/share/man
 
-X11INC = /usr/X11R6/include
-X11LIB = /usr/X11R6/lib
+X11INC = /usr/include/X11
+X11LIB = /usr/lib
 
 # FreeBSD (uncomment)
 #X11INC = /usr/local/include