diff --git a/.woodpecker/.publish.yml b/.woodpecker/.publish.yml
index d23f63c3..6399d7f8 100644
--- a/.woodpecker/.publish.yml
+++ b/.woodpecker/.publish.yml
@@ -3,24 +3,25 @@ platform: linux/amd64
 
 pipeline:
   dev:
-    image: plugins/docker
+    image: woodpeckerci/plugin-docker-buildx
     secrets: [ docker_username, docker_password ]
     settings:
       repo: chewingbever/vieter
       tag: dev
+      platforms: [ linux/arm64/v8, linux/amd64 ]
     when:
       event: push
       branch: dev
 
   release:
-    image: plugins/docker
+    image: woodpeckerci/plugin-docker-buildx
     secrets: [ docker_username, docker_password ]
     settings:
       repo: chewingbever/vieter
       tag:
         - latest
         - $CI_COMMIT_TAG
-      mtu: 1000
+      platforms: [ linux/arm64/v8, linux/amd64 ]
     when:
       event: tag
       branch: main
diff --git a/Dockerfile b/Dockerfile
index 556ca58a..5564e34a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,17 +5,15 @@ WORKDIR /app
 # Copy over source code & build production binary
 COPY src ./src
 COPY Makefile ./
-RUN make prod
+
+ENV LDFLAGS='-lz -lbz2 -llzma -lexpat -lzstd -llz4 -static'
+RUN v -o pvieter -cflags "-O3" src
 
 
 FROM alpine:3.15
 
 ENV REPO_DIR=/data
 
-RUN apk update && \
-    apk add --no-cache \
-        libarchive
-
 COPY --from=builder /app/pvieter /usr/local/bin/vieter
 
 ENTRYPOINT [ "/usr/local/bin/vieter" ]
diff --git a/Makefile b/Makefile
index 103aca60..dc2273bf 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ LARCHIVE_LIB := $(LARCHIVE_DIR)/libarchive/libarchive.so
 
 # Custom V command for linking libarchive
 # V := LDFLAGS=$(PWD)/$(LARCHIVE_LIB) v -cflags '-I$(PWD)/$(LARCHIVE_DIR) -I $(PWD)/$(LARCHIVE_DIR)'
-V := v
+V := v -showcc
 
 all: vieter